[publish] fix shadow jar publication

FrogDevelopment · May 16, 2024 · c83c211 · c83c211
1 parent 19d9875
commit c83c211
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/buildSrc/src/main/kotlin/com.frogdevelopment.publish-conventions.gradle.kts b/buildSrc/src/main/kotlin/com.frogdevelopment.publish-conventions.gradle.kts
@@ -89,10 +89,9 @@ signing {
 }
 
 tasks {
-    matching { it is PublishToMavenRepository && it.repository.name == "sonatype" }.all {
-        onlyIf { releaseVersion }
-    }
-    matching { it is PublishToMavenRepository && it.repository.name == "github" }.all {
-        onlyIf { !releaseVersion }
+    withType<PublishToMavenRepository>().configureEach {
+        onlyIf {
+            (releaseVersion && repository.name == "sonatype") || (!releaseVersion && repository.name == "github")
+        }
     }
 }
diff --git a/consul-populate-cli/build.gradle.kts b/consul-populate-cli/build.gradle.kts
@@ -57,12 +57,11 @@ tasks {
     jar {
         enabled = false
     }
+
     shadowJar {
 //        minimize() waiting https://github.com/johnrengelman/shadow/pull/876
-        archiveClassifier.set("")
     }
 
-
     test {
         // https://github.com/stefanbirkner/system-lambda/issues/27
         systemProperty("java.security.manager", "allow")