Minor fixes, rewritten CrossPlatformExec.kt

1 files changed, 13 insertions, 23 deletions

diff --git a/integration-tests/gradle-integration-tests/build.gradle.kts b/integration-tests/gradle-integration-tests/build.gradle.kts
index d8b3cdc4..03dc2641 100644
--- a/integration-tests/gradle-integration-tests/build.gradle.kts
+++ b/integration-tests/gradle-integration-tests/build.gradle.kts
@@ -1,6 +1,6 @@
-val dokkaPlugin by configurations.creating
-val dokkaCore by configurations.creating
-val kotlinGradle by configurations.creating
+val dokkaPlugin: Configuration by configurations.creating
+val dokkaCore: Configuration by configurations.creating
+val kotlinGradle: Configuration by configurations.creating
 
 repositories {
     maven(url = "https://kotlin.bintray.com/kotlin-plugin")
@@ -8,26 +8,17 @@ repositories {
 
 dependencies {
     val kotlin_version: String by project
-    testCompileOnly(group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version = kotlin_version)
-    testImplementation(
-        group = "org.jetbrains.kotlin",
-        name = "kotlin-test-junit",
-        version = kotlin_version
-    )
-    testImplementation(project(":coreDependencies"))
+    testCompileOnly("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version")
+    testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
+    testImplementation("junit:junit:4.13")
+    testImplementation(gradleTestKit())
+
     dokkaPlugin(project(path = ":runners:gradle-plugin"))
     dokkaCore(project(path = ":core", configuration = "shadow"))
-
     kotlinGradle("org.jetbrains.kotlin:kotlin-gradle-plugin")
-
-    testImplementation(group = "junit", name = "junit", version = "4.13")
-    testImplementation(gradleTestKit())
 }
 
-
 val createClasspathManifest by tasks.registering {
-    dependsOn(project(":core").getTasksByName("shadowJar", true))
-
     val outputDir = file("$buildDir/$name")
     inputs.files(dokkaPlugin + dokkaCore)
     outputs.dir(outputDir)
@@ -40,15 +31,14 @@ val createClasspathManifest by tasks.registering {
     }
 }
 
-val testClasses by tasks.getting
-
-testClasses.dependsOn(project(":core").getTasksByName("shadowJar", true))
-testClasses.dependsOn(createClasspathManifest)
-
 tasks {
+    testClasses {
+        dependsOn(createClasspathManifest)
+    }
+
     test {
         systemProperty("android.licenses.overwrite", project.findProperty("android.licenses.overwrite") ?: "")
         inputs.dir(file("testData"))
-        exclude("*") // TODO: Remove this exclude when tests are migrated
+//        exclude("*") // TODO: Remove this exclude when tests are migrated
     }
 }