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

Update compile SDKVersion from 25 to 27

Browse source 
Fixes #750 

Currently, Keyman for Android targets SDK version 25 (Nougat). 

This PR targets  the latest Android API and updates all the Gradle dependencies to the latest. This will remove some lint Obsolete warnings.

Sample and Test projects needed to add 
```
implementation 'com.android.support:support-v4:27.1.1'
```
to ensure all dependencies use the same version.
This commit is contained in:
darcywong00 2018-05-10 07:56:12 +07:00
parent 372ea7d105
commit e03baaff29
16 changed files with 72 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/KMAPro/build.gradle
View file

@ -8,7 +8,7 @@ buildscript {
}
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.android.tools.build:gradle:3.1.2'
classpath 'com.github.triplet.gradle:play-publisher:1.2.0'
classpath 'com.google.gms:google-services:3.1.2'
classpath 'io.fabric.tools:gradle:1.25.1'

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

@ -1,6 +1,6 @@
#Mon Oct 30 09:32:59 ICT 2017
#Sat Apr 14 11:26:38 ICT 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

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

@ -3,8 +3,8 @@ apply plugin: 'com.github.triplet.play'
apply plugin: 'io.fabric'
android {
compileSdkVersion 25
buildToolsVersion "26.0.2"
compileSdkVersion 27
buildToolsVersion "27.0.3"
playAccountConfigs {
defaultAccountConfig {
if (project.hasProperty("keys_json_file")) {
@ -15,7 +15,7 @@ android {
defaultConfig {
applicationId "com.tavultesoft.kmapro"
minSdkVersion 15
targetSdkVersion 25
targetSdkVersion 27
//dumpProperties(project.ext) // Use this to dump all external properties for debugging TeamCity integration
@ -99,14 +99,17 @@ repositories {
}
}
dependencies {
api(name: 'keyman-engine', ext: 'aar')
ext {
currentFirebaseVersion = "15.0.2"
}
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:support-v4:25.4.0'
implementation 'com.google.firebase:firebase-core:11.8.0'
implementation 'com.google.firebase:firebase-crash:11.8.0'
implementation('com.crashlytics.sdk.android:crashlytics:2.9.0@aar') {
implementation 'com.android.support:support-v4:27.1.1'
api(name: 'keyman-engine', ext: 'aar')
implementation "com.google.firebase:firebase-core:$currentFirebaseVersion"
implementation "com.google.firebase:firebase-crash:$currentFirebaseVersion"
implementation('com.crashlytics.sdk.android:crashlytics:2.9.2@aar') {
transitive = true
}
}

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

@ -1,12 +1,12 @@
apply plugin: 'com.android.library'
android {
compileSdkVersion 25
buildToolsVersion "26.0.2"
compileSdkVersion 27
buildToolsVersion "27.0.3"
defaultConfig {
minSdkVersion 15
targetSdkVersion 25
targetSdkVersion 27
if (project.hasProperty("build.number")) {
versionCode project.ext['build_counter'] as Integer // Because TeamCity does not bubble build.counter into system properties...
@ -42,20 +42,20 @@ android {
}
ext {
currentFirebaseVersion = "11.8.0"
currentFirebaseVersion = "15.0.2"
}
dependencies {
implementation 'com.android.support:support-v4:25.4.0'
implementation 'com.android.support:support-v4:27.1.1'
implementation 'commons-io:commons-io:2.6'
implementation 'org.apache.commons:commons-text:1.2'
testImplementation 'junit:junit:4.12'
testImplementation "org.robolectric:robolectric:3.5.1"
testImplementation "org.robolectric:robolectric:3.8"
/* We only want these Firebase Crashlytics dependencies for KMEA */
implementation "com.google.firebase:firebase-analytics:$currentFirebaseVersion"
implementation "com.google.firebase:firebase-crash:$currentFirebaseVersion"
implementation('com.crashlytics.sdk.android:crashlytics:2.9.0@aar') {
implementation('com.crashlytics.sdk.android:crashlytics:2.9.2@aar') {
transitive = true;
}
}

2
android/KMEA/build.gradle
View file

@ -5,7 +5,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.android.tools.build:gradle:3.1.2'
}
}

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

21
android/Samples/KMSample1/app/build.gradle
View file

@ -1,13 +1,13 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion 25
buildToolsVersion "26.0.2"
compileSdkVersion 27
buildToolsVersion "27.0.3"
defaultConfig {
applicationId "com.keyman.kmsample1"
minSdkVersion 15
targetSdkVersion 25
targetSdkVersion 27
versionCode 1
versionName "1.0"
}
@ -20,18 +20,23 @@ android {
}
repositories {
google()
flatDir {
dirs 'libs'
}
google()
}
ext {
currentFirebaseVersion = "15.0.2"
}
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:25.2.0'
implementation 'com.google.firebase:firebase-core:11.8.0'
implementation 'com.google.firebase:firebase-crash:11.8.0'
implementation('com.crashlytics.sdk.android:crashlytics:2.9.0@aar') {
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:support-v4:27.1.1'
implementation "com.google.firebase:firebase-core:$currentFirebaseVersion"
implementation "com.google.firebase:firebase-crash:$currentFirebaseVersion"
implementation('com.crashlytics.sdk.android:crashlytics:2.9.2@aar') {
transitive = true
}
api (name:'keyman-engine', ext:'aar')

2
android/Samples/KMSample1/build.gradle
View file

@ -6,7 +6,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.android.tools.build:gradle:3.1.2'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files

2
android/Samples/KMSample1/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-4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

21
android/Samples/KMSample2/app/build.gradle
View file

@ -1,13 +1,13 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion 25
buildToolsVersion "26.0.2"
compileSdkVersion 27
buildToolsVersion "27.0.3"
defaultConfig {
applicationId "com.keyman.kmsample2"
minSdkVersion 15
targetSdkVersion 25
targetSdkVersion 27
versionCode 1
versionName "1.0"
}
@ -20,18 +20,23 @@ android {
}
repositories {
google()
flatDir {
dirs 'libs'
}
google()
}
ext {
currentFirebaseVersion = "15.0.2"
}
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:25.2.0'
implementation 'com.google.firebase:firebase-core:11.8.0'
implementation 'com.google.firebase:firebase-crash:11.8.0'
implementation('com.crashlytics.sdk.android:crashlytics:2.9.0@aar') {
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:support-v4:27.1.1'
implementation "com.google.firebase:firebase-core:$currentFirebaseVersion"
implementation "com.google.firebase:firebase-crash:$currentFirebaseVersion"
implementation('com.crashlytics.sdk.android:crashlytics:2.9.2@aar') {
transitive = true
}
api (name:'keyman-engine', ext:'aar')

2
android/Samples/KMSample2/build.gradle
View file

@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.android.tools.build:gradle:3.1.2'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files

2
android/Samples/KMSample2/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-4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

21
android/Tests/KeyboardHarness/app/build.gradle
View file

@ -1,13 +1,13 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion 25
buildToolsVersion "26.0.2"
compileSdkVersion 27
buildToolsVersion "27.0.3"
defaultConfig {
applicationId "com.keyman.android.tests.keyboardHarness"
minSdkVersion 15
targetSdkVersion 25
targetSdkVersion 27
versionCode 1
versionName "1.0"
}
@ -20,18 +20,23 @@ android {
}
repositories {
google()
flatDir {
dirs 'libs'
}
google()
}
ext {
currentFirebaseVersion = "15.0.2"
}
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:25.2.0'
implementation 'com.google.firebase:firebase-core:11.8.0'
implementation 'com.google.firebase:firebase-crash:11.8.0'
implementation('com.crashlytics.sdk.android:crashlytics:2.9.0@aar') {
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:support-v4:27.1.1'
implementation "com.google.firebase:firebase-core:$currentFirebaseVersion"
implementation "com.google.firebase:firebase-crash:$currentFirebaseVersion"
implementation('com.crashlytics.sdk.android:crashlytics:2.9.2@aar') {
transitive = true
}
api (name:'keyman-engine', ext:'aar')

2
android/Tests/KeyboardHarness/build.gradle
View file

@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.android.tools.build:gradle:3.1.2'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files

2
android/Tests/KeyboardHarness/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-4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

3
android/history.md
View file

@ -1,5 +1,8 @@
# Keyman for Android
## 2018-05-11 10.0.391 beta
* Update compile and target Android SDK version to 27
## 2018-05-08 10.0.386 beta
* Fix crashes from invalid package name/version (#819)
* Clean up console log (#748)