Merge pull request #67 from atlanhq/DX-314

Override default jar with shadowed jar where needed
atlanhq · Nov 9, 2023 · 98a28e2 · 98a28e2
2 parents 16a4506 + 5b1454a
commit 98a28e2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,3 +5,6 @@ atlan-java = "1.7.0-SNAPSHOT"
 pkg-toolkit-config = { module = "com.atlan:package-toolkit-config", version.ref = "atlan-java" }
 pkg-toolkit-runtime = { module = "com.atlan:package-toolkit-runtime", version.ref = "atlan-java" }
 pkg-toolkit-events = { module = "com.atlan:package-toolkit-events", version.ref = "atlan-java" }
+
+[plugins]
+shadow = { id = "com.github.johnrengelman.shadow", version = "7.1.2" }
diff --git a/packages/migration-assistant-export/build.gradle.kts b/packages/migration-assistant-export/build.gradle.kts
@@ -3,7 +3,7 @@ val jarFile = "migration-assistant-export-$version.jar"
 
 plugins {
     id("com.atlan.kotlin-custom-package")
-    id("com.github.johnrengelman.shadow") version "7.1.2"
+    alias(libs.plugins.shadow)
 }
 
 dependencies {
@@ -22,6 +22,9 @@ tasks {
     }
 
     jar {
-        dependsOn(shadowJar)
+        // Override the default jar task so we get the shadowed jar
+        // as the only jar output
+        actions = listOf()
+        doLast { shadowJar }
     }
 }
diff --git a/packages/migration-assistant-import/build.gradle.kts b/packages/migration-assistant-import/build.gradle.kts
@@ -3,7 +3,7 @@ val jarFile = "migration-assistant-import-$version.jar"
 
 plugins {
     id("com.atlan.kotlin-custom-package")
-    id("com.github.johnrengelman.shadow") version "7.1.2"
+    alias(libs.plugins.shadow)
 }
 
 dependencies {
@@ -22,6 +22,9 @@ tasks {
     }
 
     jar {
-        dependsOn(shadowJar)
+        // Override the default jar task so we get the shadowed jar
+        // as the only jar output
+        actions = listOf()
+        doLast { shadowJar }
     }
 }
diff --git a/packages/openapi-spec-loader/build.gradle.kts b/packages/openapi-spec-loader/build.gradle.kts
@@ -3,7 +3,7 @@ val jarFile = "openapi-spec-loader-$version.jar"
 
 plugins {
     id("com.atlan.kotlin-custom-package")
-    id("com.github.johnrengelman.shadow") version "7.1.2"
+    alias(libs.plugins.shadow)
 }
 
 dependencies {
@@ -31,6 +31,9 @@ tasks {
     }
 
     jar {
-        dependsOn(shadowJar)
+        // Override the default jar task so we get the shadowed jar
+        // as the only jar output
+        actions = listOf()
+        doLast { shadowJar }
     }
 }