diff --git a/code-samples/ARBlackPanther/app/build.gradle b/code-samples/ARBlackPanther/app/build.gradle index 1d4244d73..d4ca6ea8c 100644 --- a/code-samples/ARBlackPanther/app/build.gradle +++ b/code-samples/ARBlackPanther/app/build.gradle @@ -32,6 +32,8 @@ dependencies { testImplementation 'junit:junit:4.13.2' implementation project(':gvr_common') implementation project(':arcore_client') - implementation project(':viro_core') + implementation('com.github.ViroCommunity.virocore:virocore:rc-1.20.2') { + transitive = false + } implementation 'com.google.protobuf.nano:protobuf-javanano:3.2.0rc2' } diff --git a/code-samples/ARBlackPanther/build.gradle b/code-samples/ARBlackPanther/build.gradle index c050e76c8..8d98f0c03 100644 --- a/code-samples/ARBlackPanther/build.gradle +++ b/code-samples/ARBlackPanther/build.gradle @@ -12,6 +12,7 @@ allprojects { repositories { jcenter() google() + maven { url 'https://jitpack.io' } } } diff --git a/code-samples/ARBlackPanther/settings.gradle b/code-samples/ARBlackPanther/settings.gradle index d383ee4a5..e070669f7 100644 --- a/code-samples/ARBlackPanther/settings.gradle +++ b/code-samples/ARBlackPanther/settings.gradle @@ -1 +1 @@ -include ':app', ':arcore_client', ':gvr_common', ':viro_core' +include ':app', ':arcore_client', ':gvr_common' diff --git a/code-samples/ARBlackPanther/viro_core/build.gradle b/code-samples/ARBlackPanther/viro_core/build.gradle deleted file mode 100644 index 45541d6ee..000000000 --- a/code-samples/ARBlackPanther/viro_core/build.gradle +++ /dev/null @@ -1,2 +0,0 @@ -configurations.maybeCreate("default") -artifacts.add("default", file('virocore-release.aar')) diff --git a/code-samples/ARBlackPanther/viro_core/virocore-release.aar b/code-samples/ARBlackPanther/viro_core/virocore-release.aar deleted file mode 100644 index cc379bbee..000000000 Binary files a/code-samples/ARBlackPanther/viro_core/virocore-release.aar and /dev/null differ diff --git a/code-samples/ARHelloWorldAndroid/app/build.gradle b/code-samples/ARHelloWorldAndroid/app/build.gradle index f26374509..7d2b1583c 100644 --- a/code-samples/ARHelloWorldAndroid/app/build.gradle +++ b/code-samples/ARHelloWorldAndroid/app/build.gradle @@ -36,6 +36,8 @@ dependencies { testImplementation 'junit:junit:4.13.2' implementation project(':gvr_common') implementation project(':arcore_client') - implementation project(':viro_core') + implementation('com.github.ViroCommunity.virocore:virocore:rc-1.20.2') { + transitive = false + } implementation 'com.google.protobuf.nano:protobuf-javanano:3.2.0rc2' } diff --git a/code-samples/ARHelloWorldAndroid/build.gradle b/code-samples/ARHelloWorldAndroid/build.gradle index c050e76c8..8d98f0c03 100644 --- a/code-samples/ARHelloWorldAndroid/build.gradle +++ b/code-samples/ARHelloWorldAndroid/build.gradle @@ -12,6 +12,7 @@ allprojects { repositories { jcenter() google() + maven { url 'https://jitpack.io' } } } diff --git a/code-samples/ARHelloWorldAndroid/settings.gradle b/code-samples/ARHelloWorldAndroid/settings.gradle index d383ee4a5..e070669f7 100644 --- a/code-samples/ARHelloWorldAndroid/settings.gradle +++ b/code-samples/ARHelloWorldAndroid/settings.gradle @@ -1 +1 @@ -include ':app', ':arcore_client', ':gvr_common', ':viro_core' +include ':app', ':arcore_client', ':gvr_common' diff --git a/code-samples/ARHelloWorldAndroid/viro_core/build.gradle b/code-samples/ARHelloWorldAndroid/viro_core/build.gradle deleted file mode 100644 index 45541d6ee..000000000 --- a/code-samples/ARHelloWorldAndroid/viro_core/build.gradle +++ /dev/null @@ -1,2 +0,0 @@ -configurations.maybeCreate("default") -artifacts.add("default", file('virocore-release.aar')) diff --git a/code-samples/ARHelloWorldAndroid/viro_core/virocore-release.aar b/code-samples/ARHelloWorldAndroid/viro_core/virocore-release.aar deleted file mode 100644 index cc379bbee..000000000 Binary files a/code-samples/ARHelloWorldAndroid/viro_core/virocore-release.aar and /dev/null differ diff --git a/code-samples/ARPlacingObjects/app/build.gradle b/code-samples/ARPlacingObjects/app/build.gradle index 7d7c5e69d..6272d32d5 100644 --- a/code-samples/ARPlacingObjects/app/build.gradle +++ b/code-samples/ARPlacingObjects/app/build.gradle @@ -41,6 +41,8 @@ dependencies { testImplementation 'junit:junit:4.13.2' implementation project(':gvr_common') implementation project(':arcore_client') - implementation project(':viro_core') + implementation('com.github.ViroCommunity.virocore:virocore:rc-1.20.2') { + transitive = false + } implementation 'com.google.protobuf.nano:protobuf-javanano:3.2.0rc2' } diff --git a/code-samples/ARPlacingObjects/build.gradle b/code-samples/ARPlacingObjects/build.gradle index c050e76c8..8d98f0c03 100644 --- a/code-samples/ARPlacingObjects/build.gradle +++ b/code-samples/ARPlacingObjects/build.gradle @@ -12,6 +12,7 @@ allprojects { repositories { jcenter() google() + maven { url 'https://jitpack.io' } } } diff --git a/code-samples/ARPlacingObjects/settings.gradle b/code-samples/ARPlacingObjects/settings.gradle index d383ee4a5..e070669f7 100644 --- a/code-samples/ARPlacingObjects/settings.gradle +++ b/code-samples/ARPlacingObjects/settings.gradle @@ -1 +1 @@ -include ':app', ':arcore_client', ':gvr_common', ':viro_core' +include ':app', ':arcore_client', ':gvr_common' diff --git a/code-samples/ARPlacingObjects/viro_core/build.gradle b/code-samples/ARPlacingObjects/viro_core/build.gradle deleted file mode 100644 index 45541d6ee..000000000 --- a/code-samples/ARPlacingObjects/viro_core/build.gradle +++ /dev/null @@ -1,2 +0,0 @@ -configurations.maybeCreate("default") -artifacts.add("default", file('virocore-release.aar')) diff --git a/code-samples/ARPlacingObjects/viro_core/virocore-release.aar b/code-samples/ARPlacingObjects/viro_core/virocore-release.aar deleted file mode 100644 index cc379bbee..000000000 Binary files a/code-samples/ARPlacingObjects/viro_core/virocore-release.aar and /dev/null differ diff --git a/code-samples/ARRetail/app/build.gradle b/code-samples/ARRetail/app/build.gradle index 8fe2d3e96..159db16eb 100644 --- a/code-samples/ARRetail/app/build.gradle +++ b/code-samples/ARRetail/app/build.gradle @@ -32,6 +32,8 @@ dependencies { testImplementation 'junit:junit:4.13.2' implementation project(':gvr_common') implementation project(':arcore_client') - implementation project(':viro_core') + implementation('com.github.ViroCommunity.virocore:virocore:rc-1.20.2') { + transitive = false + } implementation 'com.google.protobuf.nano:protobuf-javanano:3.2.0rc2' } diff --git a/code-samples/ARRetail/build.gradle b/code-samples/ARRetail/build.gradle index c050e76c8..8d98f0c03 100644 --- a/code-samples/ARRetail/build.gradle +++ b/code-samples/ARRetail/build.gradle @@ -12,6 +12,7 @@ allprojects { repositories { jcenter() google() + maven { url 'https://jitpack.io' } } } diff --git a/code-samples/ARRetail/settings.gradle b/code-samples/ARRetail/settings.gradle index d383ee4a5..e070669f7 100644 --- a/code-samples/ARRetail/settings.gradle +++ b/code-samples/ARRetail/settings.gradle @@ -1 +1 @@ -include ':app', ':arcore_client', ':gvr_common', ':viro_core' +include ':app', ':arcore_client', ':gvr_common' diff --git a/code-samples/ARRetail/viro_core/build.gradle b/code-samples/ARRetail/viro_core/build.gradle deleted file mode 100644 index 45541d6ee..000000000 --- a/code-samples/ARRetail/viro_core/build.gradle +++ /dev/null @@ -1,2 +0,0 @@ -configurations.maybeCreate("default") -artifacts.add("default", file('virocore-release.aar')) diff --git a/code-samples/ARRetail/viro_core/virocore-release.aar b/code-samples/ARRetail/viro_core/virocore-release.aar deleted file mode 100644 index cc379bbee..000000000 Binary files a/code-samples/ARRetail/viro_core/virocore-release.aar and /dev/null differ diff --git a/code-samples/ARTesla/app/build.gradle b/code-samples/ARTesla/app/build.gradle index 1d4244d73..c112c34bb 100644 --- a/code-samples/ARTesla/app/build.gradle +++ b/code-samples/ARTesla/app/build.gradle @@ -21,6 +21,17 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + + packagingOptions { + // x86 is currently not supported, so do not copy over these resources + exclude '**/x86/**' + exclude '**/x86_64/**' + + pickFirst 'lib/arm64-v8a/libarcore_sdk_c.so' + pickFirst 'lib/arm64-v8a/libviro_arcore.so' + pickFirst 'lib/armeabi-v7a/libarcore_sdk_c.so' + pickFirst 'lib/armeabi-v7a/libviro_arcore.so' + } } dependencies { @@ -32,6 +43,8 @@ dependencies { testImplementation 'junit:junit:4.13.2' implementation project(':gvr_common') implementation project(':arcore_client') - implementation project(':viro_core') + implementation('com.github.ViroCommunity.virocore:virocore:rc-1.20.2') { + transitive = false + } implementation 'com.google.protobuf.nano:protobuf-javanano:3.2.0rc2' } diff --git a/code-samples/ARTesla/build.gradle b/code-samples/ARTesla/build.gradle index c050e76c8..8d98f0c03 100644 --- a/code-samples/ARTesla/build.gradle +++ b/code-samples/ARTesla/build.gradle @@ -12,6 +12,7 @@ allprojects { repositories { jcenter() google() + maven { url 'https://jitpack.io' } } } diff --git a/code-samples/ARTesla/settings.gradle b/code-samples/ARTesla/settings.gradle index d383ee4a5..e070669f7 100644 --- a/code-samples/ARTesla/settings.gradle +++ b/code-samples/ARTesla/settings.gradle @@ -1 +1 @@ -include ':app', ':arcore_client', ':gvr_common', ':viro_core' +include ':app', ':arcore_client', ':gvr_common' diff --git a/code-samples/ARTesla/viro_core/build.gradle b/code-samples/ARTesla/viro_core/build.gradle deleted file mode 100644 index 45541d6ee..000000000 --- a/code-samples/ARTesla/viro_core/build.gradle +++ /dev/null @@ -1,2 +0,0 @@ -configurations.maybeCreate("default") -artifacts.add("default", file('virocore-release.aar')) diff --git a/code-samples/ARTesla/viro_core/virocore-release.aar b/code-samples/ARTesla/viro_core/virocore-release.aar deleted file mode 100644 index cc379bbee..000000000 Binary files a/code-samples/ARTesla/viro_core/virocore-release.aar and /dev/null differ