updated debug projects to use SDK 33 and built-in google-vr libs

codeanticode · codeanticode · commit ccd1ec000fdc · 2023-01-14T17:39:10.000-05:00
diff --git a/debug/apps/arscene/build.gradle b/debug/apps/arscene/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 33
     defaultConfig {
         applicationId "processing.tests.arscene"
         minSdkVersion 23
-        targetSdkVersion 29
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
     }
@@ -21,13 +21,14 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    namespace 'arscene'
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.13.2'
     implementation project(':libs:processing-core')
     implementation project(':libs:processing-ar')
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.ar:core:1.22.0'
+    implementation 'androidx.appcompat:appcompat:1.6.0'
+    implementation 'com.google.ar:core:1.35.0'
 }
diff --git a/debug/apps/arscene/src/main/AndroidManifest.xml b/debug/apps/arscene/src/main/AndroidManifest.xml
@@ -2,8 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 
           xmlns:tools="http://schemas.android.com/tools" 
           android:versionCode="1" 
-          android:versionName="1.0" 
-          package="arscene">
+          android:versionName="1.0">
     <uses-permission android:name="android.permission.CAMERA"/>
     <uses-feature android:name="android.hardware.camera.ar" android:required="true"/>
     <uses-feature android:glEsVersion="0x00020000" android:required="true"/>
diff --git a/debug/apps/arscene/src/main/java/arscene/MainActivity.java b/debug/apps/arscene/src/main/java/arscene/MainActivity.java
@@ -46,6 +46,7 @@ protected void onResume() {
 
   @Override
   public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
+    super.onRequestPermissionsResult(requestCode, permissions, grantResults);
     if (!hasCameraPermission()) {
       Toast.makeText(this, CAMERA_PERMISSION_MESSAGE, Toast.LENGTH_LONG).show();
       if (!shouldShowRequestPermissionRationale()) {
diff --git a/debug/apps/fast2d/build.gradle b/debug/apps/fast2d/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 33
     defaultConfig {
         applicationId "processing.tests.fast2d"
         minSdkVersion 17
-        targetSdkVersion 29
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
     }
@@ -21,11 +21,12 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    namespace 'fast2d'
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.13.2'
     implementation project(':libs:processing-core')
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.6.0'
 }
diff --git a/debug/apps/fast2d/src/main/AndroidManifest.xml b/debug/apps/fast2d/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="fast2d">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0">
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
@@ -8,7 +8,8 @@
         android:theme="@style/AppTheme"
         android:hardwareAccelerated="true"
         android:largeHeap="true">
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity"
+                  android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/debug/apps/fast2d/src/main/java/fast2d/MainActivity.java b/debug/apps/fast2d/src/main/java/fast2d/MainActivity.java
@@ -72,9 +72,10 @@ protected void onCreate(Bundle savedInstanceState) {
 
   @Override
   public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
+    super.onRequestPermissionsResult(requestCode, permissions, grantResults);
     if (sketch != null) {
       sketch.onRequestPermissionsResult(
-      requestCode, permissions, grantResults);
+              requestCode, permissions, grantResults);
     }
   }
 
diff --git a/debug/apps/simple/build.gradle b/debug/apps/simple/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 33
     defaultConfig {
         applicationId "processing.tests.simple"
         minSdkVersion 17
-        targetSdkVersion 29
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
     }
@@ -21,11 +21,12 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    namespace 'simple'
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.13.2'
     implementation project(':libs:processing-core')
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.6.0'
 }
diff --git a/debug/apps/simple/src/main/AndroidManifest.xml b/debug/apps/simple/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="simple">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0">
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
@@ -8,7 +8,8 @@
         android:theme="@style/AppTheme"
         android:hardwareAccelerated="true"
         android:largeHeap="true">
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity"
+                  android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/debug/apps/simple/src/main/java/simple/MainActivity.java b/debug/apps/simple/src/main/java/simple/MainActivity.java
@@ -28,9 +28,10 @@ protected void onCreate(Bundle savedInstanceState) {
 
   @Override
   public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
+    super.onRequestPermissionsResult(requestCode, permissions, grantResults);
     if (sketch != null) {
       sketch.onRequestPermissionsResult(
-      requestCode, permissions, grantResults);
+              requestCode, permissions, grantResults);
     }
   }
 
diff --git a/debug/apps/vrcube/build.gradle b/debug/apps/vrcube/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 33
     defaultConfig {
         applicationId "processing.tests.vrcube"
         minSdkVersion 19
-        targetSdkVersion 29
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
     }
@@ -21,13 +21,14 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    namespace 'vrcube'
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.13.2'
     implementation project(':libs:processing-core')
+    implementation project(':libs:google-vr')
     implementation project(':libs:processing-vr')
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.vr:sdk-base:1.180.0'
+    implementation 'androidx.appcompat:appcompat:1.6.0'
 }
diff --git a/debug/apps/vrcube/src/main/AndroidManifest.xml b/debug/apps/vrcube/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="vrcube">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0">
     <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-feature android:name="android.hardware.sensor.accelerometer" android:required="true"/>
@@ -14,7 +14,8 @@
         <activity android:configChanges="orientation|keyboardHidden|screenSize"
                   android:name=".MainActivity"
                   android:resizeableActivity="false"
-                  android:screenOrientation="landscape">
+                  android:screenOrientation="landscape"
+                  android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/debug/apps/wallpaper/build.gradle b/debug/apps/wallpaper/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 33
     defaultConfig {
         applicationId "processing.tests.wallpaper"
         minSdkVersion 17
-        targetSdkVersion 29
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
     }
@@ -21,11 +21,12 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    namespace 'wallpaper'
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.13.2'
     implementation project(':libs:processing-core')
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.6.0'
 }
diff --git a/debug/apps/wallpaper/src/main/AndroidManifest.xml b/debug/apps/wallpaper/src/main/AndroidManifest.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="wallpaper">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0">
     <uses-feature android:name="android.software.live_wallpaper"/>
     <application android:icon="@mipmap/ic_launcher" android:label="wallpaper">
-        <service android:label="wallpaper" android:name=".MainService" android:permission="android.permission.BIND_WALLPAPER">
+        <service android:label="wallpaper"
+                 android:name=".MainService"
+                 android:permission="android.permission.BIND_WALLPAPER"
+                 android:exported="true">
             <intent-filter>
                 <action android:name="android.service.wallpaper.WallpaperService"/>
             </intent-filter>
             <meta-data android:name="android.service.wallpaper" android:resource="@xml/wallpaper"/>
         </service>
         <activity android:name="processing.android.PermissionRequestor"/>
-        <activity android:name=".DebuggerEntryPointActivity">
+        <activity android:name=".DebuggerEntryPointActivity"
+                  android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/debug/apps/watchface/build.gradle b/debug/apps/watchface/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 33
     defaultConfig {
         applicationId "processing.tests.watchface"
         minSdkVersion 25
-        targetSdkVersion 29
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
         multiDexEnabled true
@@ -22,13 +22,14 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    namespace 'watchface'
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.13.2'
     implementation project(':libs:processing-core')
-    implementation 'com.google.android.gms:play-services-wearable:17.0.0'
-    implementation 'com.google.android.support:wearable:2.8.1'
-    compileOnly 'com.google.android.wearable:wearable:2.8.1'
+    implementation 'com.google.android.gms:play-services-wearable:18.0.0'
+    implementation 'com.google.android.support:wearable:2.9.0'
+    compileOnly 'com.google.android.wearable:wearable:2.9.0'
 }
diff --git a/debug/apps/watchface/src/main/AndroidManifest.xml b/debug/apps/watchface/src/main/AndroidManifest.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="watchface">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0">
     <uses-feature android:name="android.hardware.type.watch"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <application android:icon="@mipmap/ic_launcher" android:label="watchface" android:supportsRtl="true" android:theme="@android:style/Theme.DeviceDefault">
         <uses-library android:name="com.google.android.wearable" android:required="false"/>
         <meta-data android:name="com.google.android.wearable.standalone" android:value="true"/>
-        <service android:label="watchface" android:name=".MainService" android:permission="android.permission.BIND_WALLPAPER">
+        <service android:label="watchface"
+                 android:name=".MainService"
+                 android:permission="android.permission.BIND_WALLPAPER"
+                 android:exported="true">
             <meta-data android:name="android.service.wallpaper" android:resource="@xml/watch_face"/>
             <meta-data android:name="com.google.android.wearable.watchface.preview" android:resource="@drawable/preview_analog"/>
             <meta-data android:name="com.google.android.wearable.watchface.preview_circular" android:resource="@drawable/preview_analog"/>
diff --git a/debug/build.gradle b/debug/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.3.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -25,6 +25,12 @@ allprojects {
         // Needed to get google-vr dependencies
         maven { url 'https://repo.gradle.org/gradle/libs-releases' }
 
+        // Using the legacy Google VR libs included in the mode's VR library, since they are no
+        // longer available online
+//        flatDir {
+//            dirs '../mode/libraries/vr/libs'
+//        }
+
         mavenCentral()
         google()
 
diff --git a/debug/libs/google-vr/build.gradle b/debug/libs/google-vr/build.gradle
@@ -0,0 +1,10 @@
+// Dummy Gradle project to be able to import local aar files:
+// https://stackoverflow.com/a/60888941
+
+configurations.maybeCreate("default")
+artifacts.add("default", file('sdk-audio-1.180.0.aar'))
+artifacts.add("default", file('sdk-base-1.180.0.aar'))
+artifacts.add("default", file('sdk-common-1.180.0.aar'))
+
+// https://mvnrepository.com/artifact/com.google.protobuf.nano/protobuf-javanano/3.1.0
+//artifacts.add("default", file('protobuf-javanano-3.1.0.jar'))
diff --git a/debug/libs/google-vr/protobuf-javanano-3.1.0.jar b/debug/libs/google-vr/protobuf-javanano-3.1.0.jar
diff --git a/debug/libs/google-vr/sdk-audio-1.180.0.aar b/debug/libs/google-vr/sdk-audio-1.180.0.aar
diff --git a/debug/libs/google-vr/sdk-base-1.180.0.aar b/debug/libs/google-vr/sdk-base-1.180.0.aar
diff --git a/debug/libs/google-vr/sdk-common-1.180.0.aar b/debug/libs/google-vr/sdk-common-1.180.0.aar
diff --git a/debug/libs/processing-ar/build.gradle b/debug/libs/processing-ar/build.gradle
@@ -1,10 +1,10 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 33
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 29
+        targetSdkVersion 33
     }
     sourceSets {
         main {
@@ -23,5 +23,5 @@ android {
 
 dependencies {
     implementation project(':libs:processing-core')
-    implementation 'com.google.ar:core:1.22.0'
+    implementation 'com.google.ar:core:1.35.0'
 }
diff --git a/debug/libs/processing-core/build.gradle b/debug/libs/processing-core/build.gradle
@@ -1,10 +1,10 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 33
     defaultConfig {
         minSdkVersion 17
-        targetSdkVersion 29
+        targetSdkVersion 33
     }
     sourceSets {
         main {
@@ -23,6 +23,6 @@ android {
 
 dependencies {
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.support:wearable:2.8.1'
-    compileOnly 'com.google.android.wearable:wearable:2.8.1'
+    implementation 'com.google.android.support:wearable:2.9.0'
+    compileOnly 'com.google.android.wearable:wearable:2.9.0'
 }
diff --git a/debug/libs/processing-vr/build.gradle b/debug/libs/processing-vr/build.gradle
diff --git a/debug/settings.gradle b/debug/settings.gradle

Original file line number	Diff line number	Diff line change
`@@ -72,9 +72,10 @@ protected void onCreate(Bundle savedInstanceState) {`
`72`	`72`
`73`	`73`	`@Override`
`74`	`74`	`public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {`
	`75`	`+ super.onRequestPermissionsResult(requestCode, permissions, grantResults);`
`75`	`76`	`if (sketch != null) {`
`76`	`77`	`sketch.onRequestPermissionsResult(`
`77`		`- requestCode, permissions, grantResults);`
	`78`	`+ requestCode, permissions, grantResults);`
`78`	`79`	`}`
`79`	`80`	`}`
`80`	`81`
Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,10 @@ protected void onCreate(Bundle savedInstanceState) {`
`28`	`28`
`29`	`29`	`@Override`
`30`	`30`	`public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {`
	`31`	`+ super.onRequestPermissionsResult(requestCode, permissions, grantResults);`
`31`	`32`	`if (sketch != null) {`
`32`	`33`	`sketch.onRequestPermissionsResult(`
`33`		`- requestCode, permissions, grantResults);`
	`34`	`+ requestCode, permissions, grantResults);`
`34`	`35`	`}`
`35`	`36`	`}`
`36`	`37`