Merge pull request #13 from ViroCommunity/arcore-1.26.0

arcore-1.26.0
ReactVision · Sep 5, 2021 · 88cbdb2 · 88cbdb2
2 parents e576b76 + 172700d
commit 88cbdb2
Show file tree

Hide file tree

Showing 56 changed files with 3,051 additions and 1,323 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -11,13 +11,13 @@ android {
     compileSdkVersion 30
 
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 24
         targetSdkVersion 30
 
         ndk {
             // Specifies the ABI configurations of your native
             // libraries Gradle should build and package with your APK.
-            abiFilters "armeabi-v7a", "arm64-v8a"
+            abiFilters "arm64-v8a", "armeabi-v7a"
         }
     }
 

diff --git a/android/libs/arcore/build.gradle b/android/libs/arcore/build.gradle
@@ -1,2 +1,2 @@
 configurations.maybeCreate("default")
-artifacts.add("default", file('core-1.10.0.aar'))
+artifacts.add("default", file('core-1.26.0.aar'))
diff --git a/android/libs/arcore/core-1.10.0.aar b/android/libs/arcore/core-1.10.0.aar
diff --git a/android/libs/arcore/core-1.26.0.aar b/android/libs/arcore/core-1.26.0.aar
diff --git a/android/libs/arcore/include/arcore_c_api.h b/android/libs/arcore/include/arcore_c_api.h
diff --git a/android/memoryleaktest/build.gradle b/android/memoryleaktest/build.gradle
@@ -14,7 +14,7 @@ android {
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         missingDimensionStrategy 'product', 'viro_core'
         ndk {
-            abiFilters "armeabi-v7a", "arm64-v8a"
+            abiFilters "arm64-v8a", "armeabi-v7a"
         }
     }
     buildTypes {
@@ -52,11 +52,6 @@ android {
     }
     sourceSets { main { assets.srcDirs = ['src/main/assets', 'src/main/assets/'] } }
 
-    // Keep the following configuration in order to target Java 8.
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
 }
 
 dependencies {

diff --git a/android/memoryleaktest/src/main/AndroidManifest.xml b/android/memoryleaktest/src/main/AndroidManifest.xml
@@ -2,6 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.example.memoryleaktest">
 
+    <queries>
+        <package android:name="com.google.ar.core"/>
+    </queries>
+
     <!-- Required for AR -->
     <uses-permission android:name="android.permission.CAMERA"/>
 
@@ -11,8 +15,6 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <meta-data android:name="com.viromedia.API_KEY"
-        android:value="7EEDCB99-2C3B-4681-AE17-17BC165BF792" />
 
         <activity android:name=".MainActivity">
             <intent-filter>

diff --git a/android/nativetest/build.gradle b/android/nativetest/build.gradle
@@ -6,13 +6,13 @@ android {
 
     defaultConfig {
         applicationId "com.viro.nativetest"
-        minSdkVersion 21
+        minSdkVersion 24
         targetSdkVersion 30
         versionCode 1
         versionName "1.0"
         missingDimensionStrategy 'product', 'viro_core'
         ndk {
-            abiFilters "armeabi-v7a", "arm64-v8a"
+            abiFilters "arm64-v8a", "armeabi-v7a"
         }
     }
     buildTypes {

diff --git a/android/nativetest/src/main/AndroidManifest.xml b/android/nativetest/src/main/AndroidManifest.xml
@@ -2,6 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.viromedia.nativetest">
 
+    <queries>
+        <package android:name="com.google.ar.core"/>
+    </queries>
+
     <!-- Required to read the paired viewer's distortion parameters -->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 

diff --git a/android/releasetest/build.gradle b/android/releasetest/build.gradle
@@ -15,7 +15,7 @@ android {
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         missingDimensionStrategy 'product', 'viro_core'
         ndk {
-            abiFilters "armeabi-v7a", "arm64-v8a"
+            abiFilters "arm64-v8a", "armeabi-v7a"
         }
     }
     buildTypes {
@@ -71,11 +71,7 @@ android {
             showStandardStreams true
         }
     }
-    // Keep the following configuration in order to target Java 8.
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
+
 }
 
 dependencies {

diff --git a/android/releasetest/src/main/AndroidManifest.xml b/android/releasetest/src/main/AndroidManifest.xml
@@ -2,6 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.viromedia.releasetest">
 
+    <queries>
+        <package android:name="com.google.ar.core"/>
+    </queries>
+
     <!-- Required to read the paired viewer's distortion parameters -->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 

diff --git a/android/renderertest/build.gradle b/android/renderertest/build.gradle
@@ -6,13 +6,13 @@ android {
 
     defaultConfig {
         applicationId "com.viromedia.renderertest"
-        minSdkVersion 21
+        minSdkVersion 24
         targetSdkVersion 30
         versionCode 1
         versionName "1.0"
         missingDimensionStrategy 'product', 'viro_core'
         ndk {
-            abiFilters "armeabi-v7a", "arm64-v8a"
+            abiFilters "arm64-v8a", "armeabi-v7a"
         }
     }
     buildTypes {
@@ -21,6 +21,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
     productFlavors {
         gvr {
             dimension "target_platform"

diff --git a/android/renderertest/src/main/AndroidManifest.xml b/android/renderertest/src/main/AndroidManifest.xml
@@ -2,6 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.viromedia.renderertest">
 
+    <queries>
+        <package android:name="com.google.ar.core"/>
+    </queries>
+
     <uses-permission android:name="android.permission.INTERNET" />
 
     <!-- Required to read the paired viewer's distortion parameters -->

diff --git a/android/viroar/build.gradle b/android/viroar/build.gradle
@@ -9,7 +9,7 @@ android {
         targetSdkVersion 30
 
         ndk {
-            abiFilters "armeabi-v7a", "arm64-v8a"
+            abiFilters "arm64-v8a", "armeabi-v7a"
         }
         externalNativeBuild {
             cmake {

diff --git a/android/viroar/src/main/jniLibs/arm64-v8a/libarcore_sdk_c.so b/android/viroar/src/main/jniLibs/arm64-v8a/libarcore_sdk_c.so
diff --git a/android/viroar/src/main/jniLibs/armeabi-v7a/libarcore_sdk_c.so b/android/viroar/src/main/jniLibs/armeabi-v7a/libarcore_sdk_c.so
diff --git a/android/viroar/src/main/jniLibs/x86/libarcore_sdk_c.so b/android/viroar/src/main/jniLibs/x86/libarcore_sdk_c.so
diff --git a/android/viroar/src/main/jniLibs/x86_64/libarcore_sdk_c.so b/android/viroar/src/main/jniLibs/x86_64/libarcore_sdk_c.so
diff --git a/android/virocore/build.gradle b/android/virocore/build.gradle
@@ -7,11 +7,11 @@ android {
     compileSdkVersion 30
 
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 24
         targetSdkVersion 30
 
         ndk {
-            abiFilters "armeabi-v7a", "arm64-v8a"
+            abiFilters "arm64-v8a", "armeabi-v7a"
         }
 
         externalNativeBuild {

diff --git a/android/viroreact/build.gradle b/android/viroreact/build.gradle
@@ -5,14 +5,14 @@ android {
     compileSdkVersion 30
 
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 24
         targetSdkVersion 30
 
         ndk {
             // React Native does not support arm64-v8a yet, so don't bother including
             // it here.
             // Tracking issue for RN: https://github.com/facebook/react-native/issues/2814
-            abiFilters "armeabi-v7a", "arm64-v8a"
+            abiFilters "arm64-v8a", "armeabi-v7a"
         }
 
         // Note that viro_arcore does not use STL, so we can still use static STL in viro_native

diff --git a/code-samples/ARBlackPanther/app/build.gradle b/code-samples/ARBlackPanther/app/build.gradle
@@ -6,13 +6,13 @@ android {
     defaultConfig {
         applicationId "com.example.virosample"
         applicationIdSuffix ".arcore"
-        minSdkVersion 21
+        minSdkVersion 24
         targetSdkVersion 30
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         ndk {
-            abiFilters "armeabi-v7a", "x86", "armeabi", "mips"
+            abiFilters "arm64-v8a", "armeabi-v7a", "x86", "armeabi", "mips"
         }
     }
     buildTypes {
@@ -36,9 +36,4 @@ dependencies {
     implementation project(':arcore_client')
     implementation project(':viro_core')
     implementation 'com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-7'
-    implementation 'com.amazonaws:aws-android-sdk-core:2.2.+'
-    implementation 'com.amazonaws:aws-android-sdk-ddb:2.2.+'
-    implementation 'com.amazonaws:aws-android-sdk-ddb-mapper:2.2.+'
-    implementation 'com.amazonaws:aws-android-sdk-cognito:2.2.+'
-    implementation 'com.amazonaws:aws-android-sdk-cognitoidentityprovider:2.2.+'
 }
diff --git a/code-samples/ARBlackPanther/app/src/main/AndroidManifest.xml b/code-samples/ARBlackPanther/app/src/main/AndroidManifest.xml
@@ -2,6 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.virosample">
 
+    <queries>
+        <package android:name="com.google.ar.core"/>
+    </queries>
+
     <!-- Required for AR -->
     <uses-permission android:name="android.permission.CAMERA"/>
 
@@ -16,10 +20,6 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
 
-        <meta-data
-            android:name="com.viromedia.API_KEY"
-            android:value="Your-API-Key-Here" />
-
         <activity
             android:name="com.example.virosample.ViroActivityAR"
             android:configChanges="keyboardHidden|orientation|screenSize"

diff --git a/code-samples/ARBlackPanther/arcore_client/build.gradle b/code-samples/ARBlackPanther/arcore_client/build.gradle
@@ -1,2 +1,2 @@
 configurations.maybeCreate("default")
-artifacts.add("default", file('core-1.10.0.aar'))
+artifacts.add("default", file('core-1.26.0.aar'))
diff --git a/code-samples/ARBlackPanther/arcore_client/core-1.10.0.aar b/code-samples/ARBlackPanther/arcore_client/core-1.10.0.aar
diff --git a/code-samples/ARBlackPanther/arcore_client/core-1.26.0.aar b/code-samples/ARBlackPanther/arcore_client/core-1.26.0.aar
diff --git a/code-samples/ARBlackPanther/viro_core/build.gradle b/code-samples/ARBlackPanther/viro_core/build.gradle
@@ -1,2 +1,2 @@
 configurations.maybeCreate("default")
-artifacts.add("default", file('virocore-release-v_1_17_0.aar'))
+artifacts.add("default", file('virocore-release.aar'))
diff --git a/...d/viro_core/virocore-release-v_1_17_0.aar → ...ackPanther/viro_core/virocore-release.aar b/...d/viro_core/virocore-release-v_1_17_0.aar → ...ackPanther/viro_core/virocore-release.aar
diff --git a/code-samples/ARHelloWorldAndroid/app/build.gradle b/code-samples/ARHelloWorldAndroid/app/build.gradle
@@ -5,13 +5,13 @@ android {
 
     defaultConfig {
         applicationId "com.example.virosample"
-        minSdkVersion 21
+        minSdkVersion 24
         targetSdkVersion 30
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         ndk {
-            abiFilters "armeabi-v7a", "x86", "armeabi", "mips"
+            abiFilters "arm64-v8a", "armeabi-v7a", "x86", "armeabi", "mips"
         }
     }
 
@@ -40,9 +40,4 @@ dependencies {
     implementation project(':arcore_client')
     implementation project(':viro_core')
     implementation 'com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-7'
-    implementation 'com.amazonaws:aws-android-sdk-core:2.7.7'
-    implementation 'com.amazonaws:aws-android-sdk-ddb:2.7.7'
-    implementation 'com.amazonaws:aws-android-sdk-ddb-mapper:2.7.7'
-    implementation 'com.amazonaws:aws-android-sdk-cognito:2.7.7'
-    implementation 'com.amazonaws:aws-android-sdk-cognitoidentityprovider:2.7.7'
 }
diff --git a/code-samples/ARHelloWorldAndroid/app/src/main/AndroidManifest.xml b/code-samples/ARHelloWorldAndroid/app/src/main/AndroidManifest.xml
@@ -2,6 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.virosample">
 
+    <queries>
+        <package android:name="com.google.ar.core"/>
+    </queries>
+
     <!-- Required for AR -->
     <uses-permission android:name="android.permission.CAMERA"/>
 
@@ -16,10 +20,6 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
 
-        <meta-data
-            android:name="com.viromedia.API_KEY"
-            android:value="API_KEY_HERE" />
-
         <meta-data android:name="com.google.ar.core" android:value="optional" />
 
         <activity

diff --git a/code-samples/ARHelloWorldAndroid/arcore_client/build.gradle b/code-samples/ARHelloWorldAndroid/arcore_client/build.gradle
@@ -1,2 +1,2 @@
 configurations.maybeCreate("default")
-artifacts.add("default", file('core-1.10.0.aar'))
+artifacts.add("default", file('core-1.26.0.aar'))
diff --git a/code-samples/ARHelloWorldAndroid/arcore_client/core-1.10.0.aar b/code-samples/ARHelloWorldAndroid/arcore_client/core-1.10.0.aar
diff --git a/code-samples/ARHelloWorldAndroid/arcore_client/core-1.26.0.aar b/code-samples/ARHelloWorldAndroid/arcore_client/core-1.26.0.aar
diff --git a/code-samples/ARHelloWorldAndroid/viro_core/build.gradle b/code-samples/ARHelloWorldAndroid/viro_core/build.gradle
@@ -1,2 +1,2 @@
 configurations.maybeCreate("default")
-artifacts.add("default", file('virocore-release-v_1_17_0.aar'))
+artifacts.add("default", file('virocore-release.aar'))
diff --git a/...s/viro_core/virocore-release-v_1_17_0.aar → ...rldAndroid/viro_core/virocore-release.aar b/...s/viro_core/virocore-release-v_1_17_0.aar → ...rldAndroid/viro_core/virocore-release.aar
diff --git a/code-samples/ARPlacingObjects/app/build.gradle b/code-samples/ARPlacingObjects/app/build.gradle
@@ -5,13 +5,13 @@ android {
 
     defaultConfig {
         applicationId "com.example.virosample"
-        minSdkVersion 21
+        minSdkVersion 24
         targetSdkVersion 30
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         ndk {
-            abiFilters "armeabi-v7a", "x86", "armeabi", "mips"
+            abiFilters "arm64-v8a", "armeabi-v7a", "x86", "armeabi", "mips"
         }
     }
 
@@ -25,6 +25,11 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    packagingOptions {
+        pickFirst 'lib/armeabi-v7a/libarcore_sdk_c.so'
+        pickFirst 'lib/arm64-v8a/libarcore_sdk_c.so'
+        pickFirst 'lib/x86_64/libarcore_sdk_c.so'
+    }
 }
 
 dependencies {
@@ -40,9 +45,4 @@ dependencies {
     implementation project(':arcore_client')
     implementation project(':viro_core')
     implementation 'com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-7'
-    implementation 'com.amazonaws:aws-android-sdk-core:2.7.7'
-    implementation 'com.amazonaws:aws-android-sdk-ddb:2.7.7'
-    implementation 'com.amazonaws:aws-android-sdk-ddb-mapper:2.7.7'
-    implementation 'com.amazonaws:aws-android-sdk-cognito:2.7.7'
-    implementation 'com.amazonaws:aws-android-sdk-cognitoidentityprovider:2.7.7'
 }
diff --git a/code-samples/ARPlacingObjects/app/src/main/AndroidManifest.xml b/code-samples/ARPlacingObjects/app/src/main/AndroidManifest.xml
@@ -2,6 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.virosample">
 
+    <queries>
+        <package android:name="com.google.ar.core"/>
+    </queries>
+
     <!-- Required for AR -->
     <uses-permission android:name="android.permission.CAMERA"/>
 
@@ -15,10 +19,7 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-
-        <meta-data
-            android:name="com.viromedia.API_KEY"
-            android:value="7EEDCB99-2C3B-4681-AE17-17BC165BF792" />
+
         <meta-data android:name="com.google.ar.core" android:value="optional" />
 
         <activity

diff --git a/code-samples/ARPlacingObjects/arcore_client/build.gradle b/code-samples/ARPlacingObjects/arcore_client/build.gradle
@@ -1,2 +1,2 @@
 configurations.maybeCreate("default")
-artifacts.add("default", file('core-1.10.0.aar'))
+artifacts.add("default", file('core-1.26.0.aar'))
diff --git a/code-samples/ARPlacingObjects/arcore_client/core-1.10.0.aar b/code-samples/ARPlacingObjects/arcore_client/core-1.10.0.aar
diff --git a/code-samples/ARPlacingObjects/arcore_client/core-1.26.0.aar b/code-samples/ARPlacingObjects/arcore_client/core-1.26.0.aar
diff --git a/code-samples/ARPlacingObjects/viro_core/build.gradle b/code-samples/ARPlacingObjects/viro_core/build.gradle
@@ -1,2 +1,2 @@
 configurations.maybeCreate("default")
-artifacts.add("default", file('virocore-release-v_1_17_0.aar'))
+artifacts.add("default", file('virocore-release.aar'))
diff --git a/...r/viro_core/virocore-release-v_1_17_0.aar → ...ingObjects/viro_core/virocore-release.aar b/...r/viro_core/virocore-release-v_1_17_0.aar → ...ingObjects/viro_core/virocore-release.aar