diff --git a/android/libs/arcore/README.txt b/android/libs/arcore/README.txt deleted file mode 100644 index 3d151277d..000000000 --- a/android/libs/arcore/README.txt +++ /dev/null @@ -1,15 +0,0 @@ -ARCore .so files to be moved into viroar/src/main/jniLibs so that native code can access them. They have to be *removed* from the ARCore AAR file as well, to prevent conflicts. To do this: - -1. Extract core-X.Y.Z.aar into directory core-X.Y.Z.aar (unzip core-X.Y.Z.aar -d tempFolder) - -2. Remove the C .so files and place them in viroar/src/main/jniLibs/[ARCH] - -3. Do NOT remove the JNI .so files: those need to remain in the AAR. - -4. Zip up the AAR files back into an archive. (jar cvf core-X.Y.Z.aar -C tempFolder/ .) - -5. Also update the arcore_c_api.h in ViroRenderer source (you get this by downloading the SDK -> libraries -> include -> arcore_c_api.h) - -Note: You can get future ARCore.aar files here: -- https://dl.google.com/dl/android/maven2/com/google/ar/core//core-.aar -- eg. https://dl.google.com/dl/android/maven2/com/google/ar/core/1.4.0/core-1.4.0.aar diff --git a/android/libs/arcore/build.gradle b/android/libs/arcore/build.gradle deleted file mode 100644 index 4984c1748..000000000 --- a/android/libs/arcore/build.gradle +++ /dev/null @@ -1,2 +0,0 @@ -configurations.maybeCreate("default") -artifacts.add("default", file('core-1.41.0.aar')) diff --git a/android/libs/arcore/core-1.41.0.aar b/android/libs/arcore/core-1.41.0.aar deleted file mode 100644 index e4c5c50ed..000000000 Binary files a/android/libs/arcore/core-1.41.0.aar and /dev/null differ diff --git a/android/libs/arcore/version.txt b/android/libs/arcore/version.txt deleted file mode 100644 index 957cee082..000000000 --- a/android/libs/arcore/version.txt +++ /dev/null @@ -1,3 +0,0 @@ -ARCore version 1.41.0 - -(Version is for both include files and libs in src/main/jniLibs) diff --git a/android/memoryleaktest/build.gradle b/android/memoryleaktest/build.gradle index f15a50ecd..5a35b532e 100644 --- a/android/memoryleaktest/build.gradle +++ b/android/memoryleaktest/build.gradle @@ -64,7 +64,7 @@ dependencies { androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' implementation project(':virocore') implementation project(':libs:gvr') - implementation project(':libs:arcore') + implementation 'com.google.ar:core:1.41.0' implementation "androidx.appcompat:appcompat:1.0.0" implementation "androidx.core:core-ktx:1.8.0" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.21" diff --git a/android/nativetest/build.gradle b/android/nativetest/build.gradle index 45ccd976d..fb540a8d4 100644 --- a/android/nativetest/build.gradle +++ b/android/nativetest/build.gradle @@ -65,7 +65,7 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation project(':libs:arcore') + implementation 'com.google.ar:core:1.41.0' implementation project(':libs:gvr') implementation project(':virocore') implementation "androidx.appcompat:appcompat:1.0.0" diff --git a/android/releasetest/build.gradle b/android/releasetest/build.gradle index 81ec34584..0a838c2a9 100644 --- a/android/releasetest/build.gradle +++ b/android/releasetest/build.gradle @@ -83,7 +83,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0' implementation project(':virocore') - implementation project(':libs:arcore') + implementation 'com.google.ar:core:1.41.0' implementation project(':libs:gvr') implementation "androidx.appcompat:appcompat:1.0.0" // testing dependencies diff --git a/android/renderertest/build.gradle b/android/renderertest/build.gradle index cdf7b54ad..b1fbf8378 100644 --- a/android/renderertest/build.gradle +++ b/android/renderertest/build.gradle @@ -66,7 +66,7 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation project(':libs:arcore') + implementation 'com.google.ar:core:1.41.0' implementation project(':libs:gvr') implementation project(':virocore') implementation "androidx.appcompat:appcompat:1.0.0" diff --git a/android/settings.gradle b/android/settings.gradle index ee46ac172..dac5fce94 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,6 +1,6 @@ rootProject.name = 'ViroCORE' -include ':sharedCode', ':libs:gvr', ':libs:arcore', ':renderertest', ':memoryleaktest', ':virocore', ':viroreact', ':viroar', ':releasetest', ':nativetest' +include ':sharedCode', ':libs:gvr', ':renderertest', ':memoryleaktest', ':virocore', ':viroreact', ':viroar', ':releasetest', ':nativetest' include ':code-samples:gvr_common' include ':code-samples:arcore_client' diff --git a/android/sharedCode/build.gradle b/android/sharedCode/build.gradle index 0da6a9533..b0e540384 100644 --- a/android/sharedCode/build.gradle +++ b/android/sharedCode/build.gradle @@ -46,7 +46,7 @@ dependencies { implementation 'androidx.media3:media3-exoplayer-hls:1.1.1' implementation 'androidx.media3:media3-exoplayer-smoothstreaming:1.1.1' implementation project(':libs:gvr') - implementation project(':libs:arcore') + implementation 'com.google.ar:core:1.41.0' implementation 'com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-7' implementation "androidx.core:core-ktx:1.8.0" implementation "org.jetbrains.kotlin:kotlin-stdlib:1.8.21" diff --git a/android/virocore/build.gradle b/android/virocore/build.gradle index 8180d142a..74d5d8266 100644 --- a/android/virocore/build.gradle +++ b/android/virocore/build.gradle @@ -90,7 +90,7 @@ dependencies { implementation 'androidx.media3:media3-exoplayer-hls:1.1.1' implementation 'androidx.media3:media3-exoplayer-smoothstreaming:1.1.1' api project(':libs:gvr') - api project(':libs:arcore') + implementation 'com.google.ar:core:1.41.0' //implementation project(path: ':sharedCode') implementation 'com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-7' } diff --git a/android/viroreact/build.gradle b/android/viroreact/build.gradle index 99a4d4ecb..3caa5597c 100644 --- a/android/viroreact/build.gradle +++ b/android/viroreact/build.gradle @@ -95,7 +95,7 @@ dependencies { implementation 'androidx.media3:media3-exoplayer-hls:1.1.1' implementation 'androidx.media3:media3-exoplayer-smoothstreaming:1.1.1' implementation project(':libs:gvr') - implementation project(':libs:arcore') + implementation 'com.google.ar:core:1.41.0' implementation 'com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-7' } diff --git a/prepare_release.sh b/prepare_release.sh new file mode 100755 index 000000000..b37406475 --- /dev/null +++ b/prepare_release.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash + +set -e + +echo '=========================================================================' +echo 'Cleaning :viroreact' +echo '=========================================================================' +cd android && +./gradlew clean + +echo '=========================================================================' +echo 'Building :viroreact' +echo '=========================================================================' + ./gradlew :viroreact:assembleRelease + +echo '=========================================================================' +echo 'Checking for build artifacts' +echo '=========================================================================' +if [ ! -f viroreact/build/outputs/aar/viroreact-release.aar ]; then + echo -e "Unable to find viroreact release output!" + exit 1 +fi