Try to use again maven deployer

ParsekDev · Dec 5, 2024 · 64d8341 · 64d8341
1 parent f434258
commit 64d8341
Showing 2 changed files with 38 additions and 37 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: 8
+          java-version: 21
 
       - name: Build with Gradle
         uses: gradle/actions/setup-gradle@v4
@@ -104,8 +104,8 @@ jobs:
         env:
           USERNAME_GITHUB: ${{ secrets.USERNAME_GITHUB }}
           TOKEN_GITHUB: ${{ secrets.TOKEN_GITHUB }}
-          JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
           GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
           GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,6 +1,5 @@
 
 import com.github.jengelman.gradle.plugins.shadow.ShadowExtension
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import java.util.*
 
 val vertxVersion: String by project
@@ -19,7 +18,7 @@ plugins {
     application
     `maven-publish`
     signing
-    id("org.jreleaser") version "1.15.0"
+    id("io.deepmedia.tools.deployer") version "0.15.0"
 }
 
 group = "dev.parsek"
@@ -176,40 +175,26 @@ publishing {
     }
 }
 
-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")))
         }
     }
 }
 
-//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()
@@ -227,8 +212,24 @@ signing {
     }
 }
 
+java {
+    // Java 11 ile derleme yap
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+    }
+}
+
 kotlin {
-    compilerOptions {
-        jvmTarget.set(JvmTarget.JVM_1_8)
+    jvmToolchain(21) // Kotlin'in de Java 11 araç zincirini kullanmasını sağla
+}
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    kotlinOptions {
+        jvmTarget = "1.8" // JVM 8 için hedef
     }
 }
+
+tasks.withType<JavaCompile> {
+    sourceCompatibility = "1.8"
+    targetCompatibility = "1.8"
+}