Merge pull request #18 from icerockdev/maven-portal-migrate

Migrate to Maven Central Portal

Author: oyakovlev

.github/workflows/distribution.yml

@@ -13,11 +13,19 @@ jobs:
       - uses: actions/setup-java@v1
         with:
           java-version: 11
-      - name: Build and publish to mavenCentral
+      - name: Build and publish to directory
         env:
           OSSRH_USER: ${{ secrets.OSSRH_USER }}
           OSSRH_KEY: ${{ secrets.OSSRH_KEY }}
           SIGNING_KEY_ID: ${{ secrets.SIGNING_KEYID }}
           SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
           SIGNING_KEY: ${{ secrets.GPG_KEY_CONTENTS }}
-        run: ./gradlew publish -PlibraryPublish
+        run: ./gradlew jreleaserConfig build publish -PlibraryPublish
+      - name: Publish to Maven Central Repository
+        env:
+          OSSRH_USER: ${{ secrets.OSSRH_USER }}
+          OSSRH_KEY: ${{ secrets.OSSRH_KEY }}
+          SIGNING_KEY_ID: ${{ secrets.SIGNING_KEYID }}
+          SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
+          SIGNING_KEY: ${{ secrets.GPG_KEY_CONTENTS }}
+        run: ./gradlew jreleaserFullRelease -PlibraryPublish

README.md

@@ -8,7 +8,7 @@ repositories {
 }
 
 // Append dependency
-implementation("com.icerockdev.service:fcm-push-service:2.1.2")
+implementation("com.icerockdev.service:fcm-push-service:2.2.0")
 ````
 
 ## Koin configure

build.gradle.kts

@@ -13,7 +13,7 @@ allprojects {
         maybeCreate("provided")
     }
 
-    val copyLibsCompileTask = tasks.create("copyLibsCompile", Copy::class.java) {
+    val copyLibsCompileTask = tasks.register("copyLibsCompile", Copy::class.java) {
         from(configurations["runtimeClasspath"])
         into(File(project.rootDir, "build/libs"))
     }
@@ -27,6 +27,6 @@ allprojects {
     }
 }
 
-tasks.create("clean", Delete::class.java) {
-    delete(rootProject.buildDir)
+tasks.register("clean", Delete::class.java) {
+    delete(rootProject.layout.buildDirectory)
 }

fcm-push-service/build.gradle.kts

@@ -1,18 +1,19 @@
-import java.util.Base64
-import kotlin.text.String
 /*
  * Copyright 2019 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
  */
+import java.util.Base64
+import org.jreleaser.model.Active
 
 group = "com.icerockdev.service"
-version = "2.1.2"
+version = "2.2.0"
 
 plugins {
     id("org.jetbrains.kotlin.jvm")
     id("kotlin-kapt")
     id("maven-publish")
     id("java-library")
     id("signing")
+    id("org.jreleaser") version "1.18.0"
 }
 
 apply(plugin = "kotlin")
@@ -46,15 +47,9 @@ repositories {
     mavenCentral()
 }
 
+val publishRepositoryName = "maven-central-portal-deploy"
 publishing {
-    repositories.maven("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/") {
-        name = "OSSRH"
-
-        credentials {
-            username = System.getenv("OSSRH_USER")
-            password = System.getenv("OSSRH_KEY")
-        }
-    }
+    repositories.maven(layout.buildDirectory.dir(publishRepositoryName))
     publications {
         register("mavenJava", MavenPublication::class) {
             from(components["java"])
@@ -98,7 +93,7 @@ publishing {
         }
 
         signing {
-            setRequired({!properties.containsKey("libraryPublishToMavenLocal")})
+            setRequired({ !properties.containsKey("libraryPublishToMavenLocal") })
             val signingKeyId: String? = System.getenv("SIGNING_KEY_ID")
             val signingPassword: String? = System.getenv("SIGNING_PASSWORD")
             val signingKey: String? = System.getenv("SIGNING_KEY")?.let { base64Key ->
@@ -109,3 +104,33 @@ publishing {
         }
     }
 }
+
+jreleaser {
+    gitRootSearch = true
+    release {
+        generic {
+            skipRelease = true
+            skipTag = true
+            changelog {
+                enabled = false
+            }
+            token = "EMPTY"
+        }
+    }
+    deploy {
+        maven {
+            mavenCentral.create("sonatype") {
+                enabled = !properties.containsKey("libraryPublishToMavenLocal")
+                applyMavenCentralRules = true
+                sign = false
+                active = Active.ALWAYS
+                url = "https://central.sonatype.com/api/v1/publisher"
+                stagingRepository(layout.buildDirectory.dir(publishRepositoryName).get().toString())
+                setAuthorization("Basic")
+                retryDelay = 60
+                username = System.getenv("OSSRH_USER")
+                password = System.getenv("OSSRH_KEY")
+            }
+        }
+    }
+}

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists