Update the plugin to Godot v2 Android plugin

GodotVR · Aug 18, 2023 · 44c4458 · 44c4458
1 parent c1db954
commit 44c4458
Show file tree

Hide file tree

Showing 28 changed files with 877 additions and 31 deletions.
diff --git a/.github/workflows/build-addon-on-push.yml b/.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:

diff --git a/CHANGES.md b/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

diff --git a/build.gradle b/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"

diff --git a/config.gradle b/config.gradle
@@ -1,13 +1,19 @@
+final snapshotGodotAndroidLib = "io.github.m4gr3d: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>)

diff --git a/demo/.gitignore b/demo/.gitignore
@@ -1,4 +1,4 @@
 # Godot 4+ specific ignores
 .godot/
-/addons/godotopenxr/export/*/*.aar
+/addons/godotopenxr/.bin/*/*.aar
 /android/
diff --git a/demo/addons/godotopenxr/export/.gdignore → demo/addons/godotopenxr/.bin/.gdignore b/demo/addons/godotopenxr/export/.gdignore → demo/addons/godotopenxr/.bin/.gdignore
diff --git a/demo/addons/godotopenxr/.export/.gdignore b/demo/addons/godotopenxr/.export/.gdignore
diff --git a/...port/godot_openxr_editor_export_plugin.gd → ...port/godot_openxr_editor_export_plugin.gd b/...port/godot_openxr_editor_export_plugin.gd → ...port/godot_openxr_editor_export_plugin.gd
@@ -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()
diff --git a/...enxr/export/godot_openxr_editor_plugin.gd → ...nxr/.export/godot_openxr_editor_plugin.gd b/...enxr/export/godot_openxr_editor_plugin.gd → ...nxr/.export/godot_openxr_editor_plugin.gd
diff --git a/.../godot_openxr_khr_editor_export_plugin.gd → .../godot_openxr_khr_editor_export_plugin.gd b/.../godot_openxr_khr_editor_export_plugin.gd → .../godot_openxr_khr_editor_export_plugin.gd
diff --git a/...godot_openxr_lynx_editor_export_plugin.gd → ...godot_openxr_lynx_editor_export_plugin.gd b/...godot_openxr_lynx_editor_export_plugin.gd → ...godot_openxr_lynx_editor_export_plugin.gd
diff --git a/...godot_openxr_meta_editor_export_plugin.gd → ...godot_openxr_meta_editor_export_plugin.gd b/...godot_openxr_meta_editor_export_plugin.gd → ...godot_openxr_meta_editor_export_plugin.gd
diff --git a/...godot_openxr_pico_editor_export_plugin.gd → ...godot_openxr_pico_editor_export_plugin.gd b/...godot_openxr_pico_editor_export_plugin.gd → ...godot_openxr_pico_editor_export_plugin.gd
diff --git a/demo/addons/godotopenxr/plugin.cfg b/demo/addons/godotopenxr/plugin.cfg
@@ -4,4 +4,4 @@ name="GodotOpenXR"
 description="Godot OpenXR loader plugin"
 author="https://github.com/GodotVR/godot_openxr_loaders/blob/master/CONTRIBUTORS.md"
 version="2.0.0-dev"
-script="export/godot_openxr_editor_plugin.gd"
+script=".export/godot_openxr_editor_plugin.gd"
diff --git a/demo/export_presets.cfg b/demo/export_presets.cfg
@@ -34,6 +34,8 @@ 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_as_launcher_app=false
 launcher_icons/main_192x192=""
 launcher_icons/adaptive_foreground_432x432=""
 launcher_icons/adaptive_background_432x432=""

diff --git a/demo/openxr_action_map.tres b/demo/openxr_action_map.tres
diff --git a/godotopenxrkhr/build.gradle b/godotopenxrkhr/build.gradle
@@ -49,19 +49,19 @@ android {
 }
 
 dependencies {
-    compileOnly "org.godotengine:godot:$versions.godotLibVersion"
+    compileOnly libraries.godotAndroidLib
 }
 
 task copyDebugAARToAddons(type: Copy) {
     from 'build/outputs/aar'
     include 'godotopenxrkhr-debug.aar'
-    into '../demo/addons/godotopenxr/export/khr'
+    into '../demo/addons/godotopenxr/.bin/khr'
 }
 
 task copyReleaseAARToAddons(type: Copy) {
     from 'build/outputs/aar'
     include 'godotopenxrkhr-release.aar'
-    into '../demo/addons/godotopenxr/export/khr'
+    into '../demo/addons/godotopenxr/.bin/khr'
 }
 
 assemble.finalizedBy(copyDebugAARToAddons)

diff --git a/godotopenxrkhr/src/main/AndroidManifest.xml b/godotopenxrkhr/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.godotengine.openxrloaders.khr"
-    xmlns:tools="http://schemas.android.com/tools">
+    package="org.godotengine.openxrloaders.khr">
 
     <!-- Tell the system this app works in either 3dof or 6dof mode -->
     <uses-feature
@@ -22,7 +21,7 @@
 
     <application>
         <meta-data
-            android:name="org.godotengine.plugin.v1.GodotOpenXRKHR"
+            android:name="org.godotengine.plugin.v2.GodotOpenXRKHR"
             android:value="org.godotengine.openxrloaders.khr.GodotOpenXRKHR" />
     </application>
 

diff --git a/...oaders/godotopenxrkhr/GodotOpenXRKHR.java → ...ine/openxrloaders/khr/GodotOpenXRKHR.java b/...oaders/godotopenxrkhr/GodotOpenXRKHR.java → ...ine/openxrloaders/khr/GodotOpenXRKHR.java
diff --git a/godotopenxrlynx/build.gradle b/godotopenxrlynx/build.gradle
@@ -48,19 +48,19 @@ android {
 }
 
 dependencies {
-    compileOnly "org.godotengine:godot:$versions.godotLibVersion"
+    compileOnly libraries.godotAndroidLib
 }
 
 task copyDebugAARToAddons(type: Copy) {
     from 'build/outputs/aar'
     include 'godotopenxrlynx-debug.aar'
-    into '../demo/addons/godotopenxr/export/lynx'
+    into '../demo/addons/godotopenxr/.bin/lynx'
 }
 
 task copyReleaseAARToAddons(type: Copy) {
     from 'build/outputs/aar'
     include 'godotopenxrlynx-release.aar'
-    into '../demo/addons/godotopenxr/export/lynx'
+    into '../demo/addons/godotopenxr/.bin/lynx'
 }
 
 assemble.finalizedBy(copyDebugAARToAddons)

diff --git a/godotopenxrlynx/src/main/AndroidManifest.xml b/godotopenxrlynx/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.godotengine.openxrloaders.lynx"
-    xmlns:tools="http://schemas.android.com/tools">
+    package="org.godotengine.openxrloaders.lynx">
 
     <uses-permission android:name="org.khronos.openxr.permission.OPENXR_SYSTEM" />
 
@@ -19,10 +18,10 @@
 
     <application>
         <meta-data
-            android:name="org.godotengine.plugin.v1.GodotOpenXRLynx"
+            android:name="org.godotengine.plugin.v2.GodotOpenXRLynx"
             android:value="org.godotengine.openxrloaders.khr.GodotOpenXRLynx" />
 
         <meta-data android:name="handtracking" android:value="1" />
     </application>
 
-</manifest>
+</manifest>
diff --git a/...ders/godotopenxrlynx/GodotOpenXRLynx.java → ...e/openxrloaders/lynx/GodotOpenXRLynx.java b/...ders/godotopenxrlynx/GodotOpenXRLynx.java → ...e/openxrloaders/lynx/GodotOpenXRLynx.java
diff --git a/godotopenxrmeta/build.gradle b/godotopenxrmeta/build.gradle
@@ -48,19 +48,19 @@ android {
 }
 
 dependencies {
-    compileOnly "org.godotengine:godot:$versions.godotLibVersion"
+    compileOnly libraries.godotAndroidLib
 }
 
 task copyDebugAARToAddons(type: Copy) {
     from 'build/outputs/aar'
     include 'godotopenxrmeta-debug.aar'
-    into '../demo/addons/godotopenxr/export/meta'
+    into '../demo/addons/godotopenxr/.bin/meta'
 }
 
 task copyReleaseAARToAddons(type: Copy) {
     from 'build/outputs/aar'
     include 'godotopenxrmeta-release.aar'
-    into '../demo/addons/godotopenxr/export/meta'
+    into '../demo/addons/godotopenxr/.bin/meta'
 }
 
 assemble.finalizedBy(copyDebugAARToAddons)

diff --git a/godotopenxrmeta/src/main/AndroidManifest.xml b/godotopenxrmeta/src/main/AndroidManifest.xml
@@ -9,7 +9,7 @@
 
     <application>
         <meta-data
-            android:name="org.godotengine.plugin.v1.GodotOpenXRMeta"
+            android:name="org.godotengine.plugin.v2.GodotOpenXRMeta"
             android:value="org.godotengine.openxrloaders.meta.GodotOpenXRMeta" />
 
         <meta-data

diff --git a/godotopenxrpico/build.gradle b/godotopenxrpico/build.gradle
@@ -41,19 +41,19 @@ android {
 }
 
 dependencies {
-    compileOnly "org.godotengine:godot:$versions.godotLibVersion"
+    compileOnly libraries.godotAndroidLib
 }
 
 task copyDebugAARToAddons(type: Copy) {
     from 'build/outputs/aar'
     include 'godotopenxrpico-debug.aar'
-    into '../demo/addons/godotopenxr/export/pico'
+    into '../demo/addons/godotopenxr/.bin/pico'
 }
 
 task copyReleaseAARToAddons(type: Copy) {
     from 'build/outputs/aar'
     include 'godotopenxrpico-release.aar'
-    into '../demo/addons/godotopenxr/export/pico'
+    into '../demo/addons/godotopenxr/.bin/pico'
 }
 
 assemble.finalizedBy(copyDebugAARToAddons)

diff --git a/godotopenxrpico/src/main/AndroidManifest.xml b/godotopenxrpico/src/main/AndroidManifest.xml
@@ -4,7 +4,7 @@
 
     <application>
         <!-- Godot plugin registration -->
-        <meta-data android:name="org.godotengine.plugin.v1.GodotOpenXRPico"
+        <meta-data android:name="org.godotengine.plugin.v2.GodotOpenXRPico"
             android:value="org.godotengine.openxrloaders.pico.GodotOpenXRPico" />
 
         <!-- Enable VR mode on Pico headsets -->

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Mar 11 11:10:12 NZDT 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle b/settings.gradle
@@ -15,6 +15,8 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
+        maven { url "https://plugins.gradle.org/m2/" }
+        maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/"}
     }
 }
 rootProject.name = "GodotOpenXRLoaders"