From b55dce280c2dc7ee2a55b213e205dbb559410dac Mon Sep 17 00:00:00 2001
From: Jonas Herzig <me@johni0702.de>
Date: Mon, 6 May 2019 11:01:55 +0200
Subject: [PATCH] Fix :shadowJar task

It now copies any shadowed jar in any configured subprojects
instead of requiring all subprojects
---
 .drone.yml     |  3 +--
 .drone.yml.sig |  2 +-
 build.gradle   | 19 +++++++++----------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 4cb6b000..3d4d53cf 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -11,8 +11,7 @@ pipeline:
       - ./gradlew --parallel
       - ./gradlew :1.8:setCoreVersion
       - ./gradlew --old-gradle :1.7.10:setupCIWorkspace :jGui:1.7.10:setupCIWorkspace
-      - ./gradlew --old-gradle :1.7.10:shadowJar
-      - mv versions/1.7.10/build/libs/* build/libs/ && rm build/libs/*-raw.jar
+      - ./gradlew --old-gradle :1.7.10:shadowJar :shadowJar
   archive:
     image: plugins/s3
     acl: public-read
diff --git a/.drone.yml.sig b/.drone.yml.sig
index 970b2c66..c3d8e491 100644
--- a/.drone.yml.sig
+++ b/.drone.yml.sig
@@ -1 +1 @@
-eyJhbGciOiJIUzI1NiJ9.cGlwZWxpbmU6CiAgY2xvbmU6CiAgICBpbWFnZTogcGx1Z2lucy9naXQKICAgIHRhZ3M6IHRydWUKICAgIHJlY3Vyc2l2ZTogdHJ1ZQogIGJ1aWxkOgogICAgaW1hZ2U6IG1hdmVuOjMuMy45LWpkay04CiAgICBjb21tYW5kczoKICAgICAgLSBjdXJsIC0tZmFpbCAtLWNyZWF0ZS1kaXJzIC1vICRIT01FLy5ncmFkbGUvaW5pdC5kL21pcnJvci5ncmFkbGUgaHR0cHM6Ly9tYXZlbi5qb2huaTA3MDIuZGUvY29uZmlnL2dyYWRsZQogICAgICAtIGdpdCBjb25maWcgLS1nbG9iYWwgdXNlci5lbWFpbCAicmVwbGF5bW9kQGRyb25lIiAmJiBnaXQgY29uZmlnIC0tZ2xvYmFsIHVzZXIubmFtZSAiRHJvbmUiCiAgICAgIC0gLi9ncmFkbGV3IC0tcGFyYWxsZWwKICAgICAgLSAuL2dyYWRsZXcgOjEuODpzZXRDb3JlVmVyc2lvbgogICAgICAtIC4vZ3JhZGxldyAtLW9sZC1ncmFkbGUgOjEuNy4xMDpzZXR1cENJV29ya3NwYWNlIDpqR3VpOjEuNy4xMDpzZXR1cENJV29ya3NwYWNlCiAgICAgIC0gLi9ncmFkbGV3IC0tb2xkLWdyYWRsZSA6MS43LjEwOnNoYWRvd0phcgogICAgICAtIG12IHZlcnNpb25zLzEuNy4xMC9idWlsZC9saWJzLyogYnVpbGQvbGlicy8gJiYgcm0gYnVpbGQvbGlicy8qLXJhdy5qYXIKICBhcmNoaXZlOgogICAgaW1hZ2U6IHBsdWdpbnMvczMKICAgIGFjbDogcHVibGljLXJlYWQKICAgIHJlZ2lvbjogInVzLWVhc3QtMSIKICAgIGJ1Y2tldDogInJlcGxheW1vZCIKICAgIHBhdGhfc3R5bGU6IHRydWUKICAgIHNvdXJjZTogYnVpbGQvbGlicy8qCiAgICBzdHJpcF9wcmVmaXg6IGJ1aWxkL2xpYnMvCiAgICB0YXJnZXQ6IC8K.nFpHPk-uA5rUI5LjhElZzr9_J2Z5rT_7_PjDyslaz-Y
\ No newline at end of file
+eyJhbGciOiJIUzI1NiJ9.cGlwZWxpbmU6CiAgY2xvbmU6CiAgICBpbWFnZTogcGx1Z2lucy9naXQKICAgIHRhZ3M6IHRydWUKICAgIHJlY3Vyc2l2ZTogdHJ1ZQogIGJ1aWxkOgogICAgaW1hZ2U6IG1hdmVuOjMuMy45LWpkay04CiAgICBjb21tYW5kczoKICAgICAgLSBjdXJsIC0tZmFpbCAtLWNyZWF0ZS1kaXJzIC1vICRIT01FLy5ncmFkbGUvaW5pdC5kL21pcnJvci5ncmFkbGUgaHR0cHM6Ly9tYXZlbi5qb2huaTA3MDIuZGUvY29uZmlnL2dyYWRsZQogICAgICAtIGdpdCBjb25maWcgLS1nbG9iYWwgdXNlci5lbWFpbCAicmVwbGF5bW9kQGRyb25lIiAmJiBnaXQgY29uZmlnIC0tZ2xvYmFsIHVzZXIubmFtZSAiRHJvbmUiCiAgICAgIC0gLi9ncmFkbGV3IC0tcGFyYWxsZWwKICAgICAgLSAuL2dyYWRsZXcgOjEuODpzZXRDb3JlVmVyc2lvbgogICAgICAtIC4vZ3JhZGxldyAtLW9sZC1ncmFkbGUgOjEuNy4xMDpzZXR1cENJV29ya3NwYWNlIDpqR3VpOjEuNy4xMDpzZXR1cENJV29ya3NwYWNlCiAgICAgIC0gLi9ncmFkbGV3IC0tb2xkLWdyYWRsZSA6MS43LjEwOnNoYWRvd0phciA6c2hhZG93SmFyCiAgYXJjaGl2ZToKICAgIGltYWdlOiBwbHVnaW5zL3MzCiAgICBhY2w6IHB1YmxpYy1yZWFkCiAgICByZWdpb246ICJ1cy1lYXN0LTEiCiAgICBidWNrZXQ6ICJyZXBsYXltb2QiCiAgICBwYXRoX3N0eWxlOiB0cnVlCiAgICBzb3VyY2U6IGJ1aWxkL2xpYnMvKgogICAgc3RyaXBfcHJlZml4OiBidWlsZC9saWJzLwogICAgdGFyZ2V0OiAvCg.XgGmPeVl9inL3hFvpIcRvEH4sViZBEwaDpXkV22NWdo
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 9d279c18..bbd8d003 100755
--- a/build.gradle
+++ b/build.gradle
@@ -35,6 +35,10 @@ group= "com.replaymod"
 // Fabric's remapJar task assumes the compile configuration to exist
 configurations { compile }
 
+task shadowJar(type: Copy) {
+    into "$buildDir/libs"
+}
+
 subprojects {
     buildscript {
         repositories {
@@ -46,18 +50,13 @@ subprojects {
     // Workaround for https://discuss.gradle.org/t/idea-plugin-bug/21525
     apply plugin: 'eclipse'
     apply plugin: 'idea'
-}
 
-//evaluationDependsOnChildren()
-task shadowJar(type: Copy) {
-    subprojects.forEach {
-        def shadowJar = it.tasks.findByName('shadowJar')
-        if (shadowJar != null && it.name != 'core') {
-            dependsOn shadowJar
-            from shadowJar.archivePath
-        }
+    def shadowJar = it.tasks.findByName('shadowJar')
+    if (shadowJar != null && shadowJar.hasProperty('archivePath') && project.name != 'core') {
+        def rootTask = rootProject.tasks.shadowJar
+        rootTask.dependsOn shadowJar
+        rootTask.from shadowJar.archivePath
     }
-    into "$buildDir/libs"
 }
 
 def gitDescribe() {