diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 160f9b2..2df97a4 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -11,7 +11,7 @@ jobs: !contains(github.event.head_commit.message, '[ciskip]') uses: nanite/workflows/.github/workflows/standard-modmuss.yml@v1.1 with: - java-version: 17 + java-version: 21 changelog-file: "./CHANGELOG.md" release-to-github: false secrets: diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index c7b676f..1895fb5 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -13,5 +13,6 @@ jobs: secrets: nanite-token: ${{ secrets.NANITE_DEPLOY }} with: + java-version: 21 use-snapshots: true gradle-tasks: build publish \ No newline at end of file diff --git a/build.gradle b/build.gradle index 2a5ed85..264b33f 100644 --- a/build.gradle +++ b/build.gradle @@ -59,12 +59,6 @@ publishMods { modLoaders.add("fabric") } - def forgeOptions = publishOptions { - file = project.provider { project(":forge").tasks.remapJar }.flatMap { it.archiveFile } - displayName = "${project.name} Forge ${mod_version}+mc${minecraft_version}" - modLoaders.add("forge") - } - def neoOptions = publishOptions { file = project.provider { project(":neoforge").tasks.remapJar }.flatMap { it.archiveFile } displayName = "${project.name} NeoForged ${mod_version}+mc${minecraft_version}" @@ -90,10 +84,6 @@ publishMods { } } - curseforge("curseforgeForge") { - from(curseForgeOptions, forgeOptions) - } - curseforge("curseforgeNeo") { from(curseForgeOptions, neoOptions) } @@ -106,19 +96,14 @@ publishMods { } } - modrinth("modrinthForge") { - from(modrinthOptions, forgeOptions) - } - modrinth("modrinthNeo") { from(modrinthOptions, neoOptions) } } github { - file = project.provider { project(":forge").tasks.remapJar }.flatMap { it.archiveFile } + file = project.provider { project(":neoforge").tasks.remapJar }.flatMap { it.archiveFile } additionalFiles.from project.provider { project(":fabric").tasks.remapJar }.flatMap { it.archiveFile } - additionalFiles.from project.provider { project(":neoforge").tasks.remapJar }.flatMap { it.archiveFile } repository = "${github_repo}" accessToken = providers.environmentVariable("GITHUB_TOKEN") commitish = providers.environmentVariable("GITHUB_SHA").orElse("dryRun")