Migrate repo to use JVM toolchains Gradle feature.
^KT-46972 Fixed
This commit is contained in:
@@ -2,7 +2,7 @@ description = 'Kotlin Test Annotations Common'
|
||||
|
||||
apply plugin: 'kotlin-platform-common'
|
||||
|
||||
jvmTarget = "1.6"
|
||||
JvmToolchain.updateJvmTarget(project, "1.6")
|
||||
|
||||
dependencies {
|
||||
compile kotlinStdlib("common")
|
||||
|
||||
@@ -2,7 +2,7 @@ description = 'Kotlin Test Common'
|
||||
|
||||
apply plugin: 'kotlin-platform-common'
|
||||
|
||||
jvmTarget = "1.6"
|
||||
JvmToolchain.updateJvmTarget(project, "1.6")
|
||||
|
||||
dependencies {
|
||||
compile kotlinStdlib("common")
|
||||
|
||||
@@ -2,7 +2,8 @@ description = 'Kotlin Test JUnit'
|
||||
|
||||
apply plugin: 'kotlin-platform-jvm'
|
||||
|
||||
configureJvm6Project(project)
|
||||
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_6)
|
||||
LibrariesCommon.disableDeprecatedJvmTargetWarning(project)
|
||||
|
||||
def includeJava9 = BuildPropertiesExtKt.getIncludeJava9(project.kotlinBuildProperties)
|
||||
|
||||
@@ -47,5 +48,5 @@ compileTestKotlin {
|
||||
configureJvmIrBackend(project)
|
||||
|
||||
if (includeJava9) {
|
||||
compileJava9Sources(project, 'kotlin.test.junit')
|
||||
LibrariesCommon.configureJava9Compilation(project, 'kotlin.test.junit')
|
||||
}
|
||||
|
||||
@@ -2,10 +2,6 @@ description = 'Kotlin Test JUnit 5'
|
||||
|
||||
apply plugin: 'kotlin-platform-jvm'
|
||||
|
||||
configureJvm6Project(project)
|
||||
ext.javaHome = JDK_18
|
||||
ext.jvmTarget = "1.8"
|
||||
|
||||
def includeJava9 = BuildPropertiesExtKt.getIncludeJava9(project.kotlinBuildProperties)
|
||||
|
||||
sourceSets {
|
||||
@@ -34,11 +30,6 @@ jar {
|
||||
configureSourcesJar()
|
||||
configureJavadocJar()
|
||||
|
||||
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
|
||||
kotlinOptions.jdkHome = JDK_18
|
||||
kotlinOptions.jvmTarget = 1.8
|
||||
}
|
||||
|
||||
compileKotlin {
|
||||
kotlinOptions.freeCompilerArgs = [
|
||||
"-Xallow-kotlin-package",
|
||||
@@ -57,10 +48,9 @@ compileTestKotlin {
|
||||
configureJvmIrBackend(project)
|
||||
|
||||
if (includeJava9) {
|
||||
compileJava9Sources(project, 'kotlin.test.junit5')
|
||||
LibrariesCommon.configureJava9Compilation(project, 'kotlin.test.junit5')
|
||||
}
|
||||
|
||||
test {
|
||||
useJUnitPlatform()
|
||||
executable = "$JDK_18/bin/java"
|
||||
}
|
||||
|
||||
@@ -4,8 +4,8 @@ apply plugin: 'kotlin-platform-jvm'
|
||||
|
||||
archivesBaseName = 'kotlin-test'
|
||||
|
||||
configureJvm6Project(project)
|
||||
|
||||
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_6)
|
||||
LibrariesCommon.disableDeprecatedJvmTargetWarning(project)
|
||||
|
||||
def includeJava9 = BuildPropertiesExtKt.getIncludeJava9(project.kotlinBuildProperties)
|
||||
|
||||
@@ -62,5 +62,5 @@ compileTestKotlin {
|
||||
configureJvmIrBackend(project)
|
||||
|
||||
if (includeJava9) {
|
||||
compileJava9Sources(project, 'kotlin.test')
|
||||
LibrariesCommon.configureJava9Compilation(project, 'kotlin.test')
|
||||
}
|
||||
|
||||
@@ -2,8 +2,9 @@ description = 'Kotlin Test TestNG'
|
||||
|
||||
apply plugin: 'kotlin-platform-jvm'
|
||||
|
||||
configureJvm6Project(project)
|
||||
ext.javaHome = JDK_17
|
||||
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_7)
|
||||
JvmToolchain.updateJvmTarget(project, "1.6")
|
||||
LibrariesCommon.disableDeprecatedJvmTargetWarning(project)
|
||||
|
||||
def includeJava9 = BuildPropertiesExtKt.getIncludeJava9(project.kotlinBuildProperties)
|
||||
|
||||
@@ -50,7 +51,7 @@ compileTestKotlin {
|
||||
configureJvmIrBackend(project)
|
||||
|
||||
if (includeJava9) {
|
||||
compileJava9Sources(project, 'kotlin.test.testng')
|
||||
LibrariesCommon.configureJava9Compilation(project, 'kotlin.test.testng')
|
||||
}
|
||||
|
||||
test {
|
||||
|
||||
Reference in New Issue
Block a user