Skip to content

Commit cf7b083

Browse files
authored
Remove JDK 1.6 from the build dependencies (#3043)
1 parent 773ab97 commit cf7b083

File tree

1 file changed

+1
-25
lines changed

1 file changed

+1
-25
lines changed

kotlinx-coroutines-core/build.gradle

+1-25
Original file line numberDiff line numberDiff line change
@@ -190,17 +190,6 @@ kotlin.sourceSets {
190190
}
191191
}
192192

193-
task checkJdk16() {
194-
// only fail w/o JDK_16 when actually trying to compile, not during project setup phase
195-
doLast {
196-
if (!System.env.JDK_16) {
197-
throw new GradleException("JDK_16 environment variable is not defined. " +
198-
"Can't build against JDK 1.6 runtime and run JDK 1.6 compatibility tests. " +
199-
"Please ensure JDK 1.6 is installed and that JDK_16 points to it.")
200-
}
201-
}
202-
}
203-
204193
jvmTest {
205194
minHeapSize = '1g'
206195
maxHeapSize = '1g'
@@ -273,21 +262,8 @@ static void configureJvmForLincheck(task) {
273262
task.systemProperty 'kotlinx.coroutines.semaphore.maxSpinCycles', '1' // better for the model checking mode
274263
}
275264

276-
task jdk16Test(type: Test, dependsOn: [compileTestKotlinJvm, checkJdk16]) {
277-
classpath = files { jvmTest.classpath }
278-
testClassesDirs = files { jvmTest.testClassesDirs }
279-
executable = "$System.env.JDK_16/bin/java"
280-
exclude '**/*LincheckTest.*' // Lincheck tests use LinChecker which needs JDK8
281-
exclude '**/exceptions/**' // exceptions tests check suppressed exception which needs JDK8
282-
exclude '**/ExceptionsGuideTest.*'
283-
exclude '**/RunInterruptibleStressTest.*' // fails on JDK 1.6 due to JDK bug
284-
}
285-
286-
// Run jdk16Test test only during nightly stress test
287-
jdk16Test.onlyIf { project.properties['stressTest'] != null }
288-
289265
// Always check additional test sets
290-
task moreTest(dependsOn: [jvmStressTest, jvmLincheckTest, jdk16Test])
266+
task moreTest(dependsOn: [jvmStressTest, jvmLincheckTest])
291267
check.dependsOn moreTest
292268

293269
task testsJar(type: Jar, dependsOn: jvmTestClasses) {

0 commit comments

Comments
 (0)