Wizard: add missing jvm target version for tests in Groovy DSL
#KT-41958 fixed
This commit is contained in:
+4
@@ -25,3 +25,7 @@ test {
|
|||||||
compileKotlin {
|
compileKotlin {
|
||||||
kotlinOptions.jvmTarget = '1.8'
|
kotlinOptions.jvmTarget = '1.8'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
compileTestKotlin {
|
||||||
|
kotlinOptions.jvmTarget = '1.8'
|
||||||
|
}
|
||||||
+4
@@ -25,3 +25,7 @@ test {
|
|||||||
compileKotlin {
|
compileKotlin {
|
||||||
kotlinOptions.jvmTarget = '1.8'
|
kotlinOptions.jvmTarget = '1.8'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
compileTestKotlin {
|
||||||
|
kotlinOptions.jvmTarget = '1.8'
|
||||||
|
}
|
||||||
+4
@@ -23,3 +23,7 @@ test {
|
|||||||
compileKotlin {
|
compileKotlin {
|
||||||
kotlinOptions.jvmTarget = '1.8'
|
kotlinOptions.jvmTarget = '1.8'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
compileTestKotlin {
|
||||||
|
kotlinOptions.jvmTarget = '1.8'
|
||||||
|
}
|
||||||
+4
@@ -24,3 +24,7 @@ test {
|
|||||||
compileKotlin {
|
compileKotlin {
|
||||||
kotlinOptions.jvmTarget = '1.8'
|
kotlinOptions.jvmTarget = '1.8'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
compileTestKotlin {
|
||||||
|
kotlinOptions.jvmTarget = '1.8'
|
||||||
|
}
|
||||||
+4
@@ -24,3 +24,7 @@ test {
|
|||||||
compileKotlin {
|
compileKotlin {
|
||||||
kotlinOptions.jvmTarget = '1.8'
|
kotlinOptions.jvmTarget = '1.8'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
compileTestKotlin {
|
||||||
|
kotlinOptions.jvmTarget = '1.8'
|
||||||
|
}
|
||||||
+4
@@ -24,3 +24,7 @@ test {
|
|||||||
compileKotlin {
|
compileKotlin {
|
||||||
kotlinOptions.jvmTarget = '1.8'
|
kotlinOptions.jvmTarget = '1.8'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
compileTestKotlin {
|
||||||
|
kotlinOptions.jvmTarget = '1.8'
|
||||||
|
}
|
||||||
+4
@@ -23,3 +23,7 @@ test {
|
|||||||
compileKotlin {
|
compileKotlin {
|
||||||
kotlinOptions.jvmTarget = '1.8'
|
kotlinOptions.jvmTarget = '1.8'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
compileTestKotlin {
|
||||||
|
kotlinOptions.jvmTarget = '1.8'
|
||||||
|
}
|
||||||
+4
@@ -23,3 +23,7 @@ test {
|
|||||||
compileKotlin {
|
compileKotlin {
|
||||||
kotlinOptions.jvmTarget = '1.6'
|
kotlinOptions.jvmTarget = '1.6'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
compileTestKotlin {
|
||||||
|
kotlinOptions.jvmTarget = '1.6'
|
||||||
|
}
|
||||||
+4
@@ -23,3 +23,7 @@ test {
|
|||||||
compileKotlin {
|
compileKotlin {
|
||||||
kotlinOptions.jvmTarget = '1.8'
|
kotlinOptions.jvmTarget = '1.8'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
compileTestKotlin {
|
||||||
|
kotlinOptions.jvmTarget = '1.8'
|
||||||
|
}
|
||||||
+4
@@ -25,6 +25,10 @@ compileKotlin {
|
|||||||
kotlinOptions.jvmTarget = '1.8'
|
kotlinOptions.jvmTarget = '1.8'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
compileTestKotlin {
|
||||||
|
kotlinOptions.jvmTarget = '1.8'
|
||||||
|
}
|
||||||
|
|
||||||
application {
|
application {
|
||||||
mainClassName = 'MainKt'
|
mainClassName = 'MainKt'
|
||||||
}
|
}
|
||||||
+16
-8
@@ -3,6 +3,7 @@ package org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators
|
|||||||
|
|
||||||
import org.jetbrains.annotations.NonNls
|
import org.jetbrains.annotations.NonNls
|
||||||
import org.jetbrains.kotlin.tools.projectWizard.KotlinNewProjectWizardBundle
|
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.Reader
|
||||||
import org.jetbrains.kotlin.tools.projectWizard.core.buildList
|
import org.jetbrains.kotlin.tools.projectWizard.core.buildList
|
||||||
import org.jetbrains.kotlin.tools.projectWizard.core.entity.settings.ModuleConfiguratorSetting
|
import org.jetbrains.kotlin.tools.projectWizard.core.entity.settings.ModuleConfiguratorSetting
|
||||||
@@ -68,8 +69,12 @@ object JvmSinglePlatformModuleConfigurator : JvmModuleConfigurator,
|
|||||||
ModuleConfiguratorWithModuleType {
|
ModuleConfiguratorWithModuleType {
|
||||||
override val moduleType get() = ModuleType.jvm
|
override val moduleType get() = ModuleType.jvm
|
||||||
override val moduleKind: ModuleKind get() = ModuleKind.singleplatformJvm
|
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")
|
override val text = KotlinNewProjectWizardBundle.message("module.configurator.jvm")
|
||||||
|
|
||||||
|
|
||||||
@@ -110,18 +115,21 @@ object JvmSinglePlatformModuleConfigurator : JvmModuleConfigurator,
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
BuildSystemType.GradleGroovyDsl -> {
|
BuildSystemType.GradleGroovyDsl -> {
|
||||||
+GradleSectionIR(
|
+jvmTargetSetup("compileKotlin", targetVersionValue)
|
||||||
"compileKotlin",
|
+jvmTargetSetup("compileTestKotlin", targetVersionValue)
|
||||||
irs = listOf(
|
|
||||||
GradleAssignmentIR("kotlinOptions.jvmTarget", GradleStringConstIR(targetVersionValue))
|
|
||||||
)
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
BuildSystemType.Maven -> {
|
BuildSystemType.Maven -> {
|
||||||
+MavenPropertyIR("kotlin.compiler.jvmTarget", targetVersionValue)
|
+MavenPropertyIR("kotlin.compiler.jvmTarget", targetVersionValue)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun jvmTargetSetup(taskName: String, targetVersion: String) = GradleSectionIR(
|
||||||
|
taskName,
|
||||||
|
irs = listOf(
|
||||||
|
GradleAssignmentIR("kotlinOptions.jvmTarget", GradleStringConstIR(targetVersion))
|
||||||
|
)
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user