rel: release v0.1.0

Signed-off-by: grapebaba <281165273@qq.com>
GrapeBaBa · Nov 21, 2022 · b78ffee · b78ffee
1 parent acc7b5d
commit b78ffee
Show file tree

Hide file tree

Showing 10 changed files with 228 additions and 134 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -3,29 +3,54 @@ on:
   release:
     types: [created]
 jobs:
-  publish:
+  sonatype-publish:
     runs-on: ubuntu-latest
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.OSSRH_USERNAME }}
+      ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.OSSRH_TOKEN }}
+      ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_SIGN_KEY }}
+      ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_SIGN_PW }}
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Set up JDK 8
+        uses: actions/setup-java@v3
+        with:
+          java-version: 8
+          distribution: 'temurin'
+
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+
+      - name: Publish package
+        run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository
+
+
+  github-publish:
+    runs-on: ubuntu-latest
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_SIGN_KEY }}
+      ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_SIGN_PW }}
     permissions:
       contents: read
       packages: write
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
+
       - name: Set up JDK 8
         uses: actions/setup-java@v3
         with:
           java-version: 8
           distribution: 'temurin'
+
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
 
-      - name: Execute Gradle build
-        run: ./gradlew build
-
       - name: Publish package
-        run: ./gradlew publish
-        env:
-          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: ./gradlew publishAllPublicationsToGitHubPackagesRepository
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![sui4j CI](https://github.com/GrapeBaBa/sui4j/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/GrapeBaBa/sui4j/actions/workflows/gradle.yml)
+[![sui4j CI](https://github.com/GrapeBaBa/sui4j/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/GrapeBaBa/sui4j/actions/workflows/build.yml)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 ![Coverage](.github/badges/jacoco.svg)
 ![Branches](.github/badges/branches.svg)

diff --git a/build.gradle b/build.gradle
@@ -5,12 +5,13 @@ plugins {
 	id "com.diffplug.spotless" version "6.11.0"
 	id 'org.unbroken-dome.test-sets' version '4.0.0'
 	id 'maven-publish'
+	id "io.github.gradle-nexus.publish-plugin" version "1.1.0"
 	id 'signing'
 }
 
 
-group 'io.sui'
-version '0.1.0-SNAPSHOT'
+group 'me.grapebaba'
+version '0.1.4'
 
 repositories {
 	mavenCentral()
@@ -203,17 +204,17 @@ publishing {
 		}
 	}
 	repositories {
-		maven {
-			name = "OSSRH"
-			// change URLs to point to your repos, e.g. http://my.org/repo
-			def releasesRepoUrl = 'https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/'
-			def snapshotsRepoUrl = 'https://s01.oss.sonatype.org/content/repositories/snapshots/'
-			url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
-			credentials {
-				username = System.getenv("MAVEN_USERNAME")
-				password = System.getenv("MAVEN_PASSWORD")
-			}
-		}
+//		maven {
+//			name = "OSSRH"
+//			// change URLs to point to your repos, e.g. http://my.org/repo
+//			def releasesRepoUrl = 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
+//			def snapshotsRepoUrl = 'https://oss.sonatype.org/content/repositories/snapshots/'
+//			url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
+//			credentials {
+//				username = System.getenv("MAVEN_USERNAME")
+//				password = System.getenv("MAVEN_PASSWORD")
+//			}
+//		}
 		maven {
 			name = "GitHubPackages"
 			url = "https://maven.pkg.github.com/GrapeBaBa/" + rootProject.name
@@ -227,6 +228,9 @@ publishing {
 
 signing {
 	sign publishing.publications.mavenJava
+	def signingKey = findProperty("signingKey")
+	def signingPassword = findProperty("signingPassword")
+	useInMemoryPgpKeys(signingKey, signingPassword)
 }
 
 
@@ -235,3 +239,9 @@ javadoc {
 		options.addBooleanOption('html5', true)
 	}
 }
+
+nexusPublishing {
+	repositories {
+		sonatype()
+	}
+}
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,4 @@
+signing.keyId=1AF5DF33
 # Gradle
 #org.gradle.jvmargs=--add-opens java.base/java.lang=ALL-UNNAMED
 # Versions

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists