[patch] attempting to correct the problems with the cli extraction

robertfmurdock · Sep 26, 2024 · 995752d · 995752d
1 parent 9e8bc50
commit 995752d
Show file tree

Hide file tree

Showing 43 changed files with 49 additions and 53 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/build.gradle.kts b/build.gradle.kts
@@ -23,7 +23,7 @@ tasks {
         dependsOn(provider { gradle.includedBuilds.map { it.task(":assemble") }.toList() })
     }
     release {
-        dependsOn(provider { gradle.includedBuild("cli-tools").task(":release") })
+        dependsOn(provider { gradle.includedBuild("command-line-tools").task(":release") })
         dependsOn(provider { gradle.includedBuild("tools").task(":release") })
         finalizedBy(currentContributionData)
     }

diff --git a/cli-tools/build.gradle.kts → command-line-tools/build.gradle.kts b/cli-tools/build.gradle.kts → command-line-tools/build.gradle.kts
diff --git a/cli-tools/digger-cli/README.md → command-line-tools/digger-cli/README.md b/cli-tools/digger-cli/README.md → command-line-tools/digger-cli/README.md
diff --git a/cli-tools/digger-cli/build.gradle.kts → ...nd-line-tools/digger-cli/build.gradle.kts b/cli-tools/digger-cli/build.gradle.kts → ...nd-line-tools/digger-cli/build.gradle.kts
@@ -77,7 +77,7 @@ tasks {
         workingDir(mainNpmProjectDir)
         commandLine("npm", "publish")
     }
-    publish {
+    val publish by creating {
         dependsOn(jsPublish)
         mustRunAfter(check)
     }

diff --git a/...b.tools.digger.cli/AllContributionData.kt → ...b.tools.digger.cli/AllContributionData.kt b/...b.tools.digger.cli/AllContributionData.kt → ...b.tools.digger.cli/AllContributionData.kt
diff --git a/...ols.digger.cli/CurrentContributionData.kt → ...ols.digger.cli/CurrentContributionData.kt b/...ols.digger.cli/CurrentContributionData.kt → ...ols.digger.cli/CurrentContributionData.kt
diff --git a/...n/com.zegreatrob.tools.digger.cli/Main.kt → ...n/com.zegreatrob.tools.digger.cli/Main.kt b/...n/com.zegreatrob.tools.digger.cli/Main.kt → ...n/com.zegreatrob.tools.digger.cli/Main.kt
diff --git a/...om.zegreatrob.tools.digger.cli/Welcome.kt → ...om.zegreatrob.tools.digger.cli/Welcome.kt b/...om.zegreatrob.tools.digger.cli/Welcome.kt → ...om.zegreatrob.tools.digger.cli/Welcome.kt
diff --git a/...igger-cli/src/jsMain/resources/bin/digger → ...igger-cli/src/jsMain/resources/bin/digger b/...igger-cli/src/jsMain/resources/bin/digger → ...igger-cli/src/jsMain/resources/bin/digger
diff --git a/...ols/digger/cli/AllContributionDataTest.kt → ...ols/digger/cli/AllContributionDataTest.kt b/...ols/digger/cli/AllContributionDataTest.kt → ...ols/digger/cli/AllContributionDataTest.kt
diff --git a/...digger/cli/CurrentContributionDataTest.kt → ...digger/cli/CurrentContributionDataTest.kt b/...digger/cli/CurrentContributionDataTest.kt → ...digger/cli/CurrentContributionDataTest.kt
diff --git a/cli-tools/gradle/libs.versions.toml → command-line-tools/gradle/libs.versions.toml b/cli-tools/gradle/libs.versions.toml → command-line-tools/gradle/libs.versions.toml
diff --git a/cli-tools/kotlin-js-store/yarn.lock → command-line-tools/kotlin-js-store/yarn.lock b/cli-tools/kotlin-js-store/yarn.lock → command-line-tools/kotlin-js-store/yarn.lock
diff --git a/cli-tools/settings.gradle.kts → command-line-tools/settings.gradle.kts b/cli-tools/settings.gradle.kts → command-line-tools/settings.gradle.kts
@@ -5,7 +5,7 @@ pluginManagement {
     }
 }
 
-rootProject.name = "cli-tools"
+rootProject.name = "command-line-tools"
 
 include("digger-cli")
 include("tagger-cli")

diff --git a/cli-tools/tagger-cli/README.md → command-line-tools/tagger-cli/README.md b/cli-tools/tagger-cli/README.md → command-line-tools/tagger-cli/README.md
diff --git a/cli-tools/tagger-cli/build.gradle.kts → ...nd-line-tools/tagger-cli/build.gradle.kts b/cli-tools/tagger-cli/build.gradle.kts → ...nd-line-tools/tagger-cli/build.gradle.kts
@@ -86,7 +86,7 @@ tasks {
     check {
         dependsOn(confirmTaggerCanRun)
     }
-    publish {
+    val publish by creating {
         dependsOn(jsPublish)
         mustRunAfter(check)
     }

diff --git a/...trob/tools/tagger/cli/CalculateVersion.kt → ...trob/tools/tagger/cli/CalculateVersion.kt b/...trob/tools/tagger/cli/CalculateVersion.kt → ...trob/tools/tagger/cli/CalculateVersion.kt
diff --git a/...trob/tools/tagger/cli/ConfigFileSource.kt → ...trob/tools/tagger/cli/ConfigFileSource.kt b/...trob/tools/tagger/cli/ConfigFileSource.kt → ...trob/tools/tagger/cli/ConfigFileSource.kt
diff --git a/...n/com/zegreatrob/tools/tagger/cli/Main.kt → ...n/com/zegreatrob/tools/tagger/cli/Main.kt b/...n/com/zegreatrob/tools/tagger/cli/Main.kt → ...n/com/zegreatrob/tools/tagger/cli/Main.kt
diff --git a/...in/com/zegreatrob/tools/tagger/cli/Tag.kt → ...in/com/zegreatrob/tools/tagger/cli/Tag.kt b/...in/com/zegreatrob/tools/tagger/cli/Tag.kt → ...in/com/zegreatrob/tools/tagger/cli/Tag.kt
diff --git a/...com/zegreatrob/tools/tagger/cli/Tagger.kt → ...com/zegreatrob/tools/tagger/cli/Tagger.kt b/...com/zegreatrob/tools/tagger/cli/Tagger.kt → ...com/zegreatrob/tools/tagger/cli/Tagger.kt
diff --git a/...greatrob/tools/tagger/cli/TaggerConfig.kt → ...greatrob/tools/tagger/cli/TaggerConfig.kt b/...greatrob/tools/tagger/cli/TaggerConfig.kt → ...greatrob/tools/tagger/cli/TaggerConfig.kt
diff --git a/...agger-cli/src/jsMain/resources/bin/tagger → ...agger-cli/src/jsMain/resources/bin/tagger b/...agger-cli/src/jsMain/resources/bin/tagger → ...agger-cli/src/jsMain/resources/bin/tagger
diff --git a/.../CalculateVersionCommandConfigFileTest.kt → .../CalculateVersionCommandConfigFileTest.kt b/.../CalculateVersionCommandConfigFileTest.kt → .../CalculateVersionCommandConfigFileTest.kt
diff --git a/...tagger/cli/CalculateVersionCommandTest.kt → ...tagger/cli/CalculateVersionCommandTest.kt b/...tagger/cli/CalculateVersionCommandTest.kt → ...tagger/cli/CalculateVersionCommandTest.kt
diff --git a/...ls/tagger/cli/TagCommandConfigFileTest.kt → ...ls/tagger/cli/TagCommandConfigFileTest.kt b/...ls/tagger/cli/TagCommandConfigFileTest.kt → ...ls/tagger/cli/TagCommandConfigFileTest.kt
diff --git a/...eatrob/tools/tagger/cli/TagCommandTest.kt → ...eatrob/tools/tagger/cli/TagCommandTest.kt b/...eatrob/tools/tagger/cli/TagCommandTest.kt → ...eatrob/tools/tagger/cli/TagCommandTest.kt
diff --git a/...zegreatrob/tools/tagger/cli/TaggerTest.kt → ...zegreatrob/tools/tagger/cli/TaggerTest.kt b/...zegreatrob/tools/tagger/cli/TaggerTest.kt → ...zegreatrob/tools/tagger/cli/TaggerTest.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 rootProject.name = "ze-great-tools"
 includeBuild("tools-plugins")
 includeBuild("tools")
-includeBuild("cli-tools")
+includeBuild("command-line-tools")
 
 develocity {
     buildScan {

diff --git a/tools-plugins/src/main/kotlin/com/zegreatrob/tools/plugins/mp.gradle.kts b/tools-plugins/src/main/kotlin/com/zegreatrob/tools/plugins/mp.gradle.kts
@@ -8,8 +8,6 @@ plugins {
     id("com.zegreatrob.tools.plugins.lint")
     id("com.zegreatrob.tools.plugins.versioning")
     id("org.jetbrains.kotlin.multiplatform")
-    id("com.zegreatrob.tools.plugins.publish")
-    signing
 }
 
 kotlin {
@@ -20,21 +18,3 @@ kotlin {
         allWarningsAsErrors = true
     }
 }
-
-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
@@ -1,7 +1,7 @@
 package com.zegreatrob.tools.plugins
 
 import java.nio.charset.Charset
-import java.util.Base64
+import java.util.*
 
 plugins {
     `maven-publish`
@@ -12,8 +12,6 @@ repositories {
     mavenCentral()
 }
 
-group = "com.zegreatrob.tools"
-
 afterEvaluate {
     publishing.publications.withType<MavenPublication>().forEach {
         with(it) {
@@ -62,4 +60,19 @@ 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-plugins/src/main/kotlin/com/zegreatrob/tools/plugins/versioning.gradle.kts b/tools-plugins/src/main/kotlin/com/zegreatrob/tools/plugins/versioning.gradle.kts
@@ -1,8 +1,6 @@
 package com.zegreatrob.tools.plugins
 
 import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
-import org.gradle.kotlin.dsl.repositories
-import org.gradle.kotlin.dsl.withType
 
 plugins {
     id("com.github.ben-manes.versions")
@@ -12,6 +10,8 @@ repositories {
     mavenCentral()
 }
 
+group = "com.zegreatrob.tools"
+
 tasks {
     withType<DependencyUpdatesTask> {
         checkForGradleUpdate = true

diff --git a/tools/digger-core/build.gradle.kts b/tools/digger-core/build.gradle.kts
@@ -2,6 +2,7 @@
 
 plugins {
     id("com.zegreatrob.tools.plugins.mp")
+    id("com.zegreatrob.tools.plugins.publish")
 }
 
 group = "com.zegreatrob.tools"

diff --git a/tools/digger-json/build.gradle.kts b/tools/digger-json/build.gradle.kts
@@ -2,6 +2,7 @@
 
 plugins {
     id("com.zegreatrob.tools.plugins.mp")
+    id("com.zegreatrob.tools.plugins.publish")
     id("org.jetbrains.kotlin.plugin.serialization") version embeddedKotlinVersion
 }
 

diff --git a/tools/digger-model/build.gradle.kts b/tools/digger-model/build.gradle.kts
@@ -2,6 +2,7 @@
 
 plugins {
     id("com.zegreatrob.tools.plugins.mp")
+    id("com.zegreatrob.tools.plugins.publish")
 }
 
 group = "com.zegreatrob.tools"

diff --git a/tools/git-adapter/build.gradle.kts b/tools/git-adapter/build.gradle.kts
@@ -2,6 +2,7 @@
 
 plugins {
     id("com.zegreatrob.tools.plugins.mp")
+    id("com.zegreatrob.tools.plugins.publish")
 }
 
 group = "com.zegreatrob.tools"

diff --git a/tools/tagger-core/build.gradle.kts b/tools/tagger-core/build.gradle.kts
@@ -2,6 +2,7 @@
 
 plugins {
     id("com.zegreatrob.tools.plugins.mp")
+    id("com.zegreatrob.tools.plugins.publish")
 }
 
 group = "com.zegreatrob.tools"