From 23ead5e430395ff1acf88155794ea0cb6b683cca Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Fri, 2 Nov 2018 20:20:09 +0300 Subject: [PATCH] Remove extensive testing of the discontinued jre7/8 artifacts --- libraries/stdlib/jre7/build.gradle | 22 ---------------------- libraries/stdlib/jre8/build.gradle | 24 ------------------------ 2 files changed, 46 deletions(-) diff --git a/libraries/stdlib/jre7/build.gradle b/libraries/stdlib/jre7/build.gradle index d2b5ea4b34c..c78ee411a7b 100644 --- a/libraries/stdlib/jre7/build.gradle +++ b/libraries/stdlib/jre7/build.gradle @@ -25,11 +25,6 @@ sourceSets { test { kotlin { srcDir 'test' - if(!System.properties.'idea.active') { - srcDir '../jvm/test' - srcDir '../common/test' - srcDir '../test' - } } } } @@ -74,20 +69,3 @@ compileTestKotlin { test { executable = "$JDK_17/bin/java" } - -task testJre6Tests(type: Test) { - dependsOn(':kotlin-stdlib:testClasses') - group = "verification" - - executable = "$JDK_17/bin/java" - - doFirst { - testClassesDirs = project(':kotlin-stdlib').sourceSets.test.output - classpath = files( - testClassesDirs, - configurations.testCompile - ) - } -} - -check.dependsOn testJre6Tests \ No newline at end of file diff --git a/libraries/stdlib/jre8/build.gradle b/libraries/stdlib/jre8/build.gradle index 30e8a877783..d534c3653fc 100644 --- a/libraries/stdlib/jre8/build.gradle +++ b/libraries/stdlib/jre8/build.gradle @@ -27,12 +27,6 @@ sourceSets { test { kotlin { srcDir 'test' - if(!System.properties.'idea.active') { - srcDir '../jvm/test' - srcDir '../common/test' - srcDir '../test' - srcDir '../jre7/test' - } } } } @@ -77,21 +71,3 @@ compileTestKotlin { test { executable = "$JDK_18/bin/java" } - - -task testJre6Tests(type: Test) { - dependsOn(':kotlin-stdlib:testClasses') - group = "verification" - - executable = "$JDK_18/bin/java" - - doFirst { - testClassesDirs = project(':kotlin-stdlib').sourceSets.test.output - classpath = files( - testClassesDirs, - configurations.testCompile - ) - } -} - -check.dependsOn testJre6Tests \ No newline at end of file