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

chore(android): update gradle tools and dependencies #11819

Merged
merged 5 commits into from
Jul 23, 2020
Merged

chore(android): update gradle tools and dependencies #11819

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
61835f7
chore(android): udpated gradle/dependency versions
jquick-axway Jul 14, 2020
5914fd9
chore(android): update tool versions in package.json
jquick-axway Jul 14, 2020
40ef408
chore(android): update android gradle tool to 4.0.1
jquick-axway Jul 16, 2020
aae99b3
Merge branch 'master' into TIMOB-27938
garymathews Jul 17, 2020
8a859b0
Merge branch 'master' into TIMOB-27938
ssjsamir Jul 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
*/

buildscript {
ext.kotlin_version = '1.3.61'
ext.kotlin_version = '1.3.72'

repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.6.2'
classpath 'com.android.tools.build:gradle:4.0.0'
jquick-axway marked this conversation as resolved.
Show resolved Hide resolved
classpath 'com.google.gms:google-services:4.3.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
Expand Down
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions android/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
"compileSDKVersion": "29",
"vendorDependencies": {
"android sdk": ">=23.x <=29.x",
"android build tools": ">=28.0.3 <=29.x",
"android build tools": ">=29.0.2 <=29.x",
Copy link
Contributor

Choose a reason for hiding this comment

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

feels like a bit of an odd version range to use here...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

To clarify, Android gradle tool v4.0.0 requires SDK build tool v29.0.2 or higher.
https://developer.android.com/studio/releases/gradle-plugin?buildsystem=ndk-build#4-0-0

There isn't a release version of SDK build tools v30.0.0 yet. It's currently an RC version.
https://developer.android.com/studio/releases/build-tools#notes

Also, we don't use these build tools directly anymore. Our Titanium SDK build scripts do pretty much everything via gradle (except for adb which is okay). But I'm trying to keep up with the version ranges here just in case something else depends on them that I'm not aware of.
(Note that gradle will automatically download/install these tools for us now.)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Or would you prefer we "uncap" the build tools version and not set a max?
I think that might be okay.

"android platform tools": "29.x",
"android tools": "<=26.x",
"android ndk": ">=r11c <=r20",
"android ndk": ">=r11c <=r21d",
"java": ">=1.8.x"
},
"repository": {
Expand Down
4 changes: 2 additions & 2 deletions android/templates/build/root.build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@

buildscript {
ext.kotlin_version = '1.3.61'
ext.kotlin_version = '1.3.72'

repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.6.2'
classpath 'com.android.tools.build:gradle:4.0.0'
classpath 'com.google.gms:google-services:4.3.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
Expand Down
8 changes: 4 additions & 4 deletions android/templates/build/ti.constants.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@

project.ext {
tiAndroidXAppCompatLibVersion = '1.1.0'
tiAndroidXCoreLibVersion = '1.1.0'
tiAndroidXFragmentLibVersion = '1.1.0'
tiMaterialLibVersion = '1.0.0'
tiPlayServicesBaseLibVersion = '17.1.0'
tiAndroidXCoreLibVersion = '1.3.0'
tiAndroidXFragmentLibVersion = '1.2.5'
tiMaterialLibVersion = '1.1.0'
tiPlayServicesBaseLibVersion = '17.3.0'
tiManifestPlaceholders = [
tiActivityConfigChanges: 'density|fontScale|keyboard|keyboardHidden|layoutDirection|locale|mcc|mnc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|touchscreen|uiMode'
]
Expand Down
2 changes: 1 addition & 1 deletion android/templates/module/default/template/android/lib/README
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

You can place your `*.jar` and `*.aar` library dependencies in this directory.
You can place your `*.jar` library dependencies in this directory.

Note that its best to reference dependencies in the module's "build.gradle" file
instead if you can. This avoids class name collision in case another module uses
Expand Down
8 changes: 4 additions & 4 deletions android/titanium/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,13 +288,13 @@ dependencies {
implementation "androidx.appcompat:appcompat:${project.ext.tiAndroidXAppCompatLibVersion}"
implementation 'androidx.cardview:cardview:1.0.0'
implementation "androidx.core:core:${project.ext.tiAndroidXCoreLibVersion}"
implementation 'androidx.drawerlayout:drawerlayout:1.0.0'
implementation 'androidx.exifinterface:exifinterface:1.1.0'
implementation 'androidx.drawerlayout:drawerlayout:1.1.0'
implementation 'androidx.exifinterface:exifinterface:1.2.0'
implementation "androidx.fragment:fragment:${project.ext.tiAndroidXFragmentLibVersion}"
implementation 'androidx.media:media:1.1.0'
implementation 'androidx.recyclerview:recyclerview:1.1.0'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0'
implementation 'androidx.transition:transition:1.2.0'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
implementation 'androidx.transition:transition:1.3.1'
implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
implementation 'androidx.viewpager:viewpager:1.0.0'
Expand Down