From df43d2d03986c70607a0494dc355ef15266642aa Mon Sep 17 00:00:00 2001
From: uTen2c <uten2c@gmail.com>
Date: Tue, 2 Jan 2024 14:45:33 +0900
Subject: [PATCH] Update publish task

---
 build.gradle        |  3 ++-
 common/build.gradle | 25 +++++++------------------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4f05a3d4..6428c656 100644
--- a/build.gradle
+++ b/build.gradle
@@ -80,6 +80,7 @@ tasks.register("cloneJcefAndPublish", GradleBuild) {
     group = "publishing"
     tasks = [
             ":cloneJcef",
-            ":fabric:publish"
+            ":common:publish",
+            ":fabric:publish",
     ]
 }
diff --git a/common/build.gradle b/common/build.gradle
index d8092a1e..4935b1bc 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -16,32 +16,21 @@ repositories {
     }
 }
 
-/*
-    Add the following to ~/.gradle/gradle.properties
-    systemProp.org.gradle.s3.endpoint=https://<the s3 endpoint>
-    MCEF_S3_PUBLISH_URL_SNAPSHOT=s3://<bucket>/repositories/snapshots
-    MCEF_S3_PUBLISH_URL_RELEASE=s3://<bucket>/repositories/releases
-    MCEF_S3_PUBLISH_ACCESS_KEY=<access key>
-    MCEF_S3_PUBLISH_SECRET_KEY=<secret key>
- */
 publishing {
-    repositories {
-        maven {
-            url ((mcef_version.toString().endsWith("SNAPSHOT")) ? findProperty('MCEF_S3_PUBLISH_URL_SNAPSHOT') : findProperty('MCEF_S3_PUBLISH_URL_RELEASE'))
-            credentials(AwsCredentials) {
-                accessKey = findProperty('MCEF_S3_PUBLISH_ACCESS_KEY')
-                secretKey = findProperty('MCEF_S3_PUBLISH_SECRET_KEY')
-            }
-        }
-    }
     publications {
         mavenJava(MavenPublication) {
             from components.java
-            groupId = 'com.cinemamod'
+            groupId = 'net.rainbootsmc'
             artifactId = 'mcef'
             version = mcef_version
         }
     }
+    def publishPath = System.getenv("PUBLISH_PATH")
+    repositories {
+        maven {
+            url publishPath
+        }
+    }
 }
 
 dependencies {