erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-12 20:05:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 21

update to android sdk 29

Browse source
This commit is contained in:
Sandra Forberger 2019-11-01 11:55:57 +07:00
parent 31fd14fc4f
commit 020502b397
7 changed files with 35 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/KMAPro/build.gradle
View file

@ -8,8 +8,8 @@ buildscript {
}
}
dependencies {
classpath 'com.android.tools.build:gradle:3.4.1'
classpath 'com.google.gms:google-services:4.2.0'
classpath 'com.android.tools.build:gradle:3.5.1'
classpath 'com.google.gms:google-services:4.3.2'
classpath 'io.fabric.tools:gradle:1.28.1'
}
}

2
android/KMAPro/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -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.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

5
android/KMAPro/kMAPro/build.gradle
View file

@ -5,12 +5,13 @@ plugins {
}
android {
compileSdkVersion 28
compileSdkVersion 29
buildToolsVersion "29.0.2"
defaultConfig {
applicationId "com.tavultesoft.kmapro"
minSdkVersion 19
targetSdkVersion 28
targetSdkVersion 29
//println "===DUMPING PROPERTIES==="
//dumpProperties(project) // Use this to dump all external properties for debugging TeamCity integration

28
android/KMEA/app/build.gradle
View file

@ -1,12 +1,12 @@
apply plugin: 'com.android.library'
android {
compileSdkVersion 28
buildToolsVersion "28.0.3"
compileSdkVersion 29
buildToolsVersion "29.0.2"
defaultConfig {
minSdkVersion 16
targetSdkVersion 28
targetSdkVersion 29
String env_build_number = System.getenv("BUILD_NUMBER") //assigned by TeamCity, so all caps
String env_build_counter = System.getenv("build_counter")
@ -42,25 +42,33 @@ android {
//showStandardStreams = true // If we want test console log output to show during builds.
}
workingDir = "../" // Defaults to the `app` subdirectory, which is different from Android Studio's default.
//Avoid Warning: an illegal reflective access operation has occurred
//Change argument jdk.module.illegalAccess=warn for detailed information which module needs to be opened
jvmArgs ('-Djdk.module.illegalAccess=permit')
jvmArgs('--add-opens', 'java.base/java.lang=ALL-UNNAMED')
jvmArgs('--add-opens', 'java.base/java.lang.reflect=ALL-UNNAMED')
}
}
}
dependencies {
implementation 'androidx.appcompat:appcompat:1.0.2'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'com.google.android.material:material:1.0.0'
implementation 'commons-io:commons-io:2.6'
implementation 'org.apache.commons:commons-text:1.6'
implementation 'org.apache.commons:commons-text:1.8'
// Robolectric
testImplementation 'androidx.test:core:1.1.0'
testImplementation 'androidx.test.ext:junit:1.1.0'
testImplementation 'org.robolectric:robolectric:4.2'
testImplementation 'androidx.test:core:1.2.0'
testImplementation 'androidx.test.ext:junit:1.1.1'
testImplementation 'org.robolectric:robolectric:4.3.1'
/* We only want these Firebase Crashlytics dependencies for KMEA */
implementation 'com.google.firebase:firebase-analytics:16.4.0'
implementation 'com.google.firebase:firebase-analytics:17.2.1'
implementation 'com.google.firebase:firebase-crash:16.2.1'
implementation('com.crashlytics.sdk.android:crashlytics:2.9.9@aar') {
transitive = true;
transitive = true
}
// Assign the annotation processor for tests.
testAnnotationProcessor 'com.google.auto.service:auto-service:1.0-rc4'
}

2
android/KMEA/build.gradle
View file

@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.4.0'
classpath 'com.android.tools.build:gradle:3.5.1'
}
}

10
android/KMEA/gradle.properties
View file

@ -1,3 +1,11 @@
android.enableJetifier=true
android.useAndroidX=true
android.enableUnitTestBinaryResources=true
android.enableUnitTestBinaryResources=true
#Added because of warning in build process
#Gradle may disable incremental compilation as the following annotation processors are not incremental: auto-service-1.0-rc4.jar (com.google.auto.service:auto-service:1.0-rc4).
#Consider setting the experimental feature flag android.enableSeparateAnnotationProcessing=true in the gradle.properties file to run annotation processing in a separate task and make compilation incremental.
#Causes new warning:
#WARNING: The option setting 'android.enableSeparateAnnotationProcessing=true' is experimental and unsupported.
#The current default is 'false'.
android.enableSeparateAnnotationProcessing=true

2
android/KMEA/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -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.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip