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 #12821

Merged
merged 4 commits into from
May 27, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8afbdf1
chore(android): update gradle tools
jquick-axway May 19, 2021
9c3ec98
chore(android): update kotlin language support to 1.5.0
jquick-axway May 19, 2021
578ddc3
chore(android): update sdk library dependencies
jquick-axway May 19, 2021
bc66ec8
chore(android): remove deprecated usage of jcenter() repo
jquick-axway May 19, 2021
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
10 changes: 5 additions & 5 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@
*/

buildscript {
ext.kotlin_version = '1.4.30'
ext.kotlin_version = '1.5.0'

repositories {
google()
jcenter()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.2'
classpath 'com.google.gms:google-services:4.3.5'
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.google.gms:google-services:4.3.8'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}

allprojects {
repositories {
google()
jcenter()
mavenCentral()
}

// Load plugin used to enforce our Java coding style guidelines.
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.8.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion android/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"compileSDKVersion": "30",
"vendorDependencies": {
"android sdk": ">=23.x <=30.x",
"android build tools": ">=29.0.2 <=30.x",
"android build tools": ">=30.0.2 <=31.x",
"android platform tools": "30.x",
"android tools": "<=26.x",
"android ndk": ">=r11c <=r21d",
Expand Down
10 changes: 5 additions & 5 deletions android/templates/build/root.build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@

buildscript {
ext.kotlin_version = '1.4.30'
ext.kotlin_version = '1.5.0'

repositories {
google()
jcenter()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.2'
classpath 'com.google.gms:google-services:4.3.5'
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.google.gms:google-services:4.3.8'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}

allprojects {
repositories {
google()
jcenter()
mavenCentral()
}
project.apply from: "${rootDir}/ti.constants.gradle"
}
Expand Down
6 changes: 3 additions & 3 deletions android/templates/build/ti.constants.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
*/

project.ext {
tiAndroidXAppCompatLibVersion = '1.2.0'
tiAndroidXCoreLibVersion = '1.3.2'
tiAndroidXFragmentLibVersion = '1.3.0'
tiAndroidXAppCompatLibVersion = '1.3.0'
tiAndroidXCoreLibVersion = '1.5.0'
tiAndroidXFragmentLibVersion = '1.3.4'
tiMaterialLibVersion = '1.3.0'
tiPlayServicesBaseLibVersion = '17.6.0'
tiManifestPlaceholders = [
Expand Down
10 changes: 5 additions & 5 deletions android/titanium/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,23 +248,23 @@ dependencies {
implementation 'androidx.drawerlayout:drawerlayout:1.1.1'
implementation 'androidx.exifinterface:exifinterface:1.3.2'
implementation "androidx.fragment:fragment:${project.ext.tiAndroidXFragmentLibVersion}"
implementation 'androidx.media:media:1.2.1'
implementation 'androidx.recyclerview:recyclerview:1.1.0'
implementation 'androidx.media:media:1.3.1'
implementation 'androidx.recyclerview:recyclerview:1.2.0'
implementation 'androidx.recyclerview:recyclerview-selection:1.1.0'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
implementation 'androidx.transition:transition:1.4.0'
implementation 'androidx.transition:transition:1.4.1'
implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
implementation 'androidx.viewpager:viewpager:1.0.0'
compileOnly 'androidx.annotation:annotation:1.1.0'
compileOnly 'androidx.annotation:annotation:1.2.0'

// Google's "Material Components" themed UI library.
implementation "com.google.android.material:material:${project.ext.tiMaterialLibVersion}"

// The Google Play Services libraries are only used by Titanium's geolocation feature.
// We link to them dynamically at runtime. So, they can be safely excluded when in the app project.
implementation "com.google.android.gms:play-services-base:${project.ext.tiPlayServicesBaseLibVersion}"
implementation 'com.google.android.gms:play-services-location:17.1.0'
implementation 'com.google.android.gms:play-services-location:18.0.0'

// XML library providing XPath support to our Ti.XML APIs.
implementation 'jaxen:jaxen:1.2.0'
Expand Down