Refactor and clean preloader project

2017-09-11 13:06:15 +02:00
parent 1d56730538
commit 513ab08edd
11 changed files with 27 additions and 23 deletions
@@ -95,17 +95,20 @@ fun Project.ideaPlugin() = ideaPlugin {
 }


-fun Project.dist(body: Copy.() -> Unit = {}) {
+fun Project.dist(body: Copy.() -> Unit) {
    task<Copy>("dist") {
-        tasks.findByName("assemble")?.let {
-            dependsOn(it)
-        }
        body()
        rename("-${java.util.regex.Pattern.quote(rootProject.extra["build.number"].toString())}", "")
        into(rootProject.extra["distLibDir"].toString())
    }
 }

+fun Project.dist() = dist {
+    tasks.findByName("jar")?.let {
+        from(it)
+    }
+}
+
 fun ConfigurationContainer.getOrCreate(name: String): Configuration = findByName(name) ?: create(name)

 fun Jar.setupPublicJar(classifier: String = "", classifierDescr: String? = null) {