change to github packages for publishing

robaho · robaho · commit dea016124c12 · 2024-07-31T07:53:16.000-05:00
diff --git a/.github/workflows/gradle-publish.yml b/.github/workflows/gradle-publish.yml
@@ -21,6 +21,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+    - name: Set env
+      run: echo "RELEASE_VERSION=${GITHUB_REF:10}" >> $GITHUB_ENV
     - name: Set up JDK 21
       uses: actions/setup-java@v3
       with:
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,6 @@
 .gradle/
 build/
 bin/
-gradle/
 gradle.properties
 .vscode
 .DS_Store
diff --git a/build.gradle b/build.gradle
@@ -4,6 +4,9 @@ plugins {
     id 'signing'
 }
 
+group = 'robaho.net'
+version = System.getenv("RELEASE_VERSION")
+
 repositories {
     mavenCentral() 
 }
@@ -146,57 +149,18 @@ publish {
 
 publishing {
     publications {
-        maven(MavenPublication) {
-            groupId = 'io.github.robaho'
-            artifactId = 'httpserver'
-            version = "1.0.6"
-
-            from components.java
-
-            pom {
-                name = 'HttpServer'
-                description = 'A modified http server based on the JDK version designed for Virtual Threads. Includes websocket support.'
-
-                signing {
-                    sign publishing.publications.maven
-                    sign configurations.archives
-                }
-
-                url = 'https://github.com/robaho/httpserver'
-
-                scm {
-                    url = 'https://github.com/robaho/httpserver.git'
-                }
-
-                licenses {
-                    license {
-                        name = 'gnu v2.0'
-                        url = 'https://www.gnu.org/licenses/old-licenses/gpl-2.0.html'
-                    }
-                    license {
-                        name = 'nanohttpd'
-                        url = 'https://github.com/NanoHttpd/nanohttpd/blob/efb2ebf85a2b06f7c508aba9eaad5377e3a01e81/LICENSE.md'
-                    }
-                }
-
-                developers {
-                    developer {
-                        id = 'robaho'
-                        name = 'Robert Engels'
-                        email = 'robaho@me.com'
-                    }
-                }
-            }
+        gpr(MavenPublication) {
+            from(components.java)
         }
     }
     repositories {
         maven {
-        name = "OSSRH"
-        url = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
+            name = "GitHubPackages"
+            url = uri("https://maven.pkg.github.com/robaho/closablequeue")
             credentials {
-                username = "$maven_user"
-                password = "$maven_password"
-            }            
+                username = project.findProperty("gpr.user") ?: System.getenv("USERNAME")
+                password = project.findProperty("gpr.key") ?: System.getenv("TOKEN")
+            }
         }
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,4 @@
-# org.gradle.java.home=/Library/Java/JavaVirtualMachines/jdk-21.jdk/Contents/Home
-org.gradle.java.installations.paths=/site/drw/java/jdk-21
-# org.gradle.java.home=/site/drw/java/jdk-21
+# org.gradle.java.installations.paths=/site/drw/java/jdk-21
+# org.gradle.java.home=/site/drw/java/jdk-21
+# org.gradle.java.home=/Library/Java/JavaVirtualMachines/jdk-17.0.5.jdk/Contents/Home
+org.gradle.java.home=/Library/Java/JavaVirtualMachines/jdk-21.jdk/Contents/Home
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
@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
