Merge pull request #1 from nkiesel/gsm2

Gsm2

build.gradle.kts

@@ -3,28 +3,32 @@ import kotlin.io.path.createDirectories
 import kotlin.io.path.writeText
 
 plugins {
-    kotlin("jvm") version "2.0.0"
-    kotlin("plugin.serialization") version "2.0.0"
+    kotlin("jvm") version "2.0.21"
+    kotlin("plugin.serialization") version "2.0.21"
+    alias(libs.plugins.versions)
+    alias(libs.plugins.versions.filter)
+    alias(libs.plugins.versions.update)
     application
 }
 
 group = "nkiesel.org"
-version = "2.8.1"
+version = "3.0.0"
 
 repositories {
     mavenCentral()
 }
 
 dependencies {
-    implementation("com.github.ajalt.clikt:clikt:4.3.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.0")
-    implementation("org.http4k:http4k-core:5.23.0.0")
-    implementation("org.http4k:http4k-client-okhttp:5.23.0.0")
-    implementation("com.github.ajalt.mordant:mordant:2.6.0")
+    implementation(libs.clikt)
+    implementation(libs.clikt.markdown)
+    implementation(libs.kotlin.serialization)
+    implementation(libs.http4k.core)
+    implementation(libs.http4k.client.okhttp)
+    implementation(libs.mordant)
+    implementation(libs.google.cloud.secretmanager)
 
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.2")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.2")
-    testImplementation("io.kotest:kotest-assertions-core:5.9.1")
+    testImplementation(libs.junit.bom)
+    testImplementation(libs.junit.jupiter)
 }
 
 kotlin {
@@ -52,7 +56,9 @@ tasks.register<Jar>("uberJar") {
     dependsOn(configurations.runtimeClasspath)
     from({
         configurations.runtimeClasspath.get().filter { it.name.endsWith(".jar") }.map { zipTree(it) }
-    })
+    }) {
+        exclude("META-INF/*.RSA", "META-INF/*.SF", "META-INF/*.DSA")
+    }
 }
 
 val versionFile: Path = layout.buildDirectory.file("generated/version").get().asFile.toPath()

gradle/libs.versions.toml

@@ -0,0 +1,26 @@
+[versions]
+clikt = "5.0.1"
+gcsm = "2.53.0"
+http4k = "5.33.1.0"
+junit5 = "5.11.3"
+mordant = "3.0.1"
+plugin-versions = "0.51.0"
+plugin-versionsFilter = "0.1.16"
+plugin-versionsUpdate = "0.8.5"
+serialization = "1.7.3"
+
+[libraries]
+clikt = { module = "com.github.ajalt.clikt:clikt", version.ref = "clikt" }
+clikt-markdown = { module = "com.github.ajalt.clikt:clikt-markdown", version.ref = "clikt" }
+google-cloud-secretmanager = { module = "com.google.cloud:google-cloud-secretmanager", version.ref = "gcsm" }
+http4k-client-okhttp = { module = "org.http4k:http4k-client-okhttp", version.ref = "http4k" }
+http4k-core = { module = "org.http4k:http4k-core", version.ref = "http4k" }
+junit-bom = { module = "org.junit:junit-bom", version.ref = "junit5" }
+junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit5" }
+kotlin-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" }
+mordant = { module = "com.github.ajalt.mordant:mordant", version.ref = "mordant" }
+
+[plugins]
+versions = { id = "com.github.ben-manes.versions", version.ref = "plugin-versions" }
+versions-filter = { id = "se.ascp.gradle.gradle-versions-filter", version.ref = "plugin-versionsFilter" }
+versions-update = { id = "nl.littlerobots.version-catalog-update", version.ref = "plugin-versionsUpdate" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################