Add Meta prebuilt APK install tool

Author: devloglogan

.github/workflows/build-addon-on-push.yml

@@ -22,7 +22,7 @@ jobs:
       matrix:
         include:
           - name: 🐧 Linux (x86_64)
-            os: ubuntu-20.04
+            os: ubuntu-22.04
             platform: linux
             flags: arch=x86_64
             artifact_name: godotmetatoolkit-build-files-linux-x86_64
@@ -42,7 +42,7 @@ jobs:
             artifact_path: godot_meta_toolkit/demo/addons/godot_meta_toolkit/.bin/macos/*/*.framework
             cache-name: macos-universal
           - name: 🤖 Android (arm64)
-            os: ubuntu-20.04
+            os: ubuntu-22.04
             platform: android
             flags: arch=arm64
             artifact_name: godotmetatoolkit-build-files-android
@@ -122,7 +122,7 @@ jobs:
 
   asset:
     name: Assembling the asset
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: build
 
     steps:
@@ -166,9 +166,8 @@ jobs:
         run: |
           cd godot_meta_toolkit
           ./gradlew build
-          scons --directory=thirdparty/godot platform=android target=template_debug arch=arm64
-          scons --directory=thirdparty/godot platform=android target=template_release arch=arm64
-          ./gradlew generatePrebuiltApks
+          git clone --branch 4.4.1-stable https://github.com/godotengine/godot.git
+          ./gradlew generatePrebuiltApks -Pgodot_dir=godot
           cd ..
       - name: Create Godot Meta Toolkit Addon
         run: |

.github/workflows/static_checks.yml

@@ -5,7 +5,7 @@ on: [push, pull_request]
 jobs:
   static-checks:
     name: Formatting (clang-format, file format)
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "thirdparty/godot-cpp"]
 	path = thirdparty/godot-cpp
 	url = https://github.com/godotengine/godot-cpp
-[submodule "thirdparty/godot"]
-	path = thirdparty/godot
-	url = https://github.com/godotengine/godot.git

build.gradle

@@ -19,9 +19,7 @@ plugins {}
 apply from: 'config.gradle'
 
 ext {
-    addonPrebuiltDir = "demo/addons/godot_meta_toolkit/.build_template/prebuilt"
-
-    godotDir = "thirdparty/godot"
+    godotDir = project.hasProperty("godot_dir") ? project.property("godot_dir") : ""
     godotJavaDir = "${godotDir}/platform/android/java/"
 
     godotAppStandardManifestDir = "${godotJavaDir}/app/src/standard/"
@@ -57,13 +55,10 @@ task buildToolkit {
 }
 
 /**
- * Generate the addon by building the 'toolkit' module and the prebuilt apks.
+ * Generate the addon by building the 'toolkit' module
  */
 task generateAddon {
     dependsOn buildToolkit
-
-    // Generate the prebuilt apks
-    dependsOn ':generatePrebuiltApks'
 }
 
 /*
@@ -208,15 +203,17 @@ task cleanPrebuiltApks(type: Delete) {
         }
     }
 
-    delete(godotAppStandardManifestDir)
+    delete "meta-export-template.zip"
 
-    delete(addonPrebuiltDir)
+    if (godotDir != "") {
+        delete(godotAppStandardManifestDir)
 
-    tasks.create(name: "cleanGodot", type: Exec) {
-        executable gradlewExecutable.absolutePath
-        args "-p", godotJavaDir, "clean"
+        tasks.create(name: "cleanGodot", type: Exec) {
+            executable gradlewExecutable.absolutePath
+            args "-p", godotJavaDir, "clean"
+        }
+        dependsOn 'cleanGodot'
     }
-    dependsOn 'cleanGodot'
 }
 
 /**
@@ -228,16 +225,17 @@ task copyPrebuiltManifestToGodotApp(type: Copy) {
     file(godotAppStandardManifestDir).mkdirs()
 
     from "./prebuilt/AndroidManifest.xml"
-    into "./thirdparty/godot/platform/android/java/app/src/standard/"
+    into godotAppStandardManifestDir 
 }
 
 /**
- * Copy the generated prebuilt apks to the addon directory.
+ * Zip the generated prebuilt apks
  */
-task copyPrebuiltApksToAddon(type: Copy) {
-    from godotAppOutputDir
-    into addonPrebuiltDir
+task zipPrebuiltApks(type: Zip) {
+    from(godotAppOutputDir)
     include '**/*.apk'
+    archiveFileName = "meta-export-template.zip"
+    destinationDirectory = project.rootDir
 }
 
 /**
@@ -257,11 +255,21 @@ task generatePrebuiltApks() {
 
     if (sconsExecutableFile != null && sconsExecutableFile.exists()) {
         tasks.create(name: "buildGodotAndroidArm64Debug", type: Exec) {
+            doFirst {
+                if (godotDir == "") {
+                    throw new GradleException("godot_dir property is required")
+                }
+            }
             executable sconsExecutableFile.absolutePath
             args "--directory=${godotDir}", "platform=android", "target=template_debug", "arch=arm64"
         }
 
         tasks.create(name: "buildGodotAndroidArm64Release", type: Exec) {
+            doFirst {
+                if (godotDir == "") {
+                    throw new GradleException("godot_dir property is required")
+                }
+            }
             executable sconsExecutableFile.absolutePath
             args "--directory=${godotDir}", "platform=android", "target=template_release", "arch=arm64"
         }
@@ -274,6 +282,11 @@ task generatePrebuiltApks() {
         if (sconsExecutableFile != null && sconsExecutableFile.exists()) {
             dependsOn 'buildGodotAndroidArm64Debug'
         }
+        doFirst {
+            if (godotDir == "") {
+                throw new GradleException("godot_dir property is required")
+            }
+        }
         executable gradlewExecutable.absolutePath
         args "-p",
                 godotJavaDir,
@@ -289,6 +302,11 @@ task generatePrebuiltApks() {
         if (sconsExecutableFile != null && sconsExecutableFile.exists()) {
             dependsOn 'buildGodotAndroidArm64Release'
         }
+        doFirst {
+            if (godotDir == "") {
+                throw new GradleException("godot_dir property is required")
+            }
+        }
         executable gradlewExecutable.absolutePath
         args "-p",
                 godotJavaDir,
@@ -300,5 +318,5 @@ task generatePrebuiltApks() {
     dependsOn 'assemblePrebuiltDebugApk'
     dependsOn 'assemblePrebuiltReleaseApk'
 
-    finalizedBy 'copyPrebuiltApksToAddon'
+    finalizedBy 'zipPrebuiltApks'
 }

config.gradle

@@ -1,11 +1,11 @@
 ext {
     versions = [
-            gradlePluginVersion     : '8.2.0',
-            compileSdk              : 34,
+            gradlePluginVersion     : '8.6.1',
+            compileSdk              : 35,
             minSdk                  : 21,
-            targetSdk               : 34,
+            targetSdk               : 35,
             javaVersion             : JavaVersion.VERSION_17,
-            kotlinVersion           : '1.9.20',
+            kotlinVersion           : '2.1.20',
             ndkVersion              : '23.2.8568313',
             openxrVendorsVersion    : '3.1.2-stable'
     ]
@@ -17,7 +17,7 @@ ext {
 
 // Parse the release version from the gradle project properties (e.g: -Prelease_version=<version>)
 ext.getReleaseVersion = { ->
-    final String defaultVersion = "0.1.0-dev-SNAPSHOT"
+    final String defaultVersion = "1.0.2-dev-SNAPSHOT"
 
     String releaseVersion = project.hasProperty("release_version") ? project.property("release_version") : defaultVersion
     if (releaseVersion == null || releaseVersion.isEmpty()) {

gradle/wrapper/gradle-wrapper.properties

@@ -2,6 +2,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionSha256Sum=38f66cd6eef217b4c35855bb11ea4e9fbc53594ccccb5fb82dfd317ef8c2c5a3
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

thirdparty/godot

@@ -8,22 +8,27 @@
         "ConfirmationDialog",
         "Container",
         "Control",
+        "DirAccess",
         "EditorExportPlatform",
         "EditorExportPlatformAndroid",
         "EditorExportPlugin",
         "EditorFileDialog",
         "EditorInterface",
+        "EditorPaths",
         "EditorPlugin",
         "EditorSettings",
         "Engine",
         "FileAccess",
         "HBoxContainer",
+        "HTTPClient",
+        "HTTPRequest",
         "Label",
         "LineEdit",
         "MainLoop",
         "Node",
         "OS",
         "ProjectSettings",
+        "ProgressBar",
         "RefCounted",
         "Resource",
         "RichTextLabel",
@@ -35,6 +40,7 @@
         "VBoxContainer",
         "Viewport",
         "Window",
-        "XRInterface"
+        "XRInterface",
+        "ZIPReader"
     ]
-}
+}