Browse Source

Set default jvmTarget to 1.8 (#1879)

pull/1880/head
Alexey Tsvetkov 3 years ago committed by GitHub
parent
commit
91fdcb8f9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      components/build.gradle.kts
  2. 2
      gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt
  3. 6
      web/build.gradle.kts

2
components/build.gradle.kts

@ -22,7 +22,7 @@ subprojects {
} }
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>() { tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>() {
kotlinOptions.jvmTarget = "11" kotlinOptions.jvmTarget = "1.8"
} }
plugins.withId("maven-publish") { plugins.withId("maven-publish") {

2
gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt

@ -131,7 +131,7 @@ class ComposePlugin : Plugin<Project> {
project.tasks.withType(KotlinCompile::class.java) { project.tasks.withType(KotlinCompile::class.java) {
it.kotlinOptions.apply { it.kotlinOptions.apply {
if (overrideDefaultJvmTarget) { if (overrideDefaultJvmTarget) {
jvmTarget = "11".takeIf { jvmTarget.toDouble() < 11 } ?: jvmTarget jvmTarget = "1.8".takeIf { jvmTarget.toDouble() < 1.8 } ?: jvmTarget
} }
useIR = true useIR = true
} }

6
web/build.gradle.kts

@ -52,12 +52,6 @@ subprojects {
} }
} }
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>() {
kotlinOptions.jvmTarget = "11"
}
pluginManager.withPlugin("maven-publish") { pluginManager.withPlugin("maven-publish") {
configure<PublishingExtension> { configure<PublishingExtension> {
repositories { repositories {

Loading…
Cancel
Save