Fix unified publishing

Urkaz · Jul 14, 2024 · 1ebcafb · 1ebcafb
1 parent 1923d78
commit 1ebcafb
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 47 deletions.
diff --git a/build.gradle b/build.gradle
@@ -128,53 +128,6 @@ subprojects {
             }
         }
     }
-
-    unifiedPublishing {
-        project {
-            version = "$project.version"
-            releaseType = "release"
-            gameVersions = ["$project.minecraft_version"]
-
-            mainPublication tasks.remapJar
-
-            relations {
-                depends {
-                    curseforge = "architectury-api"
-                    modrinth = "architectury-api"
-                }
-                optional {
-                    curseforge = "cloth-config"
-                    modrinth = "cloth-config"
-                }
-                if (cm_mod_compat_enabled.toBoolean()) {
-                    optional {
-                        curseforge = "crimson-moon"
-                    }
-                }
-                if (lunar_mod_compat_enabled.toBoolean()) {
-                    optional {
-                        curseforge = "lunar"
-                        modrinth = "lunar"
-                    }
-                }
-            }
-
-            if (project.hasProperty("cuseforge_api_key") || System.getenv("cuseforge_api_key") != null) {
-                curseforge {
-                    token = project.hasProperty("cuseforge_api_key") ? project.property("cuseforge_api_key") : System.getenv("cuseforge_api_key")
-                    id = "${project.curseforge_id}"
-                    gameVersions.addAll "Java 17"
-                }
-            }
-
-            if (project.hasProperty("modrinth_api_key") || System.getenv("modrinth_api_key") != null) {
-                modrinth {
-                    token = project.hasProperty("modrinth_api_key") ? project.property("modrinth_api_key") : System.getenv("modrinth_api_key")
-                    id = "${project.modrinth_id}"
-                }
-            }
-        }
-    }
 }
 
 tasks.register('modPublish')
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -128,18 +128,57 @@ unifiedPublishing {
     project {
         displayName = "[Fabric $rootProject.minecraft_version] $project.mod_name v$project.version"
         gameLoaders = ["fabric"]
+        version = "$project.version"
+        releaseType = "release"
+        gameVersions = ["$project.minecraft_version"]
+
+        mainPublication tasks.remapJar
 
         relations {
+            depends {
+                curseforge = "architectury-api"
+                modrinth = "architectury-api"
+            }
+            optional {
+                curseforge = "cloth-config"
+                modrinth = "cloth-config"
+            }
             optional {
                 modrinth = "modmenu"
             }
+            if (cm_mod_compat_enabled.toBoolean()) {
+                optional {
+                    curseforge = "crimson-moon"
+                }
+            }
+            if (lunar_mod_compat_enabled.toBoolean()) {
+                optional {
+                    curseforge = "lunar"
+                    modrinth = "lunar"
+                }
+            }
             if (ec_mod_compat_enabled.toBoolean()) {
                 optional {
                     curseforge = "enhanced-celestials-fabric"
                     modrinth = "enhanced-celestials"
                 }
             }
         }
+
+        if (project.hasProperty("cuseforge_api_key") || System.getenv("cuseforge_api_key") != null) {
+            curseforge {
+                token = project.hasProperty("cuseforge_api_key") ? project.property("cuseforge_api_key") : System.getenv("cuseforge_api_key")
+                id = "${project.curseforge_id}"
+                gameVersions.addAll "Java 17"
+            }
+        }
+
+        if (project.hasProperty("modrinth_api_key") || System.getenv("modrinth_api_key") != null) {
+            modrinth {
+                token = project.hasProperty("modrinth_api_key") ? project.property("modrinth_api_key") : System.getenv("modrinth_api_key")
+                id = "${project.modrinth_id}"
+            }
+        }
     }
 }
 

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -110,15 +110,54 @@ unifiedPublishing {
     project {
         displayName = "[Forge $rootProject.minecraft_version] $project.mod_name v$project.version"
         gameLoaders = ["forge"]
+        version = "$project.version"
+        releaseType = "release"
+        gameVersions = ["$project.minecraft_version"]
+
+        mainPublication tasks.remapJar
 
         relations {
+            depends {
+                curseforge = "architectury-api"
+                modrinth = "architectury-api"
+            }
+            optional {
+                curseforge = "cloth-config"
+                modrinth = "cloth-config"
+            }
+            if (cm_mod_compat_enabled.toBoolean()) {
+                optional {
+                    curseforge = "crimson-moon"
+                }
+            }
+            if (lunar_mod_compat_enabled.toBoolean()) {
+                optional {
+                    curseforge = "lunar"
+                    modrinth = "lunar"
+                }
+            }
             if (ec_mod_compat_enabled.toBoolean()) {
                 optional {
                     curseforge = "enhanced-celestials"
                     modrinth = "enhanced-celestials"
                 }
             }
         }
+
+        if (project.hasProperty("cuseforge_api_key") || System.getenv("cuseforge_api_key") != null) {
+            curseforge {
+                token = project.hasProperty("cuseforge_api_key") ? project.property("cuseforge_api_key") : System.getenv("cuseforge_api_key")
+                id = "${project.curseforge_id}"
+                gameVersions.addAll "Java 17"
+            }
+        }
+
+        if (project.hasProperty("modrinth_api_key") || System.getenv("modrinth_api_key") != null) {
+            modrinth {
+                token = project.hasProperty("modrinth_api_key") ? project.property("modrinth_api_key") : System.getenv("modrinth_api_key")
+                id = "${project.modrinth_id}"
+            }
+        }
     }
 }