Fix tests in the new build infrastructure

libraries/commonConfiguration.gradle

@@ -131,9 +131,18 @@ ext.configurePublishing = { Project project ->
             }
         }
 
+        configurations {
+            distJar
+        }
+
         task dist(type: Copy, dependsOn: assemble) {
             rename "-${java.util.regex.Pattern.quote(version)}", ''
             into distLibDir
+            afterEvaluate {
+                project.artifacts {
+                    distJar file: file("$distLibDir${File.separator}${archivesBaseName}.jar"), builtBy: "dist"
+                }
+            }
         }
 
         uploadArchives {

libraries/examples/annotation-processor-example/build.gradle.kts

@@ -3,7 +3,7 @@ description = "Simple Annotation Processor for testing kapt"
 apply { plugin("kotlin") }
 
 dependencies {
-    compile(project(":kotlin-stdlib"))
+    compile(projectDist(":kotlin-stdlib"))
 }
 
 sourceSets {

libraries/examples/kotlin-gradle-subplugin-example/build.gradle

@@ -14,7 +14,7 @@ dependencies {
 
     compile project(':kotlin-test::kotlin-test-junit')
 
-    compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compileOnly project(path: ":kotlin-stdlib", configuration: "distJar")
     compileOnly project(':compiler')
     compileOnly project(':compiler:plugin-api')
     compileOnly project(':compiler:cli-common')

libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts

@@ -4,13 +4,14 @@ description = "Sample Kotlin JSR 223 scripting jar with daemon (out-of-process)
 apply { plugin("kotlin") }
 
 dependencies {
-    compile(project(":kotlin-stdlib"))
-    compile(project(":kotlin-script-runtime"))
+    compile(projectDist(":kotlin-stdlib"))
+    compile(projectDist(":kotlin-script-runtime"))
     compile(projectRuntimeJar(":kotlin-compiler"))
     compile(project(":kotlin-script-util"))
     compile(projectRuntimeJar(":kotlin-daemon-client"))
-    testCompile(project(":kotlin-test:kotlin-test-junit"))
-    testRuntime(project(":kotlin-reflect"))
+    testCompile(commonDep("junit:junit"))
+    testCompile(projectDist(":kotlin-test:kotlin-test-junit"))
+    testRuntime(projectDist(":kotlin-reflect"))
 }
 
 projectTest()

libraries/examples/kotlin-jsr223-local-example/build.gradle.kts

@@ -4,12 +4,13 @@ description = "Sample Kotlin JSR 223 scripting jar with local (in-process) compi
 apply { plugin("kotlin") }
 
 dependencies {
-    compile(project(":kotlin-stdlib"))
-    compile(project(":kotlin-script-runtime"))
+    compile(projectDist(":kotlin-stdlib"))
+    compile(projectDist(":kotlin-script-runtime"))
     compile(projectRuntimeJar(":kotlin-compiler"))
     compile(project(":kotlin-script-util"))
-    testCompile(project(":kotlin-test:kotlin-test-junit"))
-    testRuntime(project(":kotlin-reflect"))
+    testCompile(projectDist(":kotlin-test:kotlin-test-junit"))
+    testCompile(commonDep("junit:junit"))
+    testRuntime(projectDist(":kotlin-reflect"))
 }
 
 projectTest()

libraries/tools/kotlin-annotation-processing/build.gradle.kts

@@ -5,7 +5,7 @@ dependencies {
     compile(project(":plugins:kapt3"))
     compileOnly("org.jetbrains.kotlin:gradle-api:1.6")
     compileOnly("com.android.tools.build:gradle:1.1.0")
-    compile(project(":kotlin-stdlib"))
+    compile(projectDist(":kotlin-stdlib"))
     testCompile(commonDep("junit:junit"))
 }
 

libraries/tools/kotlin-script-util/build.gradle.kts

@@ -4,15 +4,16 @@ description = "Kotlin scripting support utilities"
 apply { plugin("kotlin") }
 
 dependencies {
-    compile(project(":kotlin-stdlib"))
-    compile(project(":kotlin-script-runtime"))
+    compile(projectDist(":kotlin-stdlib"))
+    compile(projectDist(":kotlin-script-runtime"))
     compile(projectRuntimeJar(":kotlin-compiler"))
     compile(projectRuntimeJar(":kotlin-daemon-client"))
     compileOnly("com.jcabi:jcabi-aether:0.10.1")
     compileOnly("org.sonatype.aether:aether-api:1.13.1")
     compileOnly("org.apache.maven:maven-core:3.0.3")
-    testCompile(project(":kotlin-test:kotlin-test-junit"))
-    testRuntime(project(":kotlin-reflect"))
+    testCompile(projectDist(":kotlin-test:kotlin-test-junit"))
+    testRuntime(projectDist(":kotlin-reflect"))
+    testCompile(commonDep("junit:junit"))
     testRuntime("com.jcabi:jcabi-aether:0.10.1")
     testRuntime("org.sonatype.aether:aether-api:1.13.1")
     testRuntime("org.apache.maven:maven-core:3.0.3")