Update the 'HelloWorld' sample plugin directory structure

11 files changed, 46 insertions, 46 deletions

diff --git a/plugins/hello_world/build.gradle b/plugins/hello_world/build.gradle
index 598366e..9a08719 100644
--- a/plugins/hello_world/build.gradle
+++ b/plugins/hello_world/build.gradle
@@ -29,21 +29,21 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$versions.kotlinVersion"
 }
 
-tasks.register('copyDebugAARToAddons', Copy) {
+tasks.register('copyDebugAARToDemoAddons', Copy) {
     from 'build/outputs/aar'
     include 'HelloWorld.debug.aar'
-    into 'src/main/assets/addons/hello_world_plugin/.bin/debug'
+    into 'demo/addons/hello_world_plugin/bin/debug'
 }
 
-tasks.register('copyReleaseAARToAddons', Copy) {
+tasks.register('copyReleaseAARToDemoAddons', Copy) {
     from 'build/outputs/aar'
     include 'HelloWorld.release.aar'
-    into 'src/main/assets/addons/hello_world_plugin/.bin/release'
+    into 'demo/addons/hello_world_plugin/bin/release'
 }
 
 tasks.register('copyAddonsToDemo', Copy) {
-    dependsOn(copyDebugAARToAddons)
-    dependsOn(copyReleaseAARToAddons)
+    finalizedBy(copyDebugAARToDemoAddons)
+    finalizedBy(copyReleaseAARToDemoAddons)
 
     doFirst {
         delete('demo/addons/hello_world_plugin')
@@ -52,6 +52,6 @@ tasks.register('copyAddonsToDemo', Copy) {
     into 'demo/addons/hello_world_plugin'
 }
 
-assemble.finalizedBy(copyDebugAARToAddons)
-assemble.finalizedBy(copyReleaseAARToAddons)
 assemble.finalizedBy(copyAddonsToDemo)
+assemble.finalizedBy(copyDebugAARToDemoAddons)
+assemble.finalizedBy(copyReleaseAARToDemoAddons)
diff --git a/plugins/hello_world/demo/Main.gd b/plugins/hello_world/demo/Main.gd
index c5174eb..fbd5f95 100644
--- a/plugins/hello_world/demo/Main.gd
+++ b/plugins/hello_world/demo/Main.gd
@@ -3,7 +3,7 @@ extends Node2D
 var hello_world_plugin : HelloWorldPlugin
 
 func _ready():
-	hello_world_plugin = preload("res://addons/hello_world_plugin/interface/hello_world_plugin.gd").new()
+	hello_world_plugin = preload("res://addons/hello_world_plugin/hello_world_plugin_interface.gd").new()
 
 
 func _on_Button_pressed():
diff --git a/plugins/hello_world/demo/export_presets.cfg b/plugins/hello_world/demo/export_presets.cfg
index ab3d98a..bd4a94f 100644
--- a/plugins/hello_world/demo/export_presets.cfg
+++ b/plugins/hello_world/demo/export_presets.cfg
@@ -34,6 +34,9 @@ package/signed=true
 package/app_category=2
 package/retain_data_on_uninstall=false
 package/exclude_from_recents=false
+package/show_in_android_tv=false
+package/show_in_app_library=true
+package/show_as_launcher_app=false
 launcher_icons/main_192x192=""
 launcher_icons/adaptive_foreground_432x432=""
 launcher_icons/adaptive_background_432x432=""
diff --git a/plugins/hello_world/src/main/assets/addons/hello_world_plugin/.bin/.gdignore b/plugins/hello_world/src/main/assets/addons/hello_world_plugin/.bin/.gdignore
deleted file mode 100644
index 8b13789..0000000
--- a/plugins/hello_world/src/main/assets/addons/hello_world_plugin/.bin/.gdignore
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/plugins/hello_world/src/main/assets/addons/hello_world_plugin/.bin/.gitignore b/plugins/hello_world/src/main/assets/addons/hello_world_plugin/.bin/.gitignore
deleted file mode 100644
index 375ed0d..0000000
--- a/plugins/hello_world/src/main/assets/addons/hello_world_plugin/.bin/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*
-!.gitignore
-!.gdignore
diff --git a/plugins/hello_world/src/main/assets/addons/hello_world_plugin/.export/.gdignore b/plugins/hello_world/src/main/assets/addons/hello_world_plugin/.export/.gdignore
deleted file mode 100644
index e69de29..0000000
--- a/plugins/hello_world/src/main/assets/addons/hello_world_plugin/.export/.gdignore
+++ /dev/null
diff --git a/plugins/hello_world/src/main/assets/addons/hello_world_plugin/.export/hello_world_editor_export_plugin.gd b/plugins/hello_world/src/main/assets/addons/hello_world_plugin/.export/hello_world_editor_export_plugin.gd
deleted file mode 100644
index 8137718..0000000
--- a/plugins/hello_world/src/main/assets/addons/hello_world_plugin/.export/hello_world_editor_export_plugin.gd
+++ /dev/null
@@ -1,16 +0,0 @@
-@tool
-extends EditorExportPlugin
-
-func _supports_platform(platform):
-	if platform is EditorExportPlatformAndroid:
-		return true
-	return false
-	
-func _get_android_libraries(platform, debug):
-	if debug:
-		return PackedStringArray(["hello_world_plugin/.bin/debug/HelloWorld.debug.aar"])
-	else:
-		return PackedStringArray(["hello_world_plugin/.bin/release/HelloWorld.release.aar"])
-	
-func _get_name():
-	return "HelloWorldPlugin"
diff --git a/plugins/hello_world/src/main/assets/addons/hello_world_plugin/.export/hello_world_editor_plugin.gd b/plugins/hello_world/src/main/assets/addons/hello_world_plugin/.export/hello_world_editor_plugin.gd
deleted file mode 100644
index 85be8ad..0000000
--- a/plugins/hello_world/src/main/assets/addons/hello_world_plugin/.export/hello_world_editor_plugin.gd
+++ /dev/null
@@ -1,16 +0,0 @@
-@tool
-extends EditorPlugin
-
-# A class member to hold the export plugin during its lifecycle.
-var export_plugin : EditorExportPlugin
-
-func _enter_tree():
-	# Initialization of the plugin goes here.
-	export_plugin = preload("hello_world_editor_export_plugin.gd").new()
-	add_export_plugin(export_plugin)
-
-
-func _exit_tree():
-	# Clean-up of the plugin goes here.
-	remove_export_plugin(export_plugin)
-	export_plugin = null
diff --git a/plugins/hello_world/src/main/assets/addons/hello_world_plugin/hello_world_export_plugin.gd b/plugins/hello_world/src/main/assets/addons/hello_world_plugin/hello_world_export_plugin.gd
new file mode 100644
index 0000000..7158c03
--- /dev/null
+++ b/plugins/hello_world/src/main/assets/addons/hello_world_plugin/hello_world_export_plugin.gd
@@ -0,0 +1,33 @@
+@tool
+extends EditorPlugin
+
+# A class member to hold the export plugin during its lifecycle.
+var export_plugin : AndroidExportPlugin
+
+func _enter_tree():
+	# Initialization of the plugin goes here.
+	export_plugin = AndroidExportPlugin.new()
+	add_export_plugin(export_plugin)
+
+
+func _exit_tree():
+	# Clean-up of the plugin goes here.
+	remove_export_plugin(export_plugin)
+	export_plugin = null
+
+
+class AndroidExportPlugin extends EditorExportPlugin:
+
+	func _supports_platform(platform):
+		if platform is EditorExportPlatformAndroid:
+			return true
+		return false
+
+	func _get_android_libraries(platform, debug):
+		if debug:
+			return PackedStringArray(["hello_world_plugin/bin/debug/HelloWorld.debug.aar"])
+		else:
+			return PackedStringArray(["hello_world_plugin/bin/release/HelloWorld.release.aar"])
+
+	func _get_name():
+		return "HelloWorldPlugin"
diff --git a/plugins/hello_world/src/main/assets/addons/hello_world_plugin/interface/hello_world_plugin.gd b/plugins/hello_world/src/main/assets/addons/hello_world_plugin/hello_world_plugin_interface.gd
index ed84ef3..ed84ef3 100644
--- a/plugins/hello_world/src/main/assets/addons/hello_world_plugin/interface/hello_world_plugin.gd
+++ b/plugins/hello_world/src/main/assets/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/src/main/assets/addons/hello_world_plugin/plugin.cfg
index 9428d75..f83f716 100644
--- a/plugins/hello_world/src/main/assets/addons/hello_world_plugin/plugin.cfg
+++ b/plugins/hello_world/src/main/assets/addons/hello_world_plugin/plugin.cfg
@@ -4,4 +4,4 @@ name="HelloWorldPlugin"
 description="Sample to showcase how to package a Godot Android plugin	"
 author="Fredia Huya-Kouadio (m4gr3d)"
 version=""
-script=".export/hello_world_editor_plugin.gd"
+script="hello_world_export_plugin.gd"