From 017a00b226fe22e08f48c0a1a090d2b5acfef1ee Mon Sep 17 00:00:00 2001
From: AngrySoundTech <angrysoundtech@gmail.com>
Date: Wed, 7 Feb 2024 20:40:31 -0500
Subject: [PATCH] Update Workflows

---
 .github/workflows/build_gradle_project.yaml   |  3 +-
 .github/workflows/publish_gradle_project.yaml | 38 +++++++++++++++++++
 scripts/gradle/common.gradle                  | 19 ----------
 3 files changed, 39 insertions(+), 21 deletions(-)
 create mode 100644 .github/workflows/publish_gradle_project.yaml

diff --git a/.github/workflows/build_gradle_project.yaml b/.github/workflows/build_gradle_project.yaml
index 39077f6d9..a8bcf02ba 100644
--- a/.github/workflows/build_gradle_project.yaml
+++ b/.github/workflows/build_gradle_project.yaml
@@ -7,7 +7,6 @@ on:
       project:
         description: 'The project to build'
         type: string
-        required: true
 
 jobs:
   build_gradle:
@@ -30,7 +29,7 @@ jobs:
         env:
           CI: true
         with:
-          arguments: '${{inputs.project}}:build --scan'
+          arguments: "${{inputs.project && format('{0}:', inputs.project)}}build --scan"
 
       - name: Upload Build Artifact
         uses: actions/upload-artifact@v3
diff --git a/.github/workflows/publish_gradle_project.yaml b/.github/workflows/publish_gradle_project.yaml
new file mode 100644
index 000000000..2c18ddac2
--- /dev/null
+++ b/.github/workflows/publish_gradle_project.yaml
@@ -0,0 +1,38 @@
+# This workflow can be used to publish any gradle project in the repo
+name: Publish Gradle Project
+
+on:
+  workflow_call:
+    inputs:
+      project:
+        description: 'The project to publish'
+        type: string
+
+jobs:
+  publish_gradle:
+    name: Publish Gradle
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Ensure Wrapper Permissions
+        run: chmod +x ./gradlew
+
+      - uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Gradle Publish
+        uses: gradle/gradle-build-action@v2
+        env:
+          CI: true
+        with:
+          arguments: "${{inputs.project && format('{0}:', inputs.project)}}publish --scan"
+
+      - name: Upload Build Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: gradle-build
+          path: '**/build/libs/*'
diff --git a/scripts/gradle/common.gradle b/scripts/gradle/common.gradle
index 796d80eeb..cc51612e7 100644
--- a/scripts/gradle/common.gradle
+++ b/scripts/gradle/common.gradle
@@ -1,4 +1,3 @@
-
 pluginManager.withPlugin("java-library") {
     java {
         toolchain {
@@ -33,8 +32,6 @@ pluginManager.withPlugin("java-library") {
 pluginManager.withPlugin("maven-publish") {
     def githubActor = System.getenv("GITHUB_ACTOR")
     def githubToken = System.getenv("GITHUB_TOKEN")
-    def nexusUser = System.getenv("CIVMC_NEXUS_USER")
-    def nexusPassword = System.getenv("CIVMC_NEXUS_PASSWORD")
 
     publishing {
         repositories {
@@ -48,22 +45,6 @@ pluginManager.withPlugin("maven-publish") {
                     }
                 }
             }
-
-            if (nexusUser && nexusPassword) {
-                def targetRepo = project.version.toString().endsWith("SNAPSHOT") ?
-                    "maven-snapshots"
-                :
-                    "maven-releases"
-
-                maven {
-                    name = "CivMC"
-                    url = URI("https://repo.civmc.net/repository/$targetRepo")
-                    credentials {
-                        username = nexusUser
-                        password = nexusPassword
-                    }
-                }
-            }
         }
 
         publications {