Skip to content

Commit

Permalink
fix: virocore build
Browse files Browse the repository at this point in the history
- Adds build script
  • Loading branch information
robertjcolley committed Feb 19, 2024
1 parent d789591 commit b8c28f0
Show file tree
Hide file tree
Showing 13 changed files with 30 additions and 28 deletions.
15 changes: 0 additions & 15 deletions android/libs/arcore/README.txt

This file was deleted.

2 changes: 0 additions & 2 deletions android/libs/arcore/build.gradle

This file was deleted.

Binary file removed android/libs/arcore/core-1.41.0.aar
Binary file not shown.
3 changes: 0 additions & 3 deletions android/libs/arcore/version.txt

This file was deleted.

2 changes: 1 addition & 1 deletion android/memoryleaktest/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion android/nativetest/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion android/releasetest/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion android/renderertest/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion android/settings.gradle
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion android/sharedCode/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion android/virocore/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down
2 changes: 1 addition & 1 deletion android/viroreact/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}

Expand Down
22 changes: 22 additions & 0 deletions prepare_release.sh
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit b8c28f0

Please sign in to comment.