Update the plugin to Godot v2 Android plugin

Author: Fredia Huya-Kouadio

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

@@ -36,9 +36,9 @@ jobs:
           cp aar/CHANGES.md asset/addons/godotopenxr/GodotOpenXRLoaders_CHANGES.md
       - name: Adding vendor licences
         run: |
-          cp aar/godotopenxrmeta/LICENSE.txt asset/addons/godotopenxr/export/meta/
-          cp aar/godotopenxrpico/src/main/jniLibs/arm64-v8a/README.md asset/addons/godotopenxr/export/pico/LICENSE.md
-          cp aar/godotopenxrkhr/LICENSE asset/addons/godotopenxr/export/khr/LICENSE
+          cp aar/godotopenxrmeta/LICENSE.txt asset/addons/godotopenxr/.export/meta/
+          cp aar/godotopenxrpico/src/main/jniLibs/arm64-v8a/README.md asset/addons/godotopenxr/.export/pico/LICENSE.md
+          cp aar/godotopenxrkhr/LICENSE asset/addons/godotopenxr/.export/khr/LICENSE
       - name: Create Godot OpenXR loader addon artifact
         uses: actions/upload-artifact@v3
         with:

CHANGES.md

@@ -2,6 +2,8 @@
 
 ## 2.0.0
 - Update to the new Godot 4.2 Android plugin packaging format
+- Update the plugin to Godot v2 Android plugin
+- Update to the Godot 4.2 Android library
 
 ## 1.1.0
 - Update Meta OpenXR loader to version 54

build.gradle

@@ -6,6 +6,7 @@ buildscript {
         google()
         mavenCentral()
         maven { url "https://plugins.gradle.org/m2/" }
+        maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/"}
     }
     dependencies {
         classpath "com.android.tools.build:gradle:$versions.gradlePluginVersion"

config.gradle

@@ -1,13 +1,19 @@
+final snapshotGodotAndroidLib = "org.godotengine:godot:4.2.0.dev-SNAPSHOT"
+final stableGodotAndroidLib = "org.godotengine:godot:4.1.0.stable"
+
 ext {
     versions = [
-            gradlePluginVersion: '7.2.1',
+            gradlePluginVersion: '7.4.0',
             compileSdk         : 33,
             minSdk             : 21,
             targetSdk          : 33,
-            godotLibVersion       : '4.1.0.stable',
             javaVersion           : JavaVersion.VERSION_11,
             nexusPublishVersion   : '1.3.0'
     ]
+
+    libraries = [
+            godotAndroidLib: snapshotGodotAndroidLib,
+    ]
 }
 
 // Parse the release version from the gradle project properties (e.g: -Prelease_version=<version>)

demo/.gitignore

@@ -1,4 +1,4 @@
 # Godot 4+ specific ignores
 .godot/
-/addons/godotopenxr/export/*/*.aar
+/addons/godotopenxr/.bin/*/*.aar
 /android/

demo/addons/godotopenxr/export/.gdignore demo/addons/godotopenxr/.bin/.gdignoredemo/addons/godotopenxr/export/.gdignore renamed to demo/addons/godotopenxr/.bin/.gdignore

@@ -18,7 +18,7 @@ func _get_name() -> String:
 # Path to the Android library aar file
 # If this is not available, we fall back to the maven central dependency
 func _get_android_aar_file_path(debug: bool) -> String:
-	return "res://addons/godotopenxr/export/" + _vendor + "/godotopenxr" + _vendor + "-" + ("debug.aar" if debug else "release.aar")
+	return "res://addons/godotopenxr/.bin/" + _vendor + "/godotopenxr" + _vendor + "-" + ("debug.aar" if debug else "release.aar")
 
 
 # Maven central dependency used as fall back when the Android library aar file is not available
@@ -114,7 +114,7 @@ func _get_android_libraries(platform, debug) -> PackedStringArray:
 	if not _supports_platform(platform):
 		return PackedStringArray()
 
-	if _is_vendor_plugin_enabled() and _is_android_aar_file_available(debug):	
+	if _is_vendor_plugin_enabled() and _is_android_aar_file_available(debug):
 		return PackedStringArray([_get_android_aar_file_path(debug)])
 
 	return PackedStringArray()