Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use artifacts from jitpack.io in samples #25

Merged
merged 1 commit into from
Sep 24, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion code-samples/ARBlackPanther/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
1 change: 1 addition & 0 deletions code-samples/ARBlackPanther/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ allprojects {
repositories {
jcenter()
google()
maven { url 'https://jitpack.io' }
}
}

Expand Down
2 changes: 1 addition & 1 deletion code-samples/ARBlackPanther/settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include ':app', ':arcore_client', ':gvr_common', ':viro_core'
include ':app', ':arcore_client', ':gvr_common'
2 changes: 0 additions & 2 deletions code-samples/ARBlackPanther/viro_core/build.gradle

This file was deleted.

Binary file not shown.
4 changes: 3 additions & 1 deletion code-samples/ARHelloWorldAndroid/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
1 change: 1 addition & 0 deletions code-samples/ARHelloWorldAndroid/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ allprojects {
repositories {
jcenter()
google()
maven { url 'https://jitpack.io' }
}
}

Expand Down
2 changes: 1 addition & 1 deletion code-samples/ARHelloWorldAndroid/settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include ':app', ':arcore_client', ':gvr_common', ':viro_core'
include ':app', ':arcore_client', ':gvr_common'
2 changes: 0 additions & 2 deletions code-samples/ARHelloWorldAndroid/viro_core/build.gradle

This file was deleted.

Binary file not shown.
4 changes: 3 additions & 1 deletion code-samples/ARPlacingObjects/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
1 change: 1 addition & 0 deletions code-samples/ARPlacingObjects/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ allprojects {
repositories {
jcenter()
google()
maven { url 'https://jitpack.io' }
}
}

Expand Down
2 changes: 1 addition & 1 deletion code-samples/ARPlacingObjects/settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include ':app', ':arcore_client', ':gvr_common', ':viro_core'
include ':app', ':arcore_client', ':gvr_common'
2 changes: 0 additions & 2 deletions code-samples/ARPlacingObjects/viro_core/build.gradle

This file was deleted.

Binary file not shown.
4 changes: 3 additions & 1 deletion code-samples/ARRetail/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
1 change: 1 addition & 0 deletions code-samples/ARRetail/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ allprojects {
repositories {
jcenter()
google()
maven { url 'https://jitpack.io' }
}
}

Expand Down
2 changes: 1 addition & 1 deletion code-samples/ARRetail/settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include ':app', ':arcore_client', ':gvr_common', ':viro_core'
include ':app', ':arcore_client', ':gvr_common'
2 changes: 0 additions & 2 deletions code-samples/ARRetail/viro_core/build.gradle

This file was deleted.

Binary file removed code-samples/ARRetail/viro_core/virocore-release.aar
Binary file not shown.
15 changes: 14 additions & 1 deletion code-samples/ARTesla/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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'
}
1 change: 1 addition & 0 deletions code-samples/ARTesla/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ allprojects {
repositories {
jcenter()
google()
maven { url 'https://jitpack.io' }
}
}

Expand Down
2 changes: 1 addition & 1 deletion code-samples/ARTesla/settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include ':app', ':arcore_client', ':gvr_common', ':viro_core'
include ':app', ':arcore_client', ':gvr_common'
2 changes: 0 additions & 2 deletions code-samples/ARTesla/viro_core/build.gradle

This file was deleted.

Binary file removed code-samples/ARTesla/viro_core/virocore-release.aar
Binary file not shown.