aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--buildSrc/src/main/kotlin/org/jetbrains/SetupMaven.kt1
-rw-r--r--buildSrc/src/main/kotlin/org/jetbrains/taskUtils.kt10
-rw-r--r--integration-tests/build.gradle.kts2
-rw-r--r--integration-tests/cli/build.gradle.kts2
4 files changed, 7 insertions, 8 deletions
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/SetupMaven.kt b/buildSrc/src/main/kotlin/org/jetbrains/SetupMaven.kt
index 519eea13..4ef26a73 100644
--- a/buildSrc/src/main/kotlin/org/jetbrains/SetupMaven.kt
+++ b/buildSrc/src/main/kotlin/org/jetbrains/SetupMaven.kt
@@ -1,6 +1,5 @@
package org.jetbrains
-import org.gradle.api.DefaultTask
import org.gradle.api.artifacts.Configuration
import org.gradle.api.tasks.Input
import org.gradle.api.tasks.Internal
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/taskUtils.kt b/buildSrc/src/main/kotlin/org/jetbrains/taskUtils.kt
index b018ba13..ef9c5e6a 100644
--- a/buildSrc/src/main/kotlin/org/jetbrains/taskUtils.kt
+++ b/buildSrc/src/main/kotlin/org/jetbrains/taskUtils.kt
@@ -3,11 +3,11 @@ package org.jetbrains
import org.gradle.api.Task
fun Task.dependsOnMavenLocalPublication() {
- project.rootProject.allprojects.forEach { otherProject ->
- otherProject.invokeWhenEvaluated { evaluatedProject ->
- evaluatedProject.tasks.findByName("publishToMavenLocal")?.let { publishingTask ->
- this.dependsOn(publishingTask)
- }
+ project.rootProject.allprojects.forEach { otherProject ->
+ otherProject.invokeWhenEvaluated { evaluatedProject ->
+ evaluatedProject.tasks.findByName("publishToMavenLocal")?.let { publishingTask ->
+ this.dependsOn(publishingTask)
}
}
+ }
}
diff --git a/integration-tests/build.gradle.kts b/integration-tests/build.gradle.kts
index 070091a0..8458f1fe 100644
--- a/integration-tests/build.gradle.kts
+++ b/integration-tests/build.gradle.kts
@@ -38,4 +38,4 @@ dependencies {
implementation(kotlin("stdlib"))
implementation(kotlin("test-junit"))
val coroutines_version: String by project
- api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version")}
+ implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version")}
diff --git a/integration-tests/cli/build.gradle.kts b/integration-tests/cli/build.gradle.kts
index 60d3a298..d9961f8f 100644
--- a/integration-tests/cli/build.gradle.kts
+++ b/integration-tests/cli/build.gradle.kts
@@ -31,7 +31,7 @@ val basePluginShadowJar by tasks.register("basePluginShadowJar", ShadowJar::clas
}
tasks.integrationTest {
- inputs.dir((file("projects")))
+ inputs.dir(file("projects"))
val cliJar = tasks.getByPath(":runners:cli:shadowJar") as ShadowJar
environment("CLI_JAR_PATH", cliJar.archiveFile.get())
environment("BASE_PLUGIN_JAR_PATH", basePluginShadowJar.archiveFile.get())