Upgrade the Android dependencies

GodotVR · Oct 28, 2022 · 81f0031 · 81f0031
1 parent a3fd9c7
commit 81f0031
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 16 deletions.
diff --git a/android/godotopenxr.gdap b/android/godotopenxr.gdap
@@ -2,4 +2,4 @@
 
 name="OpenXR"
 binary_type="local"
-binary="godotopenxr.1.3.0-full-release.aar"
+binary="godotopenxr.1.4.0-full-release.aar"
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
@@ -2,10 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
         package="org.godotengine.plugin.vr.openxr"
-        android:versionCode="10300"
-        android:versionName="1.3.0">
+        android:versionCode="10400"
+        android:versionName="1.4.0-dev1">
 
-    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="30" />
+    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="32" />
 
     <uses-feature
         android:name="android.hardware.vr.headtracking"

diff --git a/android_samples/demo/build.gradle b/android_samples/demo/build.gradle
@@ -33,7 +33,7 @@ android {
         targetCompatibility versions.javaVersion
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = versions.javaVersion
     }
 
     flavorDimensions "xrMode"

diff --git a/android_samples/demo/src/main/AndroidManifest.xml b/android_samples/demo/src/main/AndroidManifest.xml
@@ -38,7 +38,8 @@
             android:launchMode="singleTask"
             android:resizeableActivity="false"
             android:screenOrientation="landscape"
-            android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen">
+            android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
+            android:exported="true">
             <!-- Enables Oculus mobile overlays. -->
             <meta-data android:name="com.oculus.vr.focusaware" android:value="true" />
 
@@ -51,4 +52,4 @@
 
     </application>
 
-</manifest>
+</manifest>
diff --git a/config.gradle b/config.gradle
@@ -1,16 +1,16 @@
 ext {
     versions = [
             gradlePluginVersion: '7.0.3',
-            compileSdk         : 30,
+            compileSdk         : 32,
             minSdk             : 19, // Also update 'android/src/main/AndroidManifest.xml#minSdkVersion' value
-            targetSdk          : 30, // Also update 'android/src/main/AndroidManifest.xml#targetSdkVersion' value
-            buildTools         : '30.0.3',
-            kotlinVersion      : '1.6.10',
-            ndkVersion         : "21.4.7075529",
-            javaVersion        : JavaVersion.VERSION_1_8,
-            versionCode        : 10300, // Also update 'src/main/AndroidManifest.xml#versionCode' value
-            versionName        : '1.3.0', // Also update 'src/main/AndroidManifest.xml#versionName' value
-            godotVersion       : '3.4.4.stable',
+            targetSdk          : 32, // Also update 'android/src/main/AndroidManifest.xml#targetSdkVersion' value
+            buildTools         : '32.0.0',
+            kotlinVersion      : '1.6.21',
+            ndkVersion         : "23.2.8568313",
+            javaVersion        : JavaVersion.VERSION_11,
+            versionCode        : 10400, // Also update 'src/main/AndroidManifest.xml#versionCode' value
+            versionName        : '1.4.0-dev1', // Also update 'src/main/AndroidManifest.xml#versionName' value
+            godotVersion       : '3.5.1.stable',
     ]
 
     PUBLISH_ARTIFACT_ID = 'godot-openxr'

diff --git a/demo/.gitignore b/demo/.gitignore
@@ -1,3 +1,5 @@
+*.import
+
 # ignore our import cache folder
 .import