Use dependsOn for dependencies on dist & ideaPlugin tasks

instead `shouldRunAfter`
This commit is contained in:
Vyacheslav Gerasimov
2018-02-01 17:18:53 +03:00
parent a595fdd312
commit ec511f7a78
9 changed files with 9 additions and 12 deletions
+1 -2
View File
@@ -24,7 +24,6 @@ sourceSets {
testsJar {} testsJar {}
projectTest { projectTest {
shouldRunAfter(":dist") dependsOn(":dist")
dependsOn(":prepare:mock-runtime-for-test:dist")
workingDir = rootDir workingDir = rootDir
} }
+1 -2
View File
@@ -22,8 +22,7 @@ tasks.withType<KotlinCompile> {
projectTest { projectTest {
executable = "${rootProject.extra["JDK_18"]!!}/bin/java" executable = "${rootProject.extra["JDK_18"]!!}/bin/java"
shouldRunAfter(":dist") dependsOn(":dist")
dependsOn(":prepare:mock-runtime-for-test:dist")
workingDir = rootDir workingDir = rootDir
systemProperty("kotlin.test.script.classpath", the<JavaPluginConvention>().sourceSets.getByName("test").output.classesDirs.joinToString(File.pathSeparator)) systemProperty("kotlin.test.script.classpath", the<JavaPluginConvention>().sourceSets.getByName("test").output.classesDirs.joinToString(File.pathSeparator))
} }
+1 -1
View File
@@ -17,6 +17,6 @@ sourceSets {
} }
projectTest { projectTest {
shouldRunAfter(":dist") dependsOn(":dist")
workingDir = rootDir workingDir = rootDir
} }
+1 -1
View File
@@ -118,7 +118,7 @@ sourceSets {
} }
projectTest { projectTest {
shouldRunAfter(":dist") dependsOn(":dist")
workingDir = rootDir workingDir = rootDir
doFirst { doFirst {
systemProperty("idea.home.path", intellijRootDir().canonicalPath) systemProperty("idea.home.path", intellijRootDir().canonicalPath)
+1 -1
View File
@@ -46,7 +46,7 @@ sourceSets {
} }
projectTest { projectTest {
shouldRunAfter(":dist") dependsOn(":dist")
workingDir = rootDir workingDir = rootDir
doFirst { doFirst {
systemProperty("idea.home.path", intellijRootDir().canonicalPath) systemProperty("idea.home.path", intellijRootDir().canonicalPath)
@@ -52,7 +52,7 @@ evaluationDependsOn(":kotlin-android-extensions-runtime")
projectTest { projectTest {
environment("ANDROID_EXTENSIONS_RUNTIME_CLASSES", getSourceSetsFrom(":kotlin-android-extensions-runtime")["main"].output.classesDirs.asPath) environment("ANDROID_EXTENSIONS_RUNTIME_CLASSES", getSourceSetsFrom(":kotlin-android-extensions-runtime")["main"].output.classesDirs.asPath)
shouldRunAfter(":dist") dependsOn(":dist")
workingDir = rootDir workingDir = rootDir
doFirst { doFirst {
val androidPluginPath = File(intellijRootDir(), "plugins/android").canonicalPath val androidPluginPath = File(intellijRootDir(), "plugins/android").canonicalPath
@@ -37,7 +37,7 @@ testsJar {}
projectTest { projectTest {
workingDir = rootDir workingDir = rootDir
shouldRunAfter(":dist") dependsOn(":dist")
} }
runtimeJar() runtimeJar()
+1 -1
View File
@@ -87,7 +87,7 @@ val jar = runtimeJar(task<ShadowJar>("shadowJar")) {
} }
ideaPlugin { ideaPlugin {
shouldRunAfter(":dist") dependsOn(":dist")
from(jar) from(jar)
from(sideJars) from(sideJars)
} }
+1 -2
View File
@@ -175,8 +175,7 @@ val ideaPluginDir: File by rootProject.extra
val ideaUltimatePluginDir: File by rootProject.extra val ideaUltimatePluginDir: File by rootProject.extra
task<Copy>("ideaUltimatePlugin") { task<Copy>("ideaUltimatePlugin") {
dependsOn("$communityPluginProject:ideaPlugin") dependsOn(":ideaPlugin")
shouldRunAfter(":ideaPlugin")
into(ideaUltimatePluginDir) into(ideaUltimatePluginDir)
from(ideaPluginDir) { exclude("lib/kotlin-plugin.jar") } from(ideaPluginDir) { exclude("lib/kotlin-plugin.jar") }
from(jar, { into("lib") }) from(jar, { into("lib") })