[Build] Avoid project usages in jdk6 tests
#KT-44611 In Progress
This commit is contained in:
@@ -88,10 +88,11 @@ LibrariesCommon.configureJava9Compilation(project, 'kotlin.stdlib.jdk7')
|
|||||||
task testJdk6Tests(type: Test) {
|
task testJdk6Tests(type: Test) {
|
||||||
dependsOn(':kotlin-stdlib:testClasses')
|
dependsOn(':kotlin-stdlib:testClasses')
|
||||||
group = "verification"
|
group = "verification"
|
||||||
|
def kotlinStdLibTestOutput = project(':kotlin-stdlib').sourceSets.test.output
|
||||||
|
def objectFactory = project.objects
|
||||||
doFirst {
|
doFirst {
|
||||||
testClassesDirs = project(':kotlin-stdlib').sourceSets.test.output
|
testClassesDirs = kotlinStdLibTestOutput
|
||||||
classpath = files(
|
classpath = objectFactory.fileCollection().from(
|
||||||
testClassesDirs,
|
testClassesDirs,
|
||||||
sourceSets.test.compileClasspath
|
sourceSets.test.compileClasspath
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -88,10 +88,11 @@ task testJdk6Tests(type: Test) { thisTask ->
|
|||||||
dependsOn(':kotlin-stdlib:testClasses')
|
dependsOn(':kotlin-stdlib:testClasses')
|
||||||
check.dependsOn(thisTask)
|
check.dependsOn(thisTask)
|
||||||
group = "verification"
|
group = "verification"
|
||||||
|
def kotlinStdLibTestOutput = project(':kotlin-stdlib').sourceSets.test.output
|
||||||
|
def objectFactory = project.objects
|
||||||
doFirst {
|
doFirst {
|
||||||
testClassesDirs = project(':kotlin-stdlib').sourceSets.test.output
|
testClassesDirs = kotlinStdLibTestOutput
|
||||||
classpath = files(
|
classpath = objectFactory.fileCollection().from(
|
||||||
testClassesDirs,
|
testClassesDirs,
|
||||||
sourceSets.test.compileClasspath
|
sourceSets.test.compileClasspath
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user