Skip to content
This repository has been archived by the owner on Jun 21, 2023. It is now read-only.

[ci] Update CI image to use android-ndk-21b. #408

Merged
merged 2 commits into from
Jun 2, 2020
Merged

[ci] Update CI image to use android-ndk-21b. #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16c88a7
[ci] Update CI image to use android-ndk-21b.
pengdev Jun 1, 2020
2f2b19d
[build] Update gradle and gradle plugin versions.
pengdev Jun 1, 2020
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
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.0'
classpath 'com.android.tools.build:gradle:3.6.3'
Copy link
Member

@tobrun tobrun Jun 2, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we do 4.0.0 instead? AS 4.0 stable was released last week

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

4.0.0 introduced some breaking change, which need to be resolved. I can try to resolve the issues.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems there is an incompatibility issue with the android-sdk-versions-plugin and gradle plugin 4.0.0, the error is printed as follows:

Cannot cast object 'task ':MapboxGLAndroidSDK:generateDebugBuildConfig' property 'versionCode'' with class 'org.gradle.api.internal.provider.DefaultProperty' to class 'java.lang.Integer'

cc @harvsu

classpath dependenciesList.licensesPlugin
classpath dependenciesList.kotlinPlugin
classpath dependenciesList.bintrayPlugin
Expand Down
4 changes: 2 additions & 2 deletions circle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ jobs:
default: "c++_static"
image:
type: string
default: android-ndk-r20:7b7c4b42cf
default: android-ndk-r21b:a111a5b966
firebase_device_id:
type: string
default: sailfish
Expand Down Expand Up @@ -269,7 +269,7 @@ jobs:
# ------------------------------------------------------------------------------
android-release:
docker:
- image: mbgl/android-ndk-r20:7b7c4b42cf
- image: mbgl/android-ndk-r21b:a111a5b966
resource_class: xlarge
working_directory: /src
environment:
Expand Down
10 changes: 5 additions & 5 deletions gradle/dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ ext {
robolectric : '4.3',
timber : '4.7.1',
okhttp : '3.12.3',
kotlin : '1.3.41',
licenses : '0.8.5',
bintray : '1.8.4',
artifactory : '4.9.3',
kotlin : '1.3.72',
licenses : '0.8.80',
bintray : '1.8.5',
artifactory : '4.15.2',
androidPublish : '3.6.2',
lint : '26.4.2',
gms : '16.0.0',
jacoco : '0.8.4',
jacoco : '0.8.5',
appcenter : '1.4',
ktlint : '0.34.0',
commonsIO : '2.6',
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip