changed publishing of common and fabric modules

GT-Reimagined · Oct 13, 2024 · 3e9ca99 · 3e9ca99
1 parent b6a27e1
commit 3e9ca99
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 30 deletions.
diff --git a/build.gradle b/build.gradle
@@ -35,35 +35,5 @@ subprojects {
         }
         println("In CI mode")
     }
-    publishing {
-        publications {
-            mavenJava(org.gradle.api.publish.maven.MavenPublication) {
-                artifactId = "gtcore-" + project.name
-                from components.java
-                /*artifact(sourcesJar) {
-                    builtBy remapSourcesJar
-                }
 
-                afterEvaluate {
-                    artifact remapJar
-                    if (project.name != "common"){
-                        artifact shadowJar
-                    }
-                }*/
-            }
-        }
-        repositories {
-            if (isCI && isRELEASE) {
-                maven {
-                    url = "https://repo.repsy.io/mvn/trinsdar/gregtech-intergalactical/"
-                    credentials {
-                        username = System.getenv("MAVEN_USERNAME")
-                        password = System.getenv("MAVEN_PASSWORD")
-                    }
-                }
-            } else {
-                mavenLocal()
-            }
-        }
-    }
 }
diff --git a/common/build.gradle b/common/build.gradle
@@ -33,4 +33,35 @@ dependencies {
     }
     modCompileOnly("curse.maven:the-one-probe-fabric-581847:${project.top_fabric_file}")
     modImplementation "maven.modrinth:carbon-config:${project.carbon_config_fabric_version}"
+}
+
+publishing {
+    publications {
+        mavenJava(org.gradle.api.publish.maven.MavenPublication) {
+            artifactId = "gtcore-" + project.name
+            //from components.java
+            artifact(sourcesJar) {
+                builtBy remapSourcesJar
+            }
+            artifact jar
+            afterEvaluate {
+                artifact remapJar
+            }
+        }
+    }
+    repositories {
+        def isCI = System.getenv("GITHUB_ACTION")
+        def isRELEASE = System.getenv("GITHUB_RELEASE")
+        if (isCI && isRELEASE) {
+            maven {
+                url = "https://repo.repsy.io/mvn/trinsdar/gregtech-intergalactical/"
+                credentials {
+                    username = System.getenv("MAVEN_USERNAME")
+                    password = System.getenv("MAVEN_PASSWORD")
+                }
+            }
+        } else {
+            mavenLocal()
+        }
+    }
 }
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -65,4 +65,35 @@ tasks.withType(JavaCompile) {
 
 sourcesJar {
     from(project(':common').sourceSets.main.allSource)
+}
+
+publishing {
+    publications {
+        mavenJava(org.gradle.api.publish.maven.MavenPublication) {
+            artifactId = "gtcore-" + project.name
+            //from components.java
+            artifact(sourcesJar) {
+                builtBy remapSourcesJar
+            }
+            artifact jar
+            afterEvaluate {
+                artifact remapJar
+            }
+        }
+    }
+    repositories {
+        def isCI = System.getenv("GITHUB_ACTION")
+        def isRELEASE = System.getenv("GITHUB_RELEASE")
+        if (isCI && isRELEASE) {
+            maven {
+                url = "https://repo.repsy.io/mvn/trinsdar/gregtech-intergalactical/"
+                credentials {
+                    username = System.getenv("MAVEN_USERNAME")
+                    password = System.getenv("MAVEN_PASSWORD")
+                }
+            }
+        } else {
+            mavenLocal()
+        }
+    }
 }