Use new maven repo and publishing setup

Kale-Ko · Dec 23, 2023 · bb346cf · bb346cf
1 parent cc08331
commit bb346cf
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 27 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -27,5 +27,8 @@ jobs:
         with:
           arguments: build
         env:
-          GH_PACKAGES_USER: Kale-Ko
+          MAVEN_USER: ${{ secrets.MAVEN_USER }}
+          MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }}
+          MAVEN_TYPE: release
+          GH_PACKAGES_USER: ${{ secrets.GH_PACKAGES_USER }}
           GH_PACKAGES_TOKEN: ${{ secrets.GH_PACKAGES_TOKEN }}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -25,15 +25,21 @@ jobs:
         with:
           arguments: build
         env:
-          GH_PACKAGES_USER: Kale-Ko
+          MAVEN_USER: ${{ secrets.MAVEN_USER }}
+          MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }}
+          MAVEN_TYPE: release
+          GH_PACKAGES_USER: ${{ secrets.GH_PACKAGES_USER }}
           GH_PACKAGES_TOKEN: ${{ secrets.GH_PACKAGES_TOKEN }}
 
       - name: Publish to GitHub Packages
         uses: gradle/gradle-build-action@v2
         with:
           arguments: publish
         env:
-          GH_PACKAGES_USER: Kale-Ko
+          MAVEN_USER: ${{ secrets.MAVEN_USER }}
+          MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }}
+          MAVEN_TYPE: release
+          GH_PACKAGES_USER: ${{ secrets.GH_PACKAGES_USER }}
           GH_PACKAGES_TOKEN: ${{ secrets.GH_PACKAGES_TOKEN }}
 
       - name: Publish to Github Pages

diff --git a/build.gradle b/build.gradle
@@ -7,20 +7,16 @@ project.group = "io.github.kale_ko"
 project.version = project.project_version
 
 repositories {
-    if (project.useLocal) {
-        mavenLocal()
-    }
-    mavenCentral()
-
     maven {
-        name = "GitHub-Packages"
-        url = "https://maven.pkg.github.com/Kale-Ko/BJSL"
+        name = "Kales-Maven"
+        url = "https://maven.kaleko.dev/public-snapshot/"
 
         credentials {
-            username = System.getenv("GH_PACKAGES_USER")
-            password = System.getenv("GH_PACKAGES_TOKEN")
+            username = System.getenv("MAVEN_USER")
+            password = System.getenv("MAVEN_TOKEN")
         }
     }
+    mavenCentral()
 }
 
 dependencies {
@@ -84,6 +80,12 @@ build {
 javadoc {
     title = project.name + " " + project.version
 
+    options.encoding = "UTF-8"
+    options.locale = "en"
+
+    options.author = true
+    options.version = true
+
     doFirst {
         mkdir "./build/"
         mkdir "./build/docs/"
@@ -98,12 +100,33 @@ javadoc {
 publishing {
     repositories {
         maven {
-            name = "GitHub-Packages"
-            url = "https://maven.pkg.github.com/Kale-Ko/EJCL"
+            name = "Kales-Maven"
+            url = "https://maven.kaleko.dev/public-snapshot/"
 
             credentials {
-                username = System.getenv("GH_PACKAGES_USER")
-                password = System.getenv("GH_PACKAGES_TOKEN")
+                username = System.getenv("MAVEN_USER")
+                password = System.getenv("MAVEN_TOKEN")
+            }
+        }
+
+        if ("release".equalsIgnoreCase(System.getenv("MAVEN_TYPE"))) {
+            maven {
+                name = "Kales-Maven"
+                url = "https://maven.kaleko.dev/public-release/"
+
+                credentials {
+                    username = System.getenv("MAVEN_USER")
+                    password = System.getenv("MAVEN_TOKEN")
+                }
+            }
+            maven {
+                name = "GitHub-Packages"
+                url = "https://maven.pkg.github.com/Kale-Ko/EJCL/"
+
+                credentials {
+                    username = System.getenv("GH_PACKAGES_USER")
+                    password = System.getenv("GH_PACKAGES_TOKEN")
+                }
             }
         }
     }
@@ -138,7 +161,7 @@ publishing {
                 scmNode.appendNode("connection", "scm:git:[email protected]:Kale-Ko/EJCL.git")
                 scmNode.appendNode("developerConnection", "scm:git:[email protected]:Kale-Ko/EJCL.git")
                 scmNode.appendNode("tag", "master")
-                scmNode.appendNode("url", "https://github.com/Kale-Ko/EJCL")
+                scmNode.appendNode("url", "https://github.com/Kale-Ko/EJCL/")
 
                 def dependenciesNode = node.appendNode("dependencies")
 

diff --git a/gradle.properties b/gradle.properties
@@ -3,10 +3,9 @@ org.gradle.caching=true
 
 java_version=11
 
-project_version=3.9.1
+project_version=3.9.2
 project_description=An advanced configuration library for Java with support for local files, mysql databases, and more.
 
-useLocal=false
-bjsl_version=1.10.5
+bjsl_version=1.10.6
 
 mysql_connector_version=8.0.33
diff --git a/jitpack.yml b/jitpack.yml