Migrate repo to use JVM toolchains Gradle feature.

^KT-46972 Fixed
2021-06-29 15:42:02 +02:00
parent 08d831934a
commit 7789054547
67 changed files with 424 additions and 723 deletions
@@ -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')
 }