Skip to content

Commit df54fd6

Browse files
committed
chore: target Android 14, upgrade gradle version and kotlin version
1 parent bae77ac commit df54fd6

5 files changed

Lines changed: 27 additions & 10 deletions

File tree

app/build.gradle

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
43

54
android {
6-
compileSdkVersion 31
5+
6+
namespace "io.github.sds100.keymapper.inputmethod.latin"
7+
compileSdk 34
8+
buildToolsVersion = '34.0.0'
79

810
defaultConfig {
911
applicationId "io.github.sds100.keymapper.inputmethod.latin"
1012
minSdkVersion 19
11-
targetSdkVersion 31
13+
targetSdkVersion 34
1214
versionCode 19
1315
versionName '1.4.5'
1416
}
@@ -39,11 +41,25 @@ android {
3941
}
4042
}
4143

44+
buildFeatures {
45+
aidl true
46+
}
47+
4248
lintOptions {
4349
abortOnError false
4450
}
4551

4652
ndkVersion '21.4.7075529'
53+
54+
compileOptions {
55+
sourceCompatibility JavaVersion.VERSION_17
56+
targetCompatibility JavaVersion.VERSION_17
57+
}
58+
59+
kotlinOptions {
60+
jvmTarget = "17"
61+
}
62+
4763
androidResources {
4864
noCompress 'dict'
4965
}
@@ -59,7 +75,7 @@ dependencies {
5975
implementation 'com.google.code.findbugs:jsr305:3.0.2'
6076
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
6177
implementation 'androidx.recyclerview:recyclerview:1.2.1' // Replaces recyclerview:1.0.0 included by above dependency
62-
implementation 'androidx.core:core-ktx:1.7.0'
78+
implementation 'androidx.core:core-ktx:1.13.1'
6379
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
6480
implementation 'androidx.viewpager2:viewpager2:1.0.0'
6581
}

app/src/main/java/io/github/sds100/keymapper/inputmethod/accessibility/KeyCodeDescriptionMapper.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ internal class KeyCodeDescriptionMapper private constructor() {
158158
private const val SPOKEN_EMOTICON_RESOURCE_NAME_PREFIX = "spoken_emoticon"
159159
private const val SPOKEN_EMOTICON_CODE_POINT_FORMAT = "_%02X"
160160
// The resource ID of the string spoken for obscured keys
161-
private const val OBSCURED_KEY_RES_ID = R.string.spoken_description_dot
161+
private val OBSCURED_KEY_RES_ID = R.string.spoken_description_dot
162162
val instance = KeyCodeDescriptionMapper()
163163

164164
/**

build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.6.20'
4+
ext.kotlin_version = '1.8.20'
5+
56
repositories {
67
google()
78
mavenCentral()
89
}
910
dependencies {
10-
classpath 'com.android.tools.build:gradle:7.3.1'
11+
classpath 'com.android.tools.build:gradle:8.4.2'
1112
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1213

1314
// NOTE: Do not place your application dependencies here; they belong
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Sun Jun 23 18:54:22 CEST 2024
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

tools/make-emoji-keys/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@ dependencies {
3535

3636

3737
java {
38-
sourceCompatibility = JavaVersion.VERSION_1_8
39-
targetCompatibility = JavaVersion.VERSION_1_8
38+
sourceCompatibility JavaVersion.VERSION_17
39+
targetCompatibility JavaVersion.VERSION_17
4040
}

0 commit comments

Comments
 (0)