Fix the plugins packaging to address https://github.com/godotengine/godot/issues/85395

22 files changed, 39 insertions, 52 deletions

diff --git a/config.gradle b/config.gradle
index 8ca3c91..340134a 100644
--- a/config.gradle
+++ b/config.gradle
@@ -1,5 +1,5 @@
-final snapshotGodotAndroidLib = "org.godotengine:godot:4.2.0.beta-SNAPSHOT"
-final stableGodotAndroidLib = "org.godotengine:godot:4.1.0.stable"
+final snapshotGodotAndroidLib = "org.godotengine:godot:4.2.0.rc-SNAPSHOT"
+final stableGodotAndroidLib = "org.godotengine:godot:4.2.0.stable"
 
 ext {
     versions = [
diff --git a/plugins/hello_gdextension/.gitignore b/plugins/hello_gdextension/.gitignore
index 796b96d..51d74a0 100644
--- a/plugins/hello_gdextension/.gitignore
+++ b/plugins/hello_gdextension/.gitignore
@@ -1 +1,12 @@
 /build
+
+# Binaries
+*.o
+*.os
+*.so
+*.obj
+*.bc
+*.pyc
+*.dblite
+*.pdb
+*.lib
\ No newline at end of file
diff --git a/plugins/hello_gdextension/build.gradle b/plugins/hello_gdextension/build.gradle
index da288b2..834e1da 100644
--- a/plugins/hello_gdextension/build.gradle
+++ b/plugins/hello_gdextension/build.gradle
@@ -70,21 +70,16 @@ tasks.register('copyReleaseSharedLibs', Copy) {
     into 'demo/addons/hello_gdextension_plugin/bin/release'
 }
 
-tasks.register('copyAddonsToDemo', Copy) {
-    finalizedBy(copyDebugAARToDemoAddons)
-    finalizedBy(copyReleaseAARToDemoAddons)
-    finalizedBy(copyDebugSharedLibs)
-    finalizedBy(copyReleaseSharedLibs)
-
-    doFirst {
-        delete('demo/addons/hello_gdextension_plugin')
-    }
-    from 'src/main/assets/addons/hello_gdextension_plugin'
-    into 'demo/addons/hello_gdextension_plugin'
+tasks.register('copyGdExtensionConfigToAssets', Copy) {
+    description 'Copy hello_gdextension.gdextension from the addons directory to the assets directory'
 
+    from 'demo/addons/hello_gdextension_plugin/'
+    include 'hello_gdextension.gdextension'
+    into 'src/main/assets/addons/hello_gdextension_plugin'
 }
 
-assemble.finalizedBy(copyAddonsToDemo)
+preBuild.dependsOn(copyGdExtensionConfigToAssets)
+assemble.dependsOn(copyGdExtensionConfigToAssets)
 assemble.finalizedBy(copyDebugAARToDemoAddons)
 assemble.finalizedBy(copyReleaseAARToDemoAddons)
 assemble.finalizedBy(copyDebugSharedLibs)
diff --git a/plugins/hello_gdextension/demo/addons/.gitignore b/plugins/hello_gdextension/demo/addons/.gitignore
index d6b7ef3..f448769 100644
--- a/plugins/hello_gdextension/demo/addons/.gitignore
+++ b/plugins/hello_gdextension/demo/addons/.gitignore
@@ -1,2 +1,2 @@
-*
+bin
 !.gitignore
diff --git a/plugins/hello_gdextension/demo/addons/hello_gdextension_plugin/hello_gdextension.gdextension b/plugins/hello_gdextension/demo/addons/hello_gdextension_plugin/hello_gdextension.gdextension
new file mode 100644
index 0000000..9beae14
--- /dev/null
+++ b/plugins/hello_gdextension/demo/addons/hello_gdextension_plugin/hello_gdextension.gdextension
@@ -0,0 +1,14 @@
+[configuration]
+
+entry_symbol = "example_library_init"
+compatibility_minimum = "4.2"
+android_aar_plugin = true
+
+[libraries]
+
+android.debug.arm64 = "res://addons/hello_gdextension_plugin/bin/debug/arm64-v8a/libhello_gdextension.so"
+android.release.arm64 = "res://addons/hello_gdextension_plugin/bin/release/arm64-v8a/libhello_gdextension.so"
+linux.debug.x86_64 = "res://addons/hello_gdextension_plugin/bin/libhello_gdextension.linux.template_debug.x86_64.so"
+linux.release.x86_64 = "res://addons/hello_gdextension_plugin/bin/libhello_gdextension.linux.template_release.x86_64.so"
+macos.debug = "res://addons/hello_gdextension_plugin/bin/libhello_gdextension.macos.template_debug.framework"
+macos.release = "res://addons/hello_gdextension_plugin/bin/libhello_gdextension.macos.template_release.framework"
\ No newline at end of file
diff --git a/plugins/hello_gdextension/src/main/assets/addons/hello_gdextension_plugin/hello_gdextension_export_plugin.gd b/plugins/hello_gdextension/demo/addons/hello_gdextension_plugin/hello_gdextension_export_plugin.gd
index 7829c24..7829c24 100644
--- a/plugins/hello_gdextension/src/main/assets/addons/hello_gdextension_plugin/hello_gdextension_export_plugin.gd
+++ b/plugins/hello_gdextension/demo/addons/hello_gdextension_plugin/hello_gdextension_export_plugin.gd
diff --git a/plugins/hello_gdextension/src/main/assets/addons/hello_gdextension_plugin/interface/android_icon.svg b/plugins/hello_gdextension/demo/addons/hello_gdextension_plugin/interface/android_icon.svg
index 29c0fde..29c0fde 100644
--- a/plugins/hello_gdextension/src/main/assets/addons/hello_gdextension_plugin/interface/android_icon.svg
+++ b/plugins/hello_gdextension/demo/addons/hello_gdextension_plugin/interface/android_icon.svg
diff --git a/plugins/hello_gdextension/src/main/assets/addons/hello_gdextension_plugin/interface/hello_gdextension_plugin.gd b/plugins/hello_gdextension/demo/addons/hello_gdextension_plugin/interface/hello_gdextension_plugin.gd
index b46fb27..b46fb27 100644
--- a/plugins/hello_gdextension/src/main/assets/addons/hello_gdextension_plugin/interface/hello_gdextension_plugin.gd
+++ b/plugins/hello_gdextension/demo/addons/hello_gdextension_plugin/interface/hello_gdextension_plugin.gd
diff --git a/plugins/hello_gdextension/src/main/assets/addons/hello_gdextension_plugin/plugin.cfg b/plugins/hello_gdextension/demo/addons/hello_gdextension_plugin/plugin.cfg
index c9f51e0..c9f51e0 100644
--- a/plugins/hello_gdextension/src/main/assets/addons/hello_gdextension_plugin/plugin.cfg
+++ b/plugins/hello_gdextension/demo/addons/hello_gdextension_plugin/plugin.cfg
diff --git a/plugins/hello_gdextension/godot-cpp b/plugins/hello_gdextension/godot-cpp
-Subproject c4b7b08c917e4dd41e4a53d28660b7358e60d7b
+Subproject 588d869a3ba91ecef8b42303e27066006f5f7d0
diff --git a/plugins/hello_gdextension/src/main/assets/.gitignore b/plugins/hello_gdextension/src/main/assets/.gitignore
new file mode 100644
index 0000000..d6b7ef3
--- /dev/null
+++ b/plugins/hello_gdextension/src/main/assets/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/plugins/hello_gdextension/src/main/assets/addons/hello_gdextension_plugin/hello_gdextension.gdextension b/plugins/hello_gdextension/src/main/assets/addons/hello_gdextension_plugin/hello_gdextension.gdextension
deleted file mode 100644
index 56faff9..0000000
--- a/plugins/hello_gdextension/src/main/assets/addons/hello_gdextension_plugin/hello_gdextension.gdextension
+++ /dev/null
@@ -1,11 +0,0 @@
-[configuration]
-
-entry_symbol = "example_library_init"
-compatibility_minimum = "4.2"
-android_aar_plugin = true
-
-[libraries]
-
-macos = "res://addons/hello_gdextension_plugin/bin/libhello_gdextension.macos.template_debug.framework"
-android.debug.arm64 = "res://addons/hello_gdextension_plugin/bin/debug/arm64-v8a/libhello_gdextension.so"
-android.release.arm64 = "res://addons/hello_gdextension_plugin/bin/release/arm64-v8a/libhello_gdextension.so"
diff --git a/plugins/hello_signals/build.gradle b/plugins/hello_signals/build.gradle
index b3a6f76..0cf0f1e 100644
--- a/plugins/hello_signals/build.gradle
+++ b/plugins/hello_signals/build.gradle
@@ -41,17 +41,5 @@ tasks.register('copyReleaseAARToDemoAddons', Copy) {
     into 'demo/addons/hello_signals_plugin/bin/release'
 }
 
-tasks.register('copyAddonsToDemo', Copy) {
-    finalizedBy(copyDebugAARToDemoAddons)
-    finalizedBy(copyReleaseAARToDemoAddons)
-
-    doFirst {
-        delete('demo/addons/hello_signals_plugin')
-    }
-    from 'src/main/assets/addons/hello_signals_plugin'
-    into 'demo/addons/hello_signals_plugin'
-}
-
-assemble.finalizedBy(copyAddonsToDemo)
 assemble.finalizedBy(copyDebugAARToDemoAddons)
 assemble.finalizedBy(copyReleaseAARToDemoAddons)
diff --git a/plugins/hello_signals/demo/addons/.gitignore b/plugins/hello_signals/demo/addons/.gitignore
index d6b7ef3..f448769 100644
--- a/plugins/hello_signals/demo/addons/.gitignore
+++ b/plugins/hello_signals/demo/addons/.gitignore
@@ -1,2 +1,2 @@
-*
+bin
 !.gitignore
diff --git a/plugins/hello_signals/src/main/assets/addons/hello_signals_plugin/hello_signals_export_plugin.gd b/plugins/hello_signals/demo/addons/hello_signals_plugin/hello_signals_export_plugin.gd
index 6145d44..6145d44 100644
--- a/plugins/hello_signals/src/main/assets/addons/hello_signals_plugin/hello_signals_export_plugin.gd
+++ b/plugins/hello_signals/demo/addons/hello_signals_plugin/hello_signals_export_plugin.gd
diff --git a/plugins/hello_signals/src/main/assets/addons/hello_signals_plugin/hello_signals_plugin_interface.gd b/plugins/hello_signals/demo/addons/hello_signals_plugin/hello_signals_plugin_interface.gd
index 0cc9c1d..0cc9c1d 100644
--- a/plugins/hello_signals/src/main/assets/addons/hello_signals_plugin/hello_signals_plugin_interface.gd
+++ b/plugins/hello_signals/demo/addons/hello_signals_plugin/hello_signals_plugin_interface.gd
diff --git a/plugins/hello_signals/src/main/assets/addons/hello_signals_plugin/plugin.cfg b/plugins/hello_signals/demo/addons/hello_signals_plugin/plugin.cfg
index 4ffab22..4ffab22 100644
--- a/plugins/hello_signals/src/main/assets/addons/hello_signals_plugin/plugin.cfg
+++ b/plugins/hello_signals/demo/addons/hello_signals_plugin/plugin.cfg
diff --git a/plugins/hello_world/build.gradle b/plugins/hello_world/build.gradle
index 9a08719..c3ecdca 100644
--- a/plugins/hello_world/build.gradle
+++ b/plugins/hello_world/build.gradle
@@ -41,17 +41,5 @@ tasks.register('copyReleaseAARToDemoAddons', Copy) {
     into 'demo/addons/hello_world_plugin/bin/release'
 }
 
-tasks.register('copyAddonsToDemo', Copy) {
-    finalizedBy(copyDebugAARToDemoAddons)
-    finalizedBy(copyReleaseAARToDemoAddons)
-
-    doFirst {
-        delete('demo/addons/hello_world_plugin')
-    }
-    from 'src/main/assets/addons/hello_world_plugin'
-    into 'demo/addons/hello_world_plugin'
-}
-
-assemble.finalizedBy(copyAddonsToDemo)
 assemble.finalizedBy(copyDebugAARToDemoAddons)
 assemble.finalizedBy(copyReleaseAARToDemoAddons)
diff --git a/plugins/hello_world/demo/addons/.gitignore b/plugins/hello_world/demo/addons/.gitignore
index d6b7ef3..f448769 100644
--- a/plugins/hello_world/demo/addons/.gitignore
+++ b/plugins/hello_world/demo/addons/.gitignore
@@ -1,2 +1,2 @@
-*
+bin
 !.gitignore
diff --git a/plugins/hello_world/src/main/assets/addons/hello_world_plugin/hello_world_export_plugin.gd b/plugins/hello_world/demo/addons/hello_world_plugin/hello_world_export_plugin.gd
index 7158c03..7158c03 100644
--- a/plugins/hello_world/src/main/assets/addons/hello_world_plugin/hello_world_export_plugin.gd
+++ b/plugins/hello_world/demo/addons/hello_world_plugin/hello_world_export_plugin.gd
diff --git a/plugins/hello_world/src/main/assets/addons/hello_world_plugin/hello_world_plugin_interface.gd b/plugins/hello_world/demo/addons/hello_world_plugin/hello_world_plugin_interface.gd
index ed84ef3..ed84ef3 100644
--- a/plugins/hello_world/src/main/assets/addons/hello_world_plugin/hello_world_plugin_interface.gd
+++ b/plugins/hello_world/demo/addons/hello_world_plugin/hello_world_plugin_interface.gd
diff --git a/plugins/hello_world/src/main/assets/addons/hello_world_plugin/plugin.cfg b/plugins/hello_world/demo/addons/hello_world_plugin/plugin.cfg
index f83f716..f83f716 100644
--- a/plugins/hello_world/src/main/assets/addons/hello_world_plugin/plugin.cfg
+++ b/plugins/hello_world/demo/addons/hello_world_plugin/plugin.cfg