From 64aae756d1e7a30c283e9753c0ef2fda99f3eb33 Mon Sep 17 00:00:00 2001 From: Alexander Likhachev Date: Mon, 11 Apr 2022 22:24:04 +0300 Subject: [PATCH] [Build] Avoid `project` usages in jdk6 tests #KT-44611 In Progress --- libraries/stdlib/jdk7/build.gradle | 7 ++++--- libraries/stdlib/jdk8/build.gradle | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/libraries/stdlib/jdk7/build.gradle b/libraries/stdlib/jdk7/build.gradle index 00693394371..ffcce3c6e83 100644 --- a/libraries/stdlib/jdk7/build.gradle +++ b/libraries/stdlib/jdk7/build.gradle @@ -88,10 +88,11 @@ LibrariesCommon.configureJava9Compilation(project, 'kotlin.stdlib.jdk7') task testJdk6Tests(type: Test) { dependsOn(':kotlin-stdlib:testClasses') group = "verification" - + def kotlinStdLibTestOutput = project(':kotlin-stdlib').sourceSets.test.output + def objectFactory = project.objects doFirst { - testClassesDirs = project(':kotlin-stdlib').sourceSets.test.output - classpath = files( + testClassesDirs = kotlinStdLibTestOutput + classpath = objectFactory.fileCollection().from( testClassesDirs, sourceSets.test.compileClasspath ) diff --git a/libraries/stdlib/jdk8/build.gradle b/libraries/stdlib/jdk8/build.gradle index 4f251e61bf4..446653d706e 100644 --- a/libraries/stdlib/jdk8/build.gradle +++ b/libraries/stdlib/jdk8/build.gradle @@ -88,10 +88,11 @@ task testJdk6Tests(type: Test) { thisTask -> dependsOn(':kotlin-stdlib:testClasses') check.dependsOn(thisTask) group = "verification" - + def kotlinStdLibTestOutput = project(':kotlin-stdlib').sourceSets.test.output + def objectFactory = project.objects doFirst { - testClassesDirs = project(':kotlin-stdlib').sourceSets.test.output - classpath = files( + testClassesDirs = kotlinStdLibTestOutput + classpath = objectFactory.fileCollection().from( testClassesDirs, sourceSets.test.compileClasspath )