@@ -190,17 +190,6 @@ kotlin.sourceSets {
190
190
}
191
191
}
192
192
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
-
204
193
jvmTest {
205
194
minHeapSize = ' 1g'
206
195
maxHeapSize = ' 1g'
@@ -273,21 +262,8 @@ static void configureJvmForLincheck(task) {
273
262
task. systemProperty ' kotlinx.coroutines.semaphore.maxSpinCycles' , ' 1' // better for the model checking mode
274
263
}
275
264
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
-
289
265
// Always check additional test sets
290
- task moreTest (dependsOn : [jvmStressTest, jvmLincheckTest, jdk16Test ])
266
+ task moreTest (dependsOn : [jvmStressTest, jvmLincheckTest])
291
267
check. dependsOn moreTest
292
268
293
269
task testsJar (type : Jar , dependsOn : jvmTestClasses) {
0 commit comments