Mark publication

shedaniel · Oct 26, 2024 · 2f2be7e · 2f2be7e
2 parents ddb48e2 + 7dd3627
commit 2f2be7e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/curseforge.yml b/.github/workflows/curseforge.yml
@@ -20,6 +20,7 @@ on:
       - 14.x-1.20.4
       - 15.x-1.20.5
       - 16.x-1.21
+      - 17.x-1.21.2
 
 jobs:
   build:

diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -100,16 +100,17 @@ publishing {
                 publication.artifactId = rootProject.name + "-" + projectName + "-fabric"
                 project.afterEvaluate {
                     def project = project(":" + projectName)
-                    publication.artifact(project.fakeJar) { classifier null }
+                    def normalArtifact, sourceArtifact
+                    publication.artifact(project.fakeJar) { classifier null; normalArtifact = it }
                     def remapSourcesJarTask = project.remapSourcesJar
                     publication.artifact(remapSourcesJarTask) {
                         builtBy remapSourcesJarTask
                         classifier "sources"
+                        sourceArtifact = it
                     }
 
-                    // Hack to inherit the dependencies without inheriting the artifacts
-                    publication.setArtifacts(publication.artifacts)
                     from components.java
+                    publication.setArtifacts([normalArtifact, sourceArtifact])
                 }
             }
         }
@@ -120,7 +121,7 @@ unifiedPublishing {
     project {
         displayName = "[Fabric $rootProject.supported_version] v$project.version"
         releaseType = rootProject.unstable == "false" ? "release" : "alpha"
-        gameVersions = ["1.21.1"]
+        gameVersions = ["1.21.2", "1.21.3"]
         gameLoaders = ["fabric"]
         changelog = rootProject.releaseChangelog
 
@@ -145,7 +146,7 @@ unifiedPublishing {
             curseforge {
                 token = project.hasProperty("danielshe_curse_api_key") ? project.property("danielshe_curse_api_key") : System.getenv("danielshe_curse_api_key")
                 id = "310111"
-                gameVersions.addAll "Java 17", project.minecraft_version
+                gameVersions.addAll "Java 17"
             }
         }
 
@@ -154,7 +155,7 @@ unifiedPublishing {
                 token = project.hasProperty("modrinth_key") ? project.property("modrinth_key") : System.getenv("modrinth_key")
                 id = "nfn13YXA"
                 version = "$project.version+$project.name"
-                gameVersions.addAll project.minecraft_version
+//                gameVersions.addAll project.minecraft_version
             }
         }
     }

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -210,15 +210,16 @@ publishing {
                 project.afterEvaluate {
                     def project = project(":" + projectName)
                     remapSrg.inputFile = project.fakeForgeJar.archiveFile
-                    publication.artifact(remapSrg) { classifier null }
+                    def normalArtifact, sourceArtifact
+                    publication.artifact(remapSrg) { classifier null; normalArtifact = it }
                     publication.artifact(remapSrgSourcesJar) {
                         builtBy remapSrgSourcesJar
                         classifier "sources"
+                        sourceArtifact = it
                     }
 
-                    // Hack to inherit the dependencies without inheriting the artifacts
-                    publication.setArtifacts(publication.artifacts)
                     from components.java
+                    publication.setArtifacts([normalArtifact, sourceArtifact])
                 }
             }
         }

diff --git a/neoforge/build.gradle b/neoforge/build.gradle
@@ -147,15 +147,16 @@ publishing {
                 project.afterEvaluate {
                     def project = project(":" + projectName)
                     remapMojang.inputFile = project.fakeForgeJar.archiveFile
-                    publication.artifact(remapMojang) { classifier null }
+                    def normalArtifact, sourceArtifact
+                    publication.artifact(remapMojang) { classifier null; normalArtifact = it }
                     publication.artifact(remapMojangSourcesJar) {
                         builtBy remapMojangSourcesJar
                         classifier "sources"
+                        sourceArtifact = it
                     }
 
-                    // Hack to inherit the dependencies without inheriting the artifacts
-                    publication.setArtifacts(publication.artifacts)
                     from components.java
+                    publication.setArtifacts([normalArtifact, sourceArtifact])
                 }
             }
         }
@@ -167,7 +168,7 @@ unifiedPublishing {
     project {
         displayName = "[NeoForge $rootProject.supported_version] v$project.version"
         releaseType = "beta"
-        gameVersions = ["1.21.1"]
+        gameVersions = ["1.21.2", "1.21.3"]
         gameLoaders = ["neoforge"]
         changelog = rootProject.releaseChangelog
 
@@ -189,7 +190,6 @@ unifiedPublishing {
                 token = project.hasProperty("danielshe_curse_api_key") ? project.property("danielshe_curse_api_key") : System.getenv("danielshe_curse_api_key")
                 id = "310111"
                 gameVersions.addAll "Java 17"
-                gameVersions.addAll project.minecraft_version
 
                 relations {
                     depends "roughly-enough-items-hacks"
@@ -202,14 +202,13 @@ unifiedPublishing {
                 token = project.hasProperty("modrinth_key") ? project.property("modrinth_key") : System.getenv("modrinth_key")
                 id = "nfn13YXA"
                 version = "$project.version+$project.name"
-                gameVersions.addAll project.minecraft_version
             }
         }
     }
     project {
         displayName = "[NeoForge $rootProject.supported_version] v$project.version"
         releaseType = "release"
-        gameVersions = ["1.21.1"]
+        gameVersions = ["1.21.2", "1.21.3"]
         gameLoaders = ["neoforge"]
         changelog = rootProject.releaseChangelog
 
@@ -231,7 +230,6 @@ unifiedPublishing {
                 token = project.hasProperty("danielshe_curse_api_key") ? project.property("danielshe_curse_api_key") : System.getenv("danielshe_curse_api_key")
                 id = "567899"
                 gameVersions.addAll "Java 17"
-                gameVersions.addAll project.minecraft_version
             }
         }
 
@@ -241,7 +239,6 @@ unifiedPublishing {
                 token = project.hasProperty("modrinth_key") ? project.property("modrinth_key") : System.getenv("modrinth_key")
                 id = "OM4ZYSws"
                 version = "$project.version+$project.name"
-                gameVersions.addAll project.minecraft_version
             }
         }
     }