diff --git a/libraries/tools/binary-compatibility-validator/build.gradle b/libraries/tools/binary-compatibility-validator/build.gradle index 72439c015bd..eff0e691f73 100644 --- a/libraries/tools/binary-compatibility-validator/build.gradle +++ b/libraries/tools/binary-compatibility-validator/build.gradle @@ -1,10 +1,22 @@ apply plugin: 'kotlin' +configurations { + testArtifacts +} + dependencies { compile project(':kotlin-stdlib') compile 'org.ow2.asm:asm-debug-all:5.0.4' compile 'com.google.code.gson:gson:2.6.2' testCompile project(':kotlin-test:kotlin-test-junit') + + testArtifacts project(':kotlin-stdlib') + testArtifacts project(':kotlin-stdlib-jre7') + testArtifacts project(':kotlin-stdlib-jre8') + testArtifacts project(':kotlin-reflect') + // legacy + testArtifacts project(':kotlin-runtime') + testArtifacts files(project(':kotlin-stdlib').tasks.originalStdlibJar) } sourceSets { @@ -23,8 +35,7 @@ compileTestKotlin { test { dependsOn cleanCompileTestKotlin - dependsOn(':kotlin-runtime:jar') - dependsOn(':kotlin-stdlib:originalStdlibJar') + dependsOn configurations.testArtifacts systemProperties['overwrite.output'] = System.getProperty("overwrite.output", "false") jvmArgs '-ea' diff --git a/libraries/tools/binary-compatibility-validator/src/test/kotlin/org.jetbrains.kotlin.tools.tests/CasesPublicAPITest.kt b/libraries/tools/binary-compatibility-validator/src/test/kotlin/org.jetbrains.kotlin.tools.tests/CasesPublicAPITest.kt index 32b3fb83c27..fc9c51bf334 100644 --- a/libraries/tools/binary-compatibility-validator/src/test/kotlin/org.jetbrains.kotlin.tools.tests/CasesPublicAPITest.kt +++ b/libraries/tools/binary-compatibility-validator/src/test/kotlin/org.jetbrains.kotlin.tools.tests/CasesPublicAPITest.kt @@ -8,7 +8,7 @@ import java.io.File class CasesPublicAPITest { companion object { - val visibilities = readKotlinVisibilities(File("build/cases-declarations.json")) + val visibilities by lazy { readKotlinVisibilities(File("build/cases-declarations.json")) } val baseClassPath = File("build/classes/test/cases").absoluteFile val baseOutputPath = File("src/test/kotlin/cases") }