Fix back to JVM 8 in release and use jreleaser instead of other deplo…

…y tool
ParsekDev · Dec 5, 2024 · 6f11713 · 6f11713
1 parent ec93c92
commit 6f11713
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 21 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -82,7 +82,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 21
+          java-version: 8
 
       - name: Build with Gradle
         uses: gradle/actions/setup-gradle@v4

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,7 +1,6 @@
 
 import com.github.jengelman.gradle.plugins.shadow.ShadowExtension
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 import java.util.*
 
 val vertxVersion: String by project
@@ -20,7 +19,7 @@ plugins {
     application
     `maven-publish`
     signing
-    id("io.deepmedia.tools.deployer") version "0.15.0"
+    id("org.jreleaser") version "1.15.0"
 }
 
 group = "dev.parsek"
@@ -177,26 +176,40 @@ publishing {
     }
 }
 
-deployer {
-    if (System.getenv("OSSRH_USERNAME") != null && System.getenv("OSSRH_PASSWORD") != null) {
-        centralPortalSpec {
-            // Take these credentials from the Generate User Token page at https://central.sonatype.com/account
-            auth.user.set(secret(System.getenv("OSSRH_USERNAME")))
-            auth.password.set(secret(System.getenv("OSSRH_PASSWORD")))
-
-            // Signing is required
-            signing.key.set(
-                secret(
-                    String(
-                        Base64.getDecoder().decode(System.getenv("GPG_PRIVATE_KEY").replace("\n", ""))
-                    )
-                )
-            )
-            signing.password.set(secret(System.getenv("GPG_PASSPHRASE")))
+jreleaser {
+    deploy {
+        maven {
+            mavenCentral {
+                create("app") {
+                    setActive("ALWAYS")
+                    url.set("https://central.sonatype.com/api/v1/publisher")
+                    stagingRepository("target/staging-deploy")
+                }
+            }
         }
     }
 }
 
+//deployer {
+//    if (System.getenv("OSSRH_USERNAME") != null && System.getenv("OSSRH_PASSWORD") != null) {
+//        centralPortalSpec {
+//            // Take these credentials from the Generate User Token page at https://central.sonatype.com/account
+//            auth.user.set(secret(System.getenv("OSSRH_USERNAME")))
+//            auth.password.set(secret(System.getenv("OSSRH_PASSWORD")))
+//
+//            // Signing is required
+//            signing.key.set(
+//                secret(
+//                    String(
+//                        Base64.getDecoder().decode(System.getenv("GPG_PRIVATE_KEY").replace("\n", ""))
+//                    )
+//                )
+//            )
+//            signing.password.set(secret(System.getenv("GPG_PASSPHRASE")))
+//        }
+//    }
+//}
+
 java {
     withJavadocJar()
     withSourcesJar()
@@ -217,7 +230,5 @@ signing {
 kotlin {
     compilerOptions {
         jvmTarget.set(JvmTarget.JVM_1_8)
-        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_8)
-        languageVersion.set(KotlinVersion.KOTLIN_1_8)
     }
 }