Skip to content

Commit c37e413

Browse files
AvtrkrbBrijesh K Rrobertjcolley
authored
fix: update ios and android builds (#137)
* fix: Migrated com.google.android.exoplayer2 -> androidx.media3.exoplayer. * fix: bugs, rebuilt all submodules including viro_renderer.aar, upgraded to arcore 1.41.0. Tested with custom app. * feat: and prepare_release.sh build script * remove: API keys * chore: update pull-request-template.yml * chore: update github workflow * chore: update release script * chore: ENABLE_BITCODE=NO * chore: android api 33 --------- Co-authored-by: Brijesh K R <brijesh@localhost.localdomain> Co-authored-by: Robert Colley <robert.colley04@gmail.com>
1 parent b9dc20e commit c37e413

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+3200
-543
lines changed

‎.github/workflows/pull-request.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ jobs:
1414
- name: set up JDK
1515
uses: actions/setup-java@v3
1616
with:
17-
distribution: 'adopt'
18-
java-version: 11
17+
distribution: "adopt"
18+
java-version: 17
1919

2020
- name: assemble ViroCore
2121
run: |
22-
./gradlew assembleDebug
22+
./gradlew :viroreact:assembleDebug
2323
working-directory: ./android
2424
- name: Upload result ViroCore
2525
uses: actions/upload-artifact@v3.1.2
@@ -41,13 +41,13 @@ jobs:
4141
uses: actions/checkout@v3.3.0
4242
with:
4343
fetch-depth: 0
44-
- name: Install JDK 11
44+
- name: Install JDK
4545
uses: actions/setup-java@v3
4646
with:
4747
distribution: "adopt"
48-
java-version: 11
48+
java-version: 17
4949
- name: Code checks
50-
run: ./gradlew check
50+
run: ./gradlew :viroreact:check
5151
- name: Archive Lint report
5252
uses: actions/upload-artifact@v3.1.2
5353
if: ${{ always() }}
@@ -62,8 +62,8 @@ jobs:
6262
strategy:
6363
fail-fast: false
6464
matrix:
65-
xcode: [ '12.5.1', '13.2.1' ]
66-
macOS: [ 'macOS-11' ]
65+
xcode: ["14.2.0", "13.4.1"]
66+
macOS: ["macos-12"]
6767
steps:
6868
- uses: actions/checkout@v3.3.0
6969
- name: Install gpg
@@ -79,12 +79,12 @@ jobs:
7979
- name: Xcodebuild iOS Renderer (non-static)
8080
run: |
8181
cd ios
82-
xcodebuild \
82+
set -o pipefail && xcodebuild \
8383
-workspace ViroRenderer.xcworkspace \
8484
-scheme ViroKit \
8585
-sdk iphoneos \
8686
-configuration Release \
87-
IPHONEOS_DEPLOYMENT_TARGET=9.0
87+
IPHONEOS_DEPLOYMENT_TARGET=13.0 | xcpretty
8888
8989
- name: Upload iOS Renderer artifact
9090
uses: actions/upload-artifact@v3.1.2

‎.github/workflows/release.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Release with changelog
33
on:
44
push:
55
tags:
6-
- '*'
6+
- "*"
77

88
jobs:
99
release:
@@ -17,14 +17,14 @@ jobs:
1717
- name: Install JDK ${{ matrix.java_version }}
1818
uses: actions/setup-java@v3
1919
with:
20-
distribution: 'adopt'
21-
java-version: 11
20+
distribution: "adopt"
21+
java-version: 17
2222

2323
- name: Get the version
2424
id: tagger
2525
uses: jimschubert/query-tag-action@v2
2626
with:
27-
skip-unshallow: 'true'
27+
skip-unshallow: "true"
2828
abbrev: false
2929
commit-ish: HEAD
3030

@@ -44,7 +44,7 @@ jobs:
4444
uses: malinskiy/action-android/install-sdk@release/0.1.3
4545

4646
- name: Build project
47-
run: ./gradlew assembleRelease
47+
run: ./gradlew :viroreact:assembleRelease
4848
working-directory: ./android
4949

5050
- name: Create Release
@@ -60,4 +60,4 @@ jobs:
6060
./virocore/build/outputs/aar/virocore-release.aar
6161
./sharedCode/build/outputs/aar/sharedCode-release.aar
6262
env:
63-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
63+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎android/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
buildscript {
2-
ext.kotlin_version = '1.6.21'
2+
ext.kotlin_version = '1.8.21'
33
repositories {
44
mavenCentral()
55
google()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:7.4.2'
8+
classpath 'com.android.tools.build:gradle:8.2.0'
99
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
10-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
10+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21"
1111
}
1212
}
1313

‎android/code-samples/ARBlackPanther/build.gradle‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 31
4+
compileSdkVersion 33
5+
namespace "com.example.virosample.blackPanther"
56

67
defaultConfig {
78
minSdkVersion 24
8-
targetSdkVersion 31
9+
targetSdkVersion 33
910
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
11+
ndkVersion = "25.2.9519653"
1012
ndk {
1113
abiFilters "arm64-v8a", "armeabi-v7a", "x86", "armeabi", "mips"
1214
}
@@ -31,8 +33,8 @@ android {
3133

3234
dependencies {
3335
implementation fileTree(dir: 'libs', include: ['*.jar'])
34-
implementation 'androidx.appcompat:appcompat:1.3.1'
35-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
36+
implementation 'androidx.appcompat:appcompat:1.0.0'
37+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
3638
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
3739
testImplementation 'junit:junit:4.13.2'
3840
api project(':code-samples:gvr_common')
@@ -43,5 +45,5 @@ dependencies {
4345
codeImplementation (project(path: ':virocore')) {
4446
transitive = false
4547
}
46-
implementation 'com.google.protobuf.nano:protobuf-javanano:3.2.0rc2'
48+
implementation 'com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-7'
4749
}

‎android/code-samples/ARHelloWorldAndroid/build.gradle‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 31
4+
compileSdkVersion 33
5+
namespace "com.example.virosample.hello"
56

67
defaultConfig {
78
minSdkVersion 24
8-
targetSdkVersion 31
9+
targetSdkVersion 33
910
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
11+
ndkVersion = "25.2.9519653"
1012
ndk {
1113
abiFilters "arm64-v8a", "armeabi-v7a", "x86", "armeabi", "mips"
1214
}
@@ -35,8 +37,8 @@ android {
3537

3638
dependencies {
3739
implementation fileTree(dir: 'libs', include: ['*.jar'])
38-
implementation 'androidx.appcompat:appcompat:1.3.1'
39-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
40+
implementation 'androidx.appcompat:appcompat:1.0.0'
41+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
4042
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
4143
testImplementation 'junit:junit:4.13.2'
4244
api project(':code-samples:gvr_common')
@@ -47,5 +49,5 @@ dependencies {
4749
codeImplementation (project(path: ':virocore')) {
4850
transitive = false
4951
}
50-
implementation 'com.google.protobuf.nano:protobuf-javanano:3.2.0rc2'
52+
implementation 'com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-7'
5153
}

‎android/code-samples/ARPlacingObjects/build.gradle‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@ apply plugin: 'com.android.library'
22
apply plugin: 'kotlin-android'
33

44
android {
5-
compileSdkVersion 31
5+
compileSdkVersion 33
6+
namespace "com.example.virosample.placingObjects"
67

78
defaultConfig {
89
minSdkVersion 24
9-
targetSdkVersion 31
10+
targetSdkVersion 33
1011
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
12+
ndkVersion = "25.2.9519653"
1113
ndk {
1214
abiFilters "arm64-v8a", "armeabi-v7a", "x86", "armeabi", "mips"
1315
}
@@ -42,9 +44,9 @@ android {
4244

4345
dependencies {
4446
implementation fileTree(dir: 'libs', include: ['*.jar'])
45-
implementation 'androidx.appcompat:appcompat:1.3.1'
47+
implementation 'androidx.appcompat:appcompat:1.0.0'
4648
implementation 'com.google.android.material:material:1.6.1'
47-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
49+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
4850
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
4951
testImplementation 'junit:junit:4.13.2'
5052
api project(':code-samples:gvr_common')
@@ -55,7 +57,7 @@ dependencies {
5557
codeImplementation (project(path: ':virocore')) {
5658
transitive = false
5759
}
58-
implementation 'com.google.protobuf.nano:protobuf-javanano:3.2.0rc2'
59-
implementation "androidx.core:core-ktx:1.6.0"
60-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
60+
implementation 'com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-7'
61+
implementation "androidx.core:core-ktx:1.8.0"
62+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.21"
6163
}

‎android/code-samples/ARRetail/build.gradle‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 31
4+
compileSdkVersion 33
5+
namespace "com.example.virosample.retail"
56

67
defaultConfig {
78
minSdkVersion 24
8-
targetSdkVersion 31
9+
targetSdkVersion 33
910
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
11+
ndkVersion = "25.2.9519653"
1012
ndk {
1113
abiFilters "arm64-v8a", "armeabi-v7a", "x86", "armeabi", "mips"
1214
}
@@ -31,8 +33,8 @@ android {
3133
dependencies {
3234
implementation fileTree(dir: 'libs', include: ['*.jar'])
3335
implementation 'androidx.recyclerview:recyclerview:1.2.1'
34-
implementation 'androidx.appcompat:appcompat:1.3.1'
35-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
36+
implementation 'androidx.appcompat:appcompat:1.0.0'
37+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
3638
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
3739
testImplementation 'junit:junit:4.13.2'
3840
api project(':code-samples:gvr_common')
@@ -43,5 +45,5 @@ dependencies {
4345
codeImplementation (project(path: ':virocore')) {
4446
transitive = false
4547
}
46-
implementation 'com.google.protobuf.nano:protobuf-javanano:3.2.0rc2'
48+
implementation 'com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-7'
4749
}

‎android/code-samples/ARTesla/build.gradle‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 31
4+
compileSdkVersion 33
5+
namespace "com.example.virosample.tesla"
56

67
defaultConfig {
78
minSdkVersion 24
8-
targetSdkVersion 31
9+
targetSdkVersion 33
910
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
11+
ndkVersion = "25.2.9519653"
1012
ndk {
1113
abiFilters "arm64-v8a", "armeabi-v7a", "x86", "armeabi", "mips"
1214
}
@@ -30,8 +32,8 @@ android {
3032

3133
dependencies {
3234
implementation fileTree(dir: 'libs', include: ['*.jar'])
33-
implementation 'androidx.appcompat:appcompat:1.3.1'
34-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
35+
implementation 'androidx.appcompat:appcompat:1.0.0'
36+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
3537
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
3638
testImplementation 'junit:junit:4.13.2'
3739
api project(':code-samples:gvr_common')
@@ -43,5 +45,5 @@ dependencies {
4345
codeApi (project(path: ':virocore')) {
4446
transitive = false
4547
}
46-
implementation 'com.google.protobuf.nano:protobuf-javanano:3.2.0rc2'
48+
implementation 'com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-7'
4749
}

‎android/code-samples/arcore_client/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
configurations.maybeCreate("default")
2-
artifacts.add("default", file('core-1.26.0.aar'))
2+
artifacts.add("default", file('core-1.41.0.aar'))

‎android/code-samples/arcore_client/core-1.26.0.aar‎

-246 KB
Binary file not shown.

0 commit comments

Comments
 (0)