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.

Sign up for GitHub

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

Jump to bottom

Android target sdk 30 #2258

Merged
merged 11 commits into from
Apr 19, 2021
Merged

Android target sdk 30 #2258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
37ef3c4
Set Android target SDK version to 30
matteblair Apr 11, 2021
b286bfa
Update Android CircleCI docker image and pin tools versions
matteblair Apr 11, 2021
7db210c
Try pinned ndkVersion in build.gradle
matteblair Apr 18, 2021
09eedb2
Use ANDROID_NDK_PATH on CI
matteblair Apr 18, 2021
7cf51b7
Use quotes with ANDROID_NDK_HOME
matteblair Apr 18, 2021
84fa6b7
Try setting android.ndkPath in build.gradle
matteblair Apr 18, 2021
5056ec9
Try setting NDK path in local.properties
matteblair Apr 18, 2021
d28b564
Undo Android CCACHE_COMPILERCHECK work-around
matteblair Apr 19, 2021
c9c1e35
Bump android ccache keys
matteblair Apr 19, 2021
7a36ebd
Update Android Gradle plugin to 4.1.3
matteblair Apr 19, 2021
977df15
Merge remote-tracking branch 'origin/main' into android-target-sdk-30
matteblair Apr 19, 2021
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
29 changes: 18 additions & 11 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ version: 2.1
executors:
android-executor:
docker:
- image: circleci/android:api-28-ndk
- image: circleci/android:api-30-ndk
environment:
GRADLE_OPTS: -Xmx2048m
CCACHE_MAXSIZE: 400M
CCACHE_COMPILERCHECK: content # Default timestamp check fails because NDK compiler is installed for each job.
# The CircleCI android-ndk images export ANDROID_NDK_HOME with the location of the pre-installed NDK (https://github.com/CircleCI-Public/circleci-dockerfiles/tree/master/android/images).
macos-executor:
macos:
xcode: "12.2.0"
Expand Down Expand Up @@ -56,14 +56,19 @@ jobs:
- run: sudo apt-get update && sudo apt-get install -y ccache
- restore_cache:
keys:
- android-ccache-v3-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
- android-ccache-v3-{{ .Branch }}
- android-ccache-v3
- android-ccache-v4-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
- android-ccache-v4-{{ .Branch }}
- android-ccache-v4
- run: ccache --zero-stats
- run: cd platforms/android && ./gradlew demo:assembleDebug -Ptangram.abis=arm64-v8a -Ptangram.ccache=true
# Tell gradle to use pre-installed NDK. This setting is deprecated, but android.ndkPath is ignored for some reason.
- run: echo "ndk.dir=$ANDROID_NDK_HOME" > platforms/android/local.properties
- run: |
cd platforms/android && ./gradlew demo:assembleDebug \
-Ptangram.abis=arm64-v8a \
-Ptangram.ccache=true
- run: ccache --show-stats
- save_cache:
key: android-ccache-v3-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
key: android-ccache-v4-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
paths:
- ~/.ccache
build-deploy-android:
Expand All @@ -74,10 +79,12 @@ jobs:
- run: sudo apt-get update && sudo apt-get install -y ccache
- restore_cache:
keys:
- android-release-ccache-v1-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
- android-release-ccache-v1-{{ .Branch }}
- android-release-ccache-v1
- android-release-ccache-v2-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
- android-release-ccache-v2-{{ .Branch }}
- android-release-ccache-v2
- run: ccache --zero-stats
# Tell gradle to use pre-installed NDK. This setting is deprecated, but android.ndkPath is ignored for some reason.
- run: echo "ndk.dir=$ANDROID_NDK_HOME" > platforms/android/local.properties
# Configure publishing credentials.
- run: echo "$SIGNING_SECRET_KEYRING_BASE64" | base64 --decode > platforms/android/tangram/secring.gpg
# Build and upload snapshot.
Expand All @@ -89,7 +96,7 @@ jobs:
-Ptangram.ccache=true
- run: ccache --show-stats
- save_cache:
key: android-release-ccache-v1-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
key: android-release-ccache-v2-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
paths:
- ~/.ccache
build-ios:
Expand Down
2 changes: 1 addition & 1 deletion platforms/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ allprojects {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.2'
classpath 'com.android.tools.build:gradle:4.1.3'
}
}

Expand Down
4 changes: 2 additions & 2 deletions platforms/android/tangram/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = VERSION_NAME
apply from: 'versioning.gradle'

android {
compileSdkVersion 28
compileSdkVersion 30

// Specific ABI targets can be chosen with the 'abis' property as a comma-separated list of ABIs.
// From the command line, add '-Ptangram.abis=armeabi-v7a,x86,...' to only build those ABIs.
Expand All @@ -18,7 +18,7 @@ android {

defaultConfig {
minSdkVersion 16
targetSdkVersion 28
targetSdkVersion 30
versionCode buildVersionCode()
versionName VERSION_NAME
consumerProguardFiles 'tangram-proguard-rules.txt'
Expand Down