diff options
| author | Joel Klinghed <the_jk@spawned.biz> | 2025-09-16 23:59:36 +0200 |
|---|---|---|
| committer | Joel Klinghed <the_jk@spawned.biz> | 2025-09-17 00:00:42 +0200 |
| commit | aad8969b1d7b9117d650f4af5ca84ac0e2c5ebd8 (patch) | |
| tree | 1706264e6cb6be113056abdfec67d5d3e391eb60 | |
| parent | 6a4939b3a6c637149ccb98a8a59fc839e4d4864f (diff) | |
Update android compileSdk to 36 and java version to 21
| -rw-r--r-- | app/src/main/AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | buildSrc/build.gradle.kts | 4 | ||||
| -rw-r--r-- | buildSrc/src/main/groovy/the_jk.android-conventions.gradle | 12 |
3 files changed, 9 insertions, 10 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a1a11d6..4884374 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,8 +12,7 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/Theme.CleverSync" - tools:targetApi="31"> + android:theme="@style/Theme.CleverSync"> <activity android:name=".MainActivity" android:exported="true" diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index d9b13fe..07af70e 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -15,10 +15,10 @@ dependencies { java { toolchain { - languageVersion = JavaLanguageVersion.of(17) + languageVersion = JavaLanguageVersion.of(21) } } kotlin { - jvmToolchain(17) + jvmToolchain(21) } diff --git a/buildSrc/src/main/groovy/the_jk.android-conventions.gradle b/buildSrc/src/main/groovy/the_jk.android-conventions.gradle index eb6991a..ef18b09 100644 --- a/buildSrc/src/main/groovy/the_jk.android-conventions.gradle +++ b/buildSrc/src/main/groovy/the_jk.android-conventions.gradle @@ -6,7 +6,7 @@ plugins { } android { - compileSdk = 35 + compileSdk = 36 defaultConfig { minSdk = 29 @@ -15,11 +15,11 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } kotlinOptions { - jvmTarget = "17" + jvmTarget = "21" } testOptions { @@ -60,11 +60,11 @@ def detektPlugin = project.plugins['io.gitlab.arturbosch.detekt'] def detektCls = Class.forName('io.gitlab.arturbosch.detekt.Detekt', true, detektPlugin.class.classLoader) tasks.withType(detektCls).configureEach { - jvmTarget = "17" + jvmTarget = "21" } def detektCreateBaselineTaskCls = Class.forName('io.gitlab.arturbosch.detekt.DetektCreateBaselineTask', true, detektPlugin.class.classLoader) tasks.withType(detektCreateBaselineTaskCls).configureEach { - jvmTarget = "17" + jvmTarget = "21" } |