diff options
| author | Alexander Udalov <alexander.udalov@jetbrains.com> | 2022-04-23 01:03:59 +0200 |
|---|---|---|
| committer | mvicsokolova <maria.sokolova@jetbrains.com> | 2022-06-15 19:15:46 +0300 |
| commit | 8e2a68eaa37afc2e9d583ed75a7cfc008e68f7c2 (patch) | |
| tree | 83a8137cd5b47b24d09a66381298f01c550e568c | |
| parent | de4a1a3a91624d17ca6596198b077d25b1e91481 (diff) | |
| download | kotlinx.atomicfu-8e2a68eaa37afc2e9d583ed75a7cfc008e68f7c2.tar.gz | |
Update JVM target to 1.8
See KT-45165.
| -rw-r--r-- | atomicfu/build.gradle | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/atomicfu/build.gradle b/atomicfu/build.gradle index 2374d59..6ef8b0b 100644 --- a/atomicfu/build.gradle +++ b/atomicfu/build.gradle @@ -220,7 +220,7 @@ def classesPostTransformBOTH = file("$buildDir/classes/kotlin/jvm/postTransforme tasks.withType(compileTestKotlinJvm.getClass()) { kotlinOptions { - jvmTarget = "1.6" + jvmTarget = "1.8" } } @@ -248,24 +248,6 @@ task transformVH(type: JavaExec, dependsOn: compileTestKotlinJvm) { outputs.dir(classesPostTransformVH) } -task checkJdk16() { - doLast { - if (!System.env.JDK_16) { - throw new GradleException("JDK_16 environment variable is not defined. " + - "Can't build against JDK 1.6 runtime and run JDK 1.6 compatibility tests. " + - "Please ensure JDK 1.6 is installed and that JDK_16 points to it.") - } - } -} - -task transformedTestFU_6(type: Test, dependsOn: [checkJdk16, transformFU]) { - executable = "$System.env.JDK_16/bin/java" - classpath = configurations.jvmTestRuntimeClasspath + project.files(classesPostTransformFU) - testClassesDirs = project.files(classesPostTransformFU) - exclude '**/*LFTest.*', '**/TraceToStringTest.*', '**/AtomicfuReferenceJsTest.*' - filter { setFailOnNoMatchingTests(false) } // to run excluded tests in Idea -} - task transformedTestFU_current(type: Test, dependsOn: transformFU) { classpath = files(configurations.jvmTestRuntimeClasspath, classesPostTransformFU) testClassesDirs = project.files(classesPostTransformFU) @@ -273,14 +255,6 @@ task transformedTestFU_current(type: Test, dependsOn: transformFU) { filter { setFailOnNoMatchingTests(false) } } -task transformedTestBOTH_6(type: Test, dependsOn: [checkJdk16, transformBOTH]) { - executable = "$System.env.JDK_16/bin/java" - classpath = files(configurations.jvmTestRuntimeClasspath, classesPostTransformBOTH) - testClassesDirs = project.files(classesPostTransformBOTH) - exclude '**/*LFTest.*', '**/TraceToStringTest.*', '**/TopLevelGeneratedDeclarationsReflectionTest.*', '**/SyntheticFUFieldsTest.*', '**/AtomicfuReferenceJsTest.*' - filter { setFailOnNoMatchingTests(false) } -} - task transformedTestBOTH_current(type: Test, dependsOn: transformBOTH) { classpath = files(configurations.jvmTestRuntimeClasspath, classesPostTransformBOTH) testClassesDirs = project.files(classesPostTransformBOTH) @@ -309,9 +283,7 @@ task testAtomicfuReferenceJs(type: Test, dependsOn: [compileTestKotlinJvm, trans } task jvmTestAll(dependsOn: [ - transformedTestFU_6, transformedTestFU_current, - transformedTestBOTH_6, transformedTestBOTH_current, transformedTestVH, testAtomicfuReferenceJs]) |