diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/frameworkSupport/buildscript/AbstractGradleBuildScriptBuilder.kt b/plugins/gradle/src/org/jetbrains/plugins/gradle/frameworkSupport/buildscript/AbstractGradleBuildScriptBuilder.kt index 15a5d59bead6..400cabdbbc2f 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/frameworkSupport/buildscript/AbstractGradleBuildScriptBuilder.kt +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/frameworkSupport/buildscript/AbstractGradleBuildScriptBuilder.kt @@ -167,15 +167,6 @@ abstract class AbstractGradleBuildScriptBuilder withJUnit5() diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/frameworkSupport/buildscript/GroovyDslGradleBuildScriptBuilder.kt b/plugins/gradle/src/org/jetbrains/plugins/gradle/frameworkSupport/buildscript/GroovyDslGradleBuildScriptBuilder.kt index 64e2978d69d5..2eabce76376b 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/frameworkSupport/buildscript/GroovyDslGradleBuildScriptBuilder.kt +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/frameworkSupport/buildscript/GroovyDslGradleBuildScriptBuilder.kt @@ -23,6 +23,15 @@ abstract class GroovyDslGradleBuildScriptBuilder(gradleVersion) { diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/frameworkSupport/buildscript/KotlinDslGradleBuildScriptBuilder.kt b/plugins/gradle/src/org/jetbrains/plugins/gradle/frameworkSupport/buildscript/KotlinDslGradleBuildScriptBuilder.kt index 6d5e3e9898c8..0c3595b77105 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/frameworkSupport/buildscript/KotlinDslGradleBuildScriptBuilder.kt +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/frameworkSupport/buildscript/KotlinDslGradleBuildScriptBuilder.kt @@ -27,6 +27,14 @@ class KotlinDslGradleBuildScriptBuilder( } } + override fun withKotlinTest() = apply { + withMavenCentral() + addTestImplementationDependency(call("kotlin", "test")) + configureTestTask { + call("useJUnitPlatform") + } + } + override fun configureTestTask(configure: ScriptTreeBuilder.() -> Unit) = withPostfix { callIfNotEmpty("tasks.test", configure) diff --git a/plugins/kotlin/project-wizard/tests/testData/gradleNewProjectWizard/newModuleInJavaProjectKts/module/build.gradle.kts b/plugins/kotlin/project-wizard/tests/testData/gradleNewProjectWizard/newModuleInJavaProjectKts/module/build.gradle.kts index 3a9a015fa740..d89293168d02 100644 --- a/plugins/kotlin/project-wizard/tests/testData/gradleNewProjectWizard/newModuleInJavaProjectKts/module/build.gradle.kts +++ b/plugins/kotlin/project-wizard/tests/testData/gradleNewProjectWizard/newModuleInJavaProjectKts/module/build.gradle.kts @@ -10,7 +10,7 @@ repositories { } dependencies { - testImplementation("org.jetbrains.kotlin:kotlin-test") + testImplementation(kotlin("test")) } tasks.test { diff --git a/plugins/kotlin/project-wizard/tests/testData/gradleNewProjectWizard/newModuleInKotlinProjectIndependentHierarchyKts/module/build.gradle.kts b/plugins/kotlin/project-wizard/tests/testData/gradleNewProjectWizard/newModuleInKotlinProjectIndependentHierarchyKts/module/build.gradle.kts index 3a9a015fa740..d89293168d02 100644 --- a/plugins/kotlin/project-wizard/tests/testData/gradleNewProjectWizard/newModuleInKotlinProjectIndependentHierarchyKts/module/build.gradle.kts +++ b/plugins/kotlin/project-wizard/tests/testData/gradleNewProjectWizard/newModuleInKotlinProjectIndependentHierarchyKts/module/build.gradle.kts @@ -10,7 +10,7 @@ repositories { } dependencies { - testImplementation("org.jetbrains.kotlin:kotlin-test") + testImplementation(kotlin("test")) } tasks.test { diff --git a/plugins/kotlin/project-wizard/tests/testData/gradleNewProjectWizard/newModuleInKotlinProjectKts/module/build.gradle.kts b/plugins/kotlin/project-wizard/tests/testData/gradleNewProjectWizard/newModuleInKotlinProjectKts/module/build.gradle.kts index 3dbb588efe81..df91804ec2e6 100644 --- a/plugins/kotlin/project-wizard/tests/testData/gradleNewProjectWizard/newModuleInKotlinProjectKts/module/build.gradle.kts +++ b/plugins/kotlin/project-wizard/tests/testData/gradleNewProjectWizard/newModuleInKotlinProjectKts/module/build.gradle.kts @@ -10,7 +10,7 @@ repositories { } dependencies { - testImplementation("org.jetbrains.kotlin:kotlin-test") + testImplementation(kotlin("test")) } tasks.test { diff --git a/plugins/kotlin/project-wizard/tests/testData/gradleNewProjectWizard/onboardingTipsKts/build.gradle.kts b/plugins/kotlin/project-wizard/tests/testData/gradleNewProjectWizard/onboardingTipsKts/build.gradle.kts index 3a9a015fa740..d89293168d02 100644 --- a/plugins/kotlin/project-wizard/tests/testData/gradleNewProjectWizard/onboardingTipsKts/build.gradle.kts +++ b/plugins/kotlin/project-wizard/tests/testData/gradleNewProjectWizard/onboardingTipsKts/build.gradle.kts @@ -10,7 +10,7 @@ repositories { } dependencies { - testImplementation("org.jetbrains.kotlin:kotlin-test") + testImplementation(kotlin("test")) } tasks.test { diff --git a/plugins/kotlin/project-wizard/tests/testData/gradleNewProjectWizard/otherKotlinModuleKts/module/build.gradle.kts b/plugins/kotlin/project-wizard/tests/testData/gradleNewProjectWizard/otherKotlinModuleKts/module/build.gradle.kts index 3a9a015fa740..d89293168d02 100644 --- a/plugins/kotlin/project-wizard/tests/testData/gradleNewProjectWizard/otherKotlinModuleKts/module/build.gradle.kts +++ b/plugins/kotlin/project-wizard/tests/testData/gradleNewProjectWizard/otherKotlinModuleKts/module/build.gradle.kts @@ -10,7 +10,7 @@ repositories { } dependencies { - testImplementation("org.jetbrains.kotlin:kotlin-test") + testImplementation(kotlin("test")) } tasks.test { diff --git a/plugins/kotlin/project-wizard/tests/testData/gradleNewProjectWizard/renderedOnboardingTipsKts/build.gradle.kts b/plugins/kotlin/project-wizard/tests/testData/gradleNewProjectWizard/renderedOnboardingTipsKts/build.gradle.kts index 3a9a015fa740..d89293168d02 100644 --- a/plugins/kotlin/project-wizard/tests/testData/gradleNewProjectWizard/renderedOnboardingTipsKts/build.gradle.kts +++ b/plugins/kotlin/project-wizard/tests/testData/gradleNewProjectWizard/renderedOnboardingTipsKts/build.gradle.kts @@ -10,7 +10,7 @@ repositories { } dependencies { - testImplementation("org.jetbrains.kotlin:kotlin-test") + testImplementation(kotlin("test")) } tasks.test { diff --git a/plugins/kotlin/project-wizard/tests/testData/gradleNewProjectWizard/sampleCodeKts/build.gradle.kts b/plugins/kotlin/project-wizard/tests/testData/gradleNewProjectWizard/sampleCodeKts/build.gradle.kts index 3a9a015fa740..d89293168d02 100644 --- a/plugins/kotlin/project-wizard/tests/testData/gradleNewProjectWizard/sampleCodeKts/build.gradle.kts +++ b/plugins/kotlin/project-wizard/tests/testData/gradleNewProjectWizard/sampleCodeKts/build.gradle.kts @@ -10,7 +10,7 @@ repositories { } dependencies { - testImplementation("org.jetbrains.kotlin:kotlin-test") + testImplementation(kotlin("test")) } tasks.test { diff --git a/plugins/kotlin/project-wizard/tests/testData/gradleNewProjectWizard/simpleProjectKts/build.gradle.kts b/plugins/kotlin/project-wizard/tests/testData/gradleNewProjectWizard/simpleProjectKts/build.gradle.kts index 3a9a015fa740..d89293168d02 100644 --- a/plugins/kotlin/project-wizard/tests/testData/gradleNewProjectWizard/simpleProjectKts/build.gradle.kts +++ b/plugins/kotlin/project-wizard/tests/testData/gradleNewProjectWizard/simpleProjectKts/build.gradle.kts @@ -10,7 +10,7 @@ repositories { } dependencies { - testImplementation("org.jetbrains.kotlin:kotlin-test") + testImplementation(kotlin("test")) } tasks.test {