Disable Scala signal/callable until rework

Author: CedNaru

harness/tests/src/main/scala/godot/tests/HelloFromScala.scala

@@ -7,8 +7,8 @@ import godot.core.Signal2
 @RegisterClass
 class HelloFromScala extends Node {
 
-  @RegisterSignal(parameters = Array("param1", "param2"))
-  val mySignal: Signal2[String, String] = Signal2.create(this, "test_signal_2")
+  //@RegisterSignal(parameters = Array("param1", "param2"))
+  //val mySignal: Signal2[String, String] = Signal2.create(this, "test_signal_2")
 
   @RegisterProperty
   var myInt: Int = 0

harness/tests/src/main/scala/godot/tests/ScalaTestClass.scala

@@ -3,16 +3,16 @@ package godot.tests
 import godot.annotation.{Export, RegisterClass, RegisterFunction, RegisterProperty, RegisterSignal}
 import godot.api.Object.ConnectFlags
 import godot.api.{Button, Node, RenderingServer}
-import godot.core.{Callable, Dictionary, GodotNotification, LambdaCallable, LambdaCallable0, NativeCallable, Signal0, Signal2, StringNames, VariantArray}
+import godot.core.{Callable, Dictionary, GodotNotification, LambdaCallable, LambdaCallable0, Signal0, Signal2, StringNames, VariantArray}
 import org.jetbrains.annotations.NotNull
 
 @RegisterClass
 class ScalaTestClass extends Node {
-  @RegisterSignal
-  val testSignal: Signal0 = Signal0.create(this, "test_signal")
-
-  @RegisterSignal
-  val testSignal2: Signal2[String, String] = Signal2.create(this, "test_signal_2")
+  //@RegisterSignal
+  //val testSignal: Signal0 = Signal0.create(this, "test_signal")
+//
+  //@RegisterSignal
+  //val testSignal2: Signal2[String, String] = Signal2.create(this, "test_signal_2")
 
   @Export
   @RegisterProperty
@@ -60,13 +60,13 @@ class ScalaTestClass extends Node {
   @RegisterProperty
   var dictionary: Dictionary[Float, String] = new Dictionary[Float, String](classOf[Float], classOf[String])
 
-  var lambdaCallable: LambdaCallable[Void] = LambdaCallable0.create(classOf[Void], () => {
-    System.out.println("Hello from Callable")
-    null
-
-  })
-
-  var methodCallable: NativeCallable = Callable.create(this, StringNames.asStringName("DummyName"))
+  //var lambdaCallable: LambdaCallable[Void] = LambdaCallable0.create(classOf[Void], () => {
+  //  System.out.println("Hello from Callable")
+  //  null
+//
+  //})
+//
+  //var methodCallable: NativeCallable = Callable.create(this, StringNames.asStringName("DummyName"))
 
   @RegisterFunction
   override def _ready(): Unit = {
@@ -76,19 +76,19 @@ class ScalaTestClass extends Node {
     RenderingServer.getDefaultClearColor
   }
 
-  @RegisterFunction
-  def connectAndTriggerSignal(): Unit = {
-    connect(StringNames.asStringName("test_signal"), new NativeCallable(this, StringNames.asStringName("signal_callback")), ConnectFlags.ONE_SHOT.getId.toInt)
-    emitSignal(StringNames.asStringName("test_signal"))
-  }
-
-  @NotNull
-  override def _notification: GodotNotification = {
-    godotNotification(this, (myself: ScalaTestClass, notification: Integer) => {
-      System.out.println(notification)
-      null
-    })
-  }
+  //@RegisterFunction
+  //def connectAndTriggerSignal(): Unit = {
+  //  connect(StringNames.asStringName("test_signal"), new NativeCallable(this, StringNames.asStringName("signal_callback")), ConnectFlags.ONE_SHOT.getId.toInt)
+  //  emitSignal(StringNames.asStringName("test_signal"))
+  //}
+
+  //@NotNull
+  //override def _notification: GodotNotification = {
+  //  godotNotification(this, (myself: ScalaTestClass, notification: Integer) => {
+  //    System.out.println(notification)
+  //    null
+  //  })
+  //}
 
   @RegisterFunction
   def signalCallback(): Unit = {

harness/tests/test/unit/test_call_scala_class.gd

@@ -20,10 +20,9 @@ func test_field_set():
     assert_eq(scala_scene.exported_int, 2, "Field from scala should match")
     scala_scene.free()
 
-
-func test_signal():
-    var scala_scene: ScalaTestClass = load("res://scala_test_scene.tscn").instantiate()
-    get_tree().root.add_child(scala_scene)
-    await get_tree().create_timer(1).timeout
-    scala_scene.connect_and_trigger_signal()
-    assert_true(scala_scene.signal_emitted, "Signal should've been emitted in scala")
+##func test_signal():
+##    var scala_scene: ScalaTestClass = load("res://scala_test_scene.tscn").instantiate()
+##    get_tree().root.add_child(scala_scene)
+##    await get_tree().create_timer(1).timeout
+##    scala_scene.connect_and_trigger_signal()
+##    assert_true(scala_scene.signal_emitted, "Signal should've been emitted in scala")

src/jni/jvm.cpp

@@ -27,7 +27,7 @@ namespace jni {
 #ifdef __ANDROID__
         jint result = _instance->vm->AttachCurrentThread(&r_env, nullptr);
 #else
-        jint result = _instance->vm->AttachCurrentThread((void**) &r_env, nullptr);
+        jint result = _instance->vm->AttachCurrentThreadAsDaemon((void**) &r_env, nullptr);
 #endif
         JVM_DEV_ASSERT(result == JNI_OK, "Failed to attach vm to current thread!");
         env = new Env(r_env);

src/lifecycle/jvm_manager.cpp

@@ -171,5 +171,6 @@ void JvmManager::close_jvm() {
 #if defined DYNAMIC_JVM || defined STATIC_JVM
     JVM_LOG_VERBOSE("Shutting down JVM ...");
     jni::Jvm::destroy();
+    JVM_LOG_VERBOSE("JVM down..");
 #endif
 }