Adaptions to build and publications (#220)

* Adaptions to build and publications * Adapt deprecated wrapper validation action
europace · Jul 29, 2024 · b36843d · b36843d
1 parent b4aa177
commit b36843d
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 13 deletions.
diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
@@ -22,4 +22,4 @@ jobs:
         with:
           repo-token: ${{ secrets.GH_ACTION_TOKEN }}
           labels: dependencies
-      - uses: gradle/wrapper-validation-action@v3
+      - uses: gradle/actions/wrapper-validation@v3
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,4 +1,7 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 val javaVersion = JavaVersion.VERSION_17
+val jvmVersion = JvmTarget.JVM_17
 
 plugins {
   alias(libs.plugins.kotlinJvm)
@@ -12,7 +15,9 @@ val dependencyVersions = listOf(
     libs.annotations,
     libs.mockk,
     libs.okio,
-    libs.opentest4j
+    libs.okioJvm,
+    libs.opentest4j,
+    libs.slf4j
 )
 
 val dependencyVersionsByGroup = mapOf(
@@ -31,9 +36,9 @@ tasks {
     useJUnitPlatform()
   }
   withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-    kotlinOptions {
-      jvmTarget = javaVersion.toString()
-      freeCompilerArgs = listOf("-Xjsr305=strict")
+    compilerOptions {
+      jvmTarget.set(jvmVersion)
+      freeCompilerArgs.set(listOf("-Xjsr305=strict"))
     }
   }
 }
@@ -67,8 +72,9 @@ allprojects {
 }
 
 gradlePlugin {
-  website.set("https://github.com/europace/docker-publish-gradle-plugin")
-  vcsUrl.set("https://github.com/europace/docker-publish-gradle-plugin")
+  val scmUrl = "https://github.com/europace/docker-publish-gradle-plugin"
+  website.set(scmUrl)
+  vcsUrl.set(scmUrl)
   plugins {
     create("dockerPublishPlugin") {
       id = "de.europace.docker-publish"
@@ -79,11 +85,22 @@ gradlePlugin {
     }
   }
   publishing {
-    publications.withType(MavenPublication::class).configureEach {
-      pom {
-        url.set("https://github.com/europace/docker-publish-gradle-plugin")
-        scm {
-          url.set("https://github.com/europace/docker-publish-gradle-plugin")
+    publications {
+      register("plugin", MavenPublication::class) {
+        from(components["java"])
+        pom {
+          url.set(scmUrl)
+          scm {
+            url.set(scmUrl)
+          }
+        }
+      }
+      withType(MavenPublication::class).configureEach {
+        pom {
+          url.set(scmUrl)
+          scm {
+            url.set(scmUrl)
+          }
         }
       }
     }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,6 +5,7 @@ kotest = "5.9.1"
 kotlin = "2.0.0"
 kotlinx = "1.8.1"
 mockk = "1.13.12"
+okio = "3.9.0"
 
 
 [libraries]
@@ -19,8 +20,10 @@ mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
 annotations = { module = "org.jetbrains:annotations", version = "24.1.0" }
 byteBuddy = { module = "net.bytebuddy:byte-buddy", version.ref = "byteBuddy" }
 kotlinx = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8", version.ref = "kotlinx" }
-okio = { module = "com.squareup.okio:okio", version = "3.9.0" }
+okio = { module = "com.squareup.okio:okio", version.ref = "okio" }
+okioJvm = { module = "com.squareup.okio:okio-jvm", version.ref = "okio" }
 opentest4j = { module = "org.opentest4j:opentest4j", version = "1.3.0" }
+slf4j = { module = "org.slf4j:slf4j-api", version = "2.0.13" }
 
 [bundles]
 kotest = ["kotest", "kotestEngine", "kotestProperty", "kotestRunner"]