Skip to content

Commit 9be4ddf

Browse files
[issue-59] - adjust to java 17
1 parent 1f7e1da commit 9be4ddf

7 files changed

Lines changed: 12 additions & 14 deletions

File tree

android_kmp/KMP-Sample/composeApp/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ plugins {
1111
kotlin {
1212
androidTarget {
1313
compilerOptions {
14-
jvmTarget.set(JvmTarget.JVM_21)
14+
jvmTarget.set(JvmTarget.JVM_17)
1515
}
1616
}
1717

@@ -72,8 +72,8 @@ android {
7272
}
7373
}
7474
compileOptions {
75-
sourceCompatibility = JavaVersion.VERSION_21
76-
targetCompatibility = JavaVersion.VERSION_21
75+
sourceCompatibility = JavaVersion.VERSION_17
76+
targetCompatibility = JavaVersion.VERSION_17
7777
}
7878
}
7979

android_kmp/KMP-Sample/gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
agp = "8.9.1"
2+
agp = "8.10.0"
33
android-compileSdk = "36"
44
android-minSdk = "24"
55
android-targetSdk = "36"

android_kmp/KMP-Sample/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

android_kmp/build-logic/src/main/java/Config.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ object Config {
88
const val targetSdkVersion = 35
99
const val versionName = "1.0"
1010
const val versionCode = 1
11-
val jvmTargetVersion = JavaVersion.VERSION_21
12-
val jvmTargetValue = JvmTarget.JVM_21
11+
val jvmTargetVersion = JavaVersion.VERSION_17
12+
val jvmTargetValue = JvmTarget.JVM_17
1313
val jvmTargetTool = Regex("\\d+").find(jvmTargetValue.toString())!!.value.toInt()
1414
const val testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
1515
const val appName = "Craftd"

android_kmp/build-logic/src/main/java/extensions/CommonExtensions.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@
33
package extensions
44

55
import Config
6+
import Config.jvmTargetVersion
67
import com.android.build.api.dsl.CommonExtension
7-
import org.gradle.api.JavaVersion
88
import org.gradle.api.Project
9-
import org.gradle.api.plugins.ExtensionAware
10-
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
119

1210
internal fun CommonExtension<*, *, *, *, *,*>.setupPackingOptions() {
1311
packaging {
@@ -37,8 +35,8 @@ internal fun CommonExtension<*, *, *, *, *,*>.setupAndroidDefaultConfig() {
3735

3836
internal fun CommonExtension<*, *, *, *, *,*>.setupCompileOptions() {
3937
compileOptions {
40-
sourceCompatibility = JavaVersion.VERSION_21
41-
targetCompatibility = JavaVersion.VERSION_21
38+
sourceCompatibility = jvmTargetVersion
39+
targetCompatibility = jvmTargetVersion
4240
}
4341
}
4442

android_kmp/gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
22
# Core toolchain
33
kotlin = "2.2.21"
4-
android_gradle_plugin = "8.6.1"
4+
android_gradle_plugin = "8.10.0"
55
compose_plugin = "1.8.2"
66

77
# AndroidX / Google

android_kmp/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)