chore(oem/fv/android): Update dependencies

This commit is contained in:
Darcy Wong 2021-05-21 11:12:46 +07:00
parent 6db8cea05b
commit 4e8fb193a0
3 changed files with 16 additions and 14 deletions

View file

@ -1,14 +1,14 @@
plugins {
id 'com.android.application'
id 'io.sentry.android.gradle'
id 'com.github.triplet.play' version '2.5.0' apply false
id 'com.github.triplet.play' version '3.4.0-agp4.2' apply false
}
ext.rootPath = '../../../../android'
apply from: "$rootPath/version.gradle"
android {
compileSdkVersion 29
compileSdkVersion 30
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
@ -18,7 +18,7 @@ android {
defaultConfig {
applicationId "com.firstvoices.keyboards"
minSdkVersion 21
targetSdkVersion 29
targetSdkVersion 30
// VERSION_CODE and VERSION_NAME from version.gradle
versionCode VERSION_CODE as Integer
@ -80,20 +80,22 @@ if (env_keys_json_file != null) {
serviceAccountCredentials = file(String.valueOf(env_keys_json_file))
// Deactivate lower conflicting version APKs
resolutionStrategy = "ignore"
resolutionStrategy.set(com.github.triplet.gradle.androidpublisher.ResolutionStrategy.IGNORE)
switch (System.env.TIER) {
case 'beta':
track = 'beta'
track.set("beta")
println "TIER set to beta"
break
case 'stable':
track = 'production'
track.set("production")
println "TIER set to production"
break
default:
track = 'alpha'
track.set("alpha")
println "TIER set to alpha"
}
println "TIER set to $track"
}
}
@ -106,10 +108,10 @@ repositories {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.appcompat:appcompat:1.3.0-alpha02'
implementation 'com.google.android.material:material:1.2.1'
implementation 'androidx.appcompat:appcompat:1.3.0-rc01'
implementation 'com.google.android.material:material:1.3.0'
api(name: 'keyman-engine', ext: 'aar')
implementation 'io.sentry:sentry-android:3.1.0'
implementation 'io.sentry:sentry-android:4.3.0'
implementation 'androidx.preference:preference:1.1.1'
}

View file

@ -7,9 +7,9 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.2'
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.google.gms:google-services:4.3.2'
classpath 'io.sentry:sentry-android-gradle-plugin:1.7.35'
classpath 'io.sentry:sentry-android-gradle-plugin:1.7.36'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files

View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists