Update build script

nanite · Aug 3, 2023 · 4b1a58d · 4b1a58d
1 parent 2cea3d4
commit 4b1a58d
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 31 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,4 +17,5 @@ jobs:
     secrets:
       nanite-token: ${{ secrets.NANITE_DEPLOY }}
       curse-token: ${{ secrets.CURSE_DEPLOY }}
-      github-token: ${{ secrets.GITHUB_TOKEN }}
+      github-token: ${{ secrets.GITHUB_TOKEN }}
+      modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'fabric-loom' version '1.3-SNAPSHOT' apply(false)
     id 'net.minecraftforge.gradle' version '[6.0,6.2)' apply(false)
     id "org.spongepowered.mixin" version "${mixin_version}" apply(false)
-    id "me.modmuss50.mod-publish-plugin" version "0.2.1"
+    id "me.modmuss50.mod-publish-plugin" version "0.3.0"
 }
 
 ext.isSnapshot = providers.environmentVariable("SNAPSHOT").map {it == "true"}.getOrElse(false)
@@ -76,7 +76,7 @@ subprojects {
         repositories {
             if (providers.environmentVariable("NANITE_TOKEN").orNull) {
                 maven {
-                    url "${nanite_maven_url}${isSnapshot ? 'snapshots' : 'releases'}"
+                    url "${maven_url}${isSnapshot ? 'snapshots' : 'releases'}"
                     credentials {
                         username = "nanite"
                         password = providers.environmentVariable("NANITE_TOKEN").get()
@@ -90,46 +90,62 @@ subprojects {
 publishMods {
     dryRun = providers.environmentVariable("CURSE_TOKEN").getOrNull() == null
     changelog = file("./CHANGELOG.md").text
+    version = "${mod_version}"
     type = STABLE
 
-    def options = curseforgeOptions {
-        projectId = "${curseforge_id}"
-        accessToken = providers.environmentVariable("CURSE_TOKEN")
-        minecraftVersions.add("${minecraft_version}")
+    def fabricOptions = publishOptions {
+        file = project.provider { project(":fabric").tasks.remapJar }.flatMap { it.archiveFile }
+        displayName = "${project.name} Fabric ${mod_version}+mc${minecraft_version}"
+        modLoaders.add("fabric")
     }
-    curseforge("curseforgeForge") {
-        from options
-        displayName = "${project.name} Forge ${mod_version}+mc${minecraft_version}"
+
+    def forgeOptions = publishOptions {
         file = project.provider { project(":forge").tasks.jar }.flatMap { it.archiveFile }
+        displayName = "${project.name} Forge ${mod_version}+mc${minecraft_version}"
         modLoaders.add("forge")
-        modLoaders.add("Java 17")
     }
 
-    curseforge("curseforgeFabric") {
-        from options
-        displayName = "${project.name} Fabric ${mod_version}+mc${minecraft_version}"
-        file = project.provider { project(":fabric").tasks.remapJar }.flatMap { it.archiveFile }
-        modLoaders.add("fabric")
-        modLoaders.add("Java 17")
+    def curseForgeOptions = curseforgeOptions {
+        accessToken = providers.environmentVariable("CURSE_TOKEN")
+        projectId = "${curseforge_id}"
+        minecraftVersions.add("${minecraft_version}")
+    }
+
+    def modrinthOptions = modrinthOptions {
+        accessToken = providers.environmentVariable("MODRINTH_TOKEN")
+        projectId = "${modrinth_id}"
+        minecraftVersions.add("${minecraft_version}")
+    }
 
+    curseforge("curseforgeFabric") {
+        from(curseForgeOptions, fabricOptions)
         requires {
             slug = "fabric-api"
         }
+    }
 
+    curseforge("curseforgeForge") {
+        from(curseForgeOptions, forgeOptions)
     }
 
-//    Todo: WILL ADD MODRINTH ONCE THEY FIX THEIR OVERREACHING TOS
-//        modrinth {
-//            projectId = "abcdef"
-//            accessToken = providers.environmentVariable("MODRINTH_TOKEN")
-//            minecraftVersions.add("1.20.1")
-//        }
+    if (providers.environmentVariable("MODRINTH_TOKEN").getOrNull() != null) {
+        modrinth("modrinthFabric") {
+            from(modrinthOptions, fabricOptions)
+            requires {
+                slug = "fabric-api"
+            }
+        }
 
-        github {
-            file = project.provider { project(":forge").tasks.jar }.flatMap { it.archiveFile }
-            additionalFiles.from project.provider { project(":fabric").tasks.remapJar }.flatMap { it.archiveFile }
-            repository = "${github_repo}"
-            accessToken = providers.environmentVariable("GITHUB_TOKEN")
-            commitish = providers.environmentVariable("GITHUB_SHA").orElse("dryRun")
+        modrinth("modrinthForge") {
+            from(modrinthOptions, forgeOptions)
         }
+    }
+
+    github {
+        file = project.provider { project(":forge").tasks.jar }.flatMap { it.archiveFile }
+        additionalFiles.from project.provider { project(":fabric").tasks.remapJar }.flatMap { it.archiveFile }
+        repository = "${github_repo}"
+        accessToken = providers.environmentVariable("GITHUB_TOKEN")
+        commitish = providers.environmentVariable("GITHUB_SHA").orElse("dryRun")
+    }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 # Project
-mod_version=4.0.2
+mod_version=4.0.3
 group=dev.wuffs.bcc
 
 # Common
@@ -21,7 +21,7 @@ mod_id=bcc
 curseforge_id=551894
 modrinth_id=KJhXPbHQ
 github_repo=nanite/BetterCompatibilityChecker
-nanite_maven_url=https://maven.nanite.dev/
+maven_url=https://maven.nanite.dev/
 
 # Other
 mixin_version=0.7.+