Wizard: add missing jvm target version for tests in Groovy DSL

#KT-41958 fixed
This commit is contained in:
Ilya Kirillov
2020-09-16 21:03:12 +03:00
parent ee2f0f45fc
commit ca3b327592
11 changed files with 56 additions and 8 deletions
@@ -24,4 +24,8 @@ test {
compileKotlin {
kotlinOptions.jvmTarget = '1.8'
}
compileTestKotlin {
kotlinOptions.jvmTarget = '1.8'
}
@@ -24,4 +24,8 @@ test {
compileKotlin {
kotlinOptions.jvmTarget = '1.8'
}
compileTestKotlin {
kotlinOptions.jvmTarget = '1.8'
}
@@ -22,4 +22,8 @@ test {
compileKotlin {
kotlinOptions.jvmTarget = '1.8'
}
compileTestKotlin {
kotlinOptions.jvmTarget = '1.8'
}
@@ -23,4 +23,8 @@ test {
compileKotlin {
kotlinOptions.jvmTarget = '1.8'
}
compileTestKotlin {
kotlinOptions.jvmTarget = '1.8'
}
@@ -23,4 +23,8 @@ test {
compileKotlin {
kotlinOptions.jvmTarget = '1.8'
}
compileTestKotlin {
kotlinOptions.jvmTarget = '1.8'
}
@@ -23,4 +23,8 @@ test {
compileKotlin {
kotlinOptions.jvmTarget = '1.8'
}
compileTestKotlin {
kotlinOptions.jvmTarget = '1.8'
}
@@ -22,4 +22,8 @@ test {
compileKotlin {
kotlinOptions.jvmTarget = '1.8'
}
compileTestKotlin {
kotlinOptions.jvmTarget = '1.8'
}
@@ -22,4 +22,8 @@ test {
compileKotlin {
kotlinOptions.jvmTarget = '1.6'
}
compileTestKotlin {
kotlinOptions.jvmTarget = '1.6'
}
@@ -22,4 +22,8 @@ test {
compileKotlin {
kotlinOptions.jvmTarget = '1.8'
}
compileTestKotlin {
kotlinOptions.jvmTarget = '1.8'
}
@@ -25,6 +25,10 @@ compileKotlin {
kotlinOptions.jvmTarget = '1.8'
}
compileTestKotlin {
kotlinOptions.jvmTarget = '1.8'
}
application {
mainClassName = 'MainKt'
}
@@ -3,6 +3,7 @@ package org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators
import org.jetbrains.annotations.NonNls
import org.jetbrains.kotlin.tools.projectWizard.KotlinNewProjectWizardBundle
import org.jetbrains.kotlin.tools.projectWizard.core.ListBuilder
import org.jetbrains.kotlin.tools.projectWizard.core.Reader
import org.jetbrains.kotlin.tools.projectWizard.core.buildList
import org.jetbrains.kotlin.tools.projectWizard.core.entity.settings.ModuleConfiguratorSetting
@@ -68,8 +69,12 @@ object JvmSinglePlatformModuleConfigurator : JvmModuleConfigurator,
ModuleConfiguratorWithModuleType {
override val moduleType get() = ModuleType.jvm
override val moduleKind: ModuleKind get() = ModuleKind.singleplatformJvm
@NonNls override val suggestedModuleName = "jvm"
@NonNls override val id = "JVM Module"
@NonNls
override val suggestedModuleName = "jvm"
@NonNls
override val id = "JVM Module"
override val text = KotlinNewProjectWizardBundle.message("module.configurator.jvm")
@@ -110,18 +115,21 @@ object JvmSinglePlatformModuleConfigurator : JvmModuleConfigurator,
)
}
BuildSystemType.GradleGroovyDsl -> {
+GradleSectionIR(
"compileKotlin",
irs = listOf(
GradleAssignmentIR("kotlinOptions.jvmTarget", GradleStringConstIR(targetVersionValue))
)
)
+jvmTargetSetup("compileKotlin", targetVersionValue)
+jvmTargetSetup("compileTestKotlin", targetVersionValue)
}
BuildSystemType.Maven -> {
+MavenPropertyIR("kotlin.compiler.jvmTarget", targetVersionValue)
}
}
}
private fun jvmTargetSetup(taskName: String, targetVersion: String) = GradleSectionIR(
taskName,
irs = listOf(
GradleAssignmentIR("kotlinOptions.jvmTarget", GradleStringConstIR(targetVersion))
)
)
}