[patch] due to problems with the last release's publication to nexus,…

… making some adjustments to avoid issues with the boms
robertfmurdock · Sep 26, 2024 · 07ce85d · 07ce85d
1 parent 995752d
commit 07ce85d
Show file tree

Hide file tree

Showing 16 changed files with 49 additions and 35 deletions.
diff --git a/.idea/artifacts/digger_cli_js.xml b/.idea/artifacts/digger_cli_js.xml
diff --git a/.idea/artifacts/digger_cli_jvm.xml b/.idea/artifacts/digger_cli_jvm.xml
diff --git a/.idea/artifacts/tagger_cli_js.xml b/.idea/artifacts/tagger_cli_js.xml
diff --git a/.idea/artifacts/tagger_cli_jvm.xml b/.idea/artifacts/tagger_cli_jvm.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/tools-plugins/src/main/kotlin/com/zegreatrob/tools/plugins/library.gradle.kts b/tools-plugins/src/main/kotlin/com/zegreatrob/tools/plugins/library.gradle.kts
@@ -0,0 +1,24 @@
+package com.zegreatrob.tools.plugins
+
+plugins {
+    id("com.zegreatrob.tools.plugins.mp")
+    id("com.zegreatrob.tools.plugins.publish")
+}
+
+tasks {
+    val javadocJar by creating(Jar::class) {
+        archiveClassifier.set("javadoc")
+        from("${rootDir.absolutePath}/javadocs")
+    }
+    publishing.publications {
+        withType<MavenPublication> { artifact(javadocJar) }
+    }
+}
+
+afterEvaluate {
+    tasks {
+        withType<PublishToMavenRepository> {
+            mustRunAfter(withType<Sign>())
+        }
+    }
+}
diff --git a/tools-plugins/src/main/kotlin/com/zegreatrob/tools/plugins/publish.gradle.kts b/tools-plugins/src/main/kotlin/com/zegreatrob/tools/plugins/publish.gradle.kts
@@ -60,19 +60,4 @@ signing {
 
 tasks {
     publish { finalizedBy("::closeAndReleaseSonatypeStagingRepository") }
-    val javadocJar by creating(Jar::class) {
-        archiveClassifier.set("javadoc")
-        from("${rootDir.absolutePath}/javadocs")
-    }
-    publishing.publications {
-        withType<MavenPublication> { artifact(javadocJar) }
-    }
-}
-
-afterEvaluate {
-    tasks {
-        withType<PublishToMavenRepository> {
-            mustRunAfter(withType<Sign>())
-        }
-    }
 }
diff --git a/tools/digger-core/build.gradle.kts b/tools/digger-core/build.gradle.kts
@@ -1,8 +1,7 @@
 @file:Suppress("UnstableApiUsage")
 
 plugins {
-    id("com.zegreatrob.tools.plugins.mp")
-    id("com.zegreatrob.tools.plugins.publish")
+    id("com.zegreatrob.tools.plugins.library")
 }
 
 group = "com.zegreatrob.tools"

diff --git a/tools/digger-json/build.gradle.kts b/tools/digger-json/build.gradle.kts
@@ -1,8 +1,7 @@
 @file:Suppress("UnstableApiUsage")
 
 plugins {
-    id("com.zegreatrob.tools.plugins.mp")
-    id("com.zegreatrob.tools.plugins.publish")
+    id("com.zegreatrob.tools.plugins.library")
     id("org.jetbrains.kotlin.plugin.serialization") version embeddedKotlinVersion
 }
 

diff --git a/tools/digger-model/build.gradle.kts b/tools/digger-model/build.gradle.kts
@@ -1,8 +1,7 @@
 @file:Suppress("UnstableApiUsage")
 
 plugins {
-    id("com.zegreatrob.tools.plugins.mp")
-    id("com.zegreatrob.tools.plugins.publish")
+    id("com.zegreatrob.tools.plugins.library")
 }
 
 group = "com.zegreatrob.tools"

diff --git a/tools/digger-plugin/build.gradle.kts b/tools/digger-plugin/build.gradle.kts
@@ -78,8 +78,6 @@ signing {
     sign(publishing.publications)
 }
 
-group = "com.zegreatrob.tools"
-
 afterEvaluate {
     publishing.publications.withType<MavenPublication>().forEach {
         with(it) {

diff --git a/tools/git-adapter/build.gradle.kts b/tools/git-adapter/build.gradle.kts
@@ -1,8 +1,7 @@
 @file:Suppress("UnstableApiUsage")
 
 plugins {
-    id("com.zegreatrob.tools.plugins.mp")
-    id("com.zegreatrob.tools.plugins.publish")
+    id("com.zegreatrob.tools.plugins.library")
 }
 
 group = "com.zegreatrob.tools"

diff --git a/tools/tagger-core/build.gradle.kts b/tools/tagger-core/build.gradle.kts
@@ -1,8 +1,7 @@
 @file:Suppress("UnstableApiUsage")
 
 plugins {
-    id("com.zegreatrob.tools.plugins.mp")
-    id("com.zegreatrob.tools.plugins.publish")
+    id("com.zegreatrob.tools.plugins.library")
 }
 
 group = "com.zegreatrob.tools"

diff --git a/tools/tagger-plugin/build.gradle.kts b/tools/tagger-plugin/build.gradle.kts
@@ -81,8 +81,6 @@ signing {
     sign(publishing.publications)
 }
 
-group = "com.zegreatrob.tools"
-
 afterEvaluate {
     publishing.publications.withType<MavenPublication>().forEach {
         with(it) {

diff --git a/tools/tools-bom/build.gradle.kts b/tools/tools-bom/build.gradle.kts
@@ -6,8 +6,8 @@ plugins {
 dependencies {
     constraints {
         api(project(":digger-core"))
-        api(project(":digger-model"))
         api(project(":digger-json"))
+        api(project(":digger-model"))
         api(project(":digger-plugin"))
         api(project(":tagger-plugin"))
     }