Unverified Commit f539b7a1 authored by Ivan Matkov's avatar Ivan Matkov Committed by GitHub

Raise minimum supported JVM to 11 (#1191)

parent c9083760
...@@ -35,7 +35,7 @@ if (project.hasProperty("skiko.version")) { ...@@ -35,7 +35,7 @@ if (project.hasProperty("skiko.version")) {
dependencies { dependencies {
implementation(platform("org.jetbrains.kotlin:kotlin-bom")) implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") implementation(kotlin("stdlib"))
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.5.0") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.5.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.0") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.0")
implementation("org.jetbrains.skiko:skiko-awt-runtime-$target:$version") implementation("org.jetbrains.skiko:skiko-awt-runtime-$target:$version")
......
...@@ -71,7 +71,7 @@ kotlin { ...@@ -71,7 +71,7 @@ kotlin {
jvm("awt") { jvm("awt") {
compilations.all { compilations.all {
compileTaskProvider.configure { compileTaskProvider.configure {
compilerOptions.jvmTarget.set(JvmTarget.JVM_1_8) compilerOptions.jvmTarget.set(JvmTarget.JVM_11)
} }
} }
generateVersion(targetOs, targetArch, skiko) generateVersion(targetOs, targetArch, skiko)
...@@ -84,7 +84,7 @@ kotlin { ...@@ -84,7 +84,7 @@ kotlin {
compilations.all { compilations.all {
compileTaskProvider.configure { compileTaskProvider.configure {
compilerOptions.jvmTarget.set(JvmTarget.JVM_1_8) compilerOptions.jvmTarget.set(JvmTarget.JVM_11)
} }
} }
...@@ -256,8 +256,8 @@ if (supportAndroid) { ...@@ -256,8 +256,8 @@ if (supportAndroid) {
defaultConfig.targetSdk = 24 defaultConfig.targetSdk = 24
defaultConfig.javaCompileOptions defaultConfig.javaCompileOptions
compileOptions.sourceCompatibility = JavaVersion.VERSION_1_8 compileOptions.sourceCompatibility = JavaVersion.VERSION_11
compileOptions.targetCompatibility = JavaVersion.VERSION_1_8 compileOptions.targetCompatibility = JavaVersion.VERSION_11
sourceSets.named("main") { sourceSets.named("main") {
java.srcDirs("src/androidMain/java") java.srcDirs("src/androidMain/java")
...@@ -350,8 +350,8 @@ tasks.withType<AbstractTestTask> { ...@@ -350,8 +350,8 @@ tasks.withType<AbstractTestTask> {
tasks.withType<JavaCompile> { tasks.withType<JavaCompile> {
// Workaround to configure Java sources on Android (src/androidMain/java) // Workaround to configure Java sources on Android (src/androidMain/java)
targetCompatibility = "1.8" targetCompatibility = JavaVersion.VERSION_11.toString()
sourceCompatibility = "1.8" sourceCompatibility = JavaVersion.VERSION_11.toString()
} }
project.tasks.withType<KotlinJsCompile>().configureEach { project.tasks.withType<KotlinJsCompile>().configureEach {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment