Use dependsOn for dependencies on dist & ideaPlugin tasks
instead `shouldRunAfter`
This commit is contained in:
@@ -24,7 +24,6 @@ sourceSets {
|
||||
testsJar {}
|
||||
|
||||
projectTest {
|
||||
shouldRunAfter(":dist")
|
||||
dependsOn(":prepare:mock-runtime-for-test:dist")
|
||||
dependsOn(":dist")
|
||||
workingDir = rootDir
|
||||
}
|
||||
|
||||
@@ -22,8 +22,7 @@ tasks.withType<KotlinCompile> {
|
||||
|
||||
projectTest {
|
||||
executable = "${rootProject.extra["JDK_18"]!!}/bin/java"
|
||||
shouldRunAfter(":dist")
|
||||
dependsOn(":prepare:mock-runtime-for-test:dist")
|
||||
dependsOn(":dist")
|
||||
workingDir = rootDir
|
||||
systemProperty("kotlin.test.script.classpath", the<JavaPluginConvention>().sourceSets.getByName("test").output.classesDirs.joinToString(File.pathSeparator))
|
||||
}
|
||||
|
||||
@@ -17,6 +17,6 @@ sourceSets {
|
||||
}
|
||||
|
||||
projectTest {
|
||||
shouldRunAfter(":dist")
|
||||
dependsOn(":dist")
|
||||
workingDir = rootDir
|
||||
}
|
||||
|
||||
@@ -118,7 +118,7 @@ sourceSets {
|
||||
}
|
||||
|
||||
projectTest {
|
||||
shouldRunAfter(":dist")
|
||||
dependsOn(":dist")
|
||||
workingDir = rootDir
|
||||
doFirst {
|
||||
systemProperty("idea.home.path", intellijRootDir().canonicalPath)
|
||||
|
||||
@@ -46,7 +46,7 @@ sourceSets {
|
||||
}
|
||||
|
||||
projectTest {
|
||||
shouldRunAfter(":dist")
|
||||
dependsOn(":dist")
|
||||
workingDir = rootDir
|
||||
doFirst {
|
||||
systemProperty("idea.home.path", intellijRootDir().canonicalPath)
|
||||
|
||||
@@ -52,7 +52,7 @@ evaluationDependsOn(":kotlin-android-extensions-runtime")
|
||||
|
||||
projectTest {
|
||||
environment("ANDROID_EXTENSIONS_RUNTIME_CLASSES", getSourceSetsFrom(":kotlin-android-extensions-runtime")["main"].output.classesDirs.asPath)
|
||||
shouldRunAfter(":dist")
|
||||
dependsOn(":dist")
|
||||
workingDir = rootDir
|
||||
doFirst {
|
||||
val androidPluginPath = File(intellijRootDir(), "plugins/android").canonicalPath
|
||||
|
||||
@@ -37,7 +37,7 @@ testsJar {}
|
||||
|
||||
projectTest {
|
||||
workingDir = rootDir
|
||||
shouldRunAfter(":dist")
|
||||
dependsOn(":dist")
|
||||
}
|
||||
|
||||
runtimeJar()
|
||||
|
||||
@@ -87,7 +87,7 @@ val jar = runtimeJar(task<ShadowJar>("shadowJar")) {
|
||||
}
|
||||
|
||||
ideaPlugin {
|
||||
shouldRunAfter(":dist")
|
||||
dependsOn(":dist")
|
||||
from(jar)
|
||||
from(sideJars)
|
||||
}
|
||||
|
||||
@@ -175,8 +175,7 @@ val ideaPluginDir: File by rootProject.extra
|
||||
val ideaUltimatePluginDir: File by rootProject.extra
|
||||
|
||||
task<Copy>("ideaUltimatePlugin") {
|
||||
dependsOn("$communityPluginProject:ideaPlugin")
|
||||
shouldRunAfter(":ideaPlugin")
|
||||
dependsOn(":ideaPlugin")
|
||||
into(ideaUltimatePluginDir)
|
||||
from(ideaPluginDir) { exclude("lib/kotlin-plugin.jar") }
|
||||
from(jar, { into("lib") })
|
||||
|
||||
Reference in New Issue
Block a user