From 32ee6fdd3ed61c4e4c449e48aaf4281fee5342ec Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Thu, 8 Aug 2024 20:07:03 +0200 Subject: [PATCH 1/4] fix: javadoc failing to generate --- CHANGELOG.md | 4 ++++ .../src/main/kotlin/refinedarchitect.root.gradle.kts | 3 +++ 2 files changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c416f1..f41cbd6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Fixed + +- Javadoc failing to generate. + ## [0.16.9] - 2024-07-25 ### Fixed diff --git a/refinedarchitect-plugin/src/main/kotlin/refinedarchitect.root.gradle.kts b/refinedarchitect-plugin/src/main/kotlin/refinedarchitect.root.gradle.kts index 2a2b84e..cc61237 100644 --- a/refinedarchitect-plugin/src/main/kotlin/refinedarchitect.root.gradle.kts +++ b/refinedarchitect-plugin/src/main/kotlin/refinedarchitect.root.gradle.kts @@ -7,6 +7,9 @@ plugins { tasks.register("javadocAggregate") { val projects = allprojects.filter { it.extra.has("refinedarchitect_javadoc") } + projects.forEach { + dependsOn(it.tasks.getByName("assemble")) + } source(projects.flatMap { it.sourceSets["main"].allJava }) classpath = files(projects.flatMap { it.sourceSets["main"].compileClasspath }) setDestinationDir(file("build/docs/javadoc")) From 16ab8de79ef3ec205f7e7629c12a21487f7ed1db Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Thu, 8 Aug 2024 20:08:02 +0200 Subject: [PATCH 2/4] fix: mastodon announce being broken --- .github/workflows/publish-release.yml | 13 ------------- CHANGELOG.md | 1 + 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index a70b0a9..6aded04 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -198,19 +198,6 @@ jobs: env: DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} - announce-mastodon: - name: Announce to Mastodon - runs-on: ubuntu-latest - needs: [ deploy-github-releases, extract-version-number ] - if: ${{ inputs.announce == true }} - steps: - - name: Announce to Mastodon - uses: rzr/fediverse-action@8506cb8a3052fd34b0d93a244888a81c233abf88 - with: - access-token: ${{ secrets.MASTODON_TOKEN }} - host: 'anvil.social' - message: "${{ inputs.project-name }} v${{ needs.extract-version-number.outputs.version }} has been released! ${{ needs.deploy-github-releases.outputs.release-url }}" - sync-develop: name: Sync develop runs-on: ubuntu-latest diff --git a/CHANGELOG.md b/CHANGELOG.md index f41cbd6..5c1c053 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ### Fixed - Javadoc failing to generate. +- Mastodon announcements have been removed as anvil.social is no longer online. ## [0.16.9] - 2024-07-25 From d67953690e03ba41f94d0446953df9cecb3302e9 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Thu, 8 Aug 2024 20:45:22 +0200 Subject: [PATCH 3/4] fix: upgrade neoforge and fabric --- CHANGELOG.md | 4 ++++ refinedarchitect-plugin/build.gradle.kts | 2 +- .../src/main/kotlin/FabricExtension.kt | 2 +- refinedarchitect-plugin/src/main/kotlin/versions.kt | 13 +++++++------ 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c1c053..efecab3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Changed + +- Updated NeoForge and Fabric to Minecraft 1.21.1. + ### Fixed - Javadoc failing to generate. diff --git a/refinedarchitect-plugin/build.gradle.kts b/refinedarchitect-plugin/build.gradle.kts index fb3ed8a..cc4c7c4 100644 --- a/refinedarchitect-plugin/build.gradle.kts +++ b/refinedarchitect-plugin/build.gradle.kts @@ -25,7 +25,7 @@ repositories { } dependencies { - implementation("net.neoforged:moddev-gradle:0.1.122") + implementation("net.neoforged:moddev-gradle:2.0.5-beta") implementation("fabric-loom:fabric-loom.gradle.plugin:1.7-SNAPSHOT") implementation("gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:1.1.8") implementation("info.solidsoft.gradle.pitest:gradle-pitest-plugin:1.15.0") diff --git a/refinedarchitect-plugin/src/main/kotlin/FabricExtension.kt b/refinedarchitect-plugin/src/main/kotlin/FabricExtension.kt index ab9b339..24de9ad 100644 --- a/refinedarchitect-plugin/src/main/kotlin/FabricExtension.kt +++ b/refinedarchitect-plugin/src/main/kotlin/FabricExtension.kt @@ -15,7 +15,7 @@ open class FabricExtension(private val project: Project) : BaseExtension(project project.dependencies.add("minecraft", "com.mojang:minecraft:${mcVersion}") project.dependencies.add("mappings", project.extensions.getByType().layered() { officialMojangMappings() - parchment("org.parchmentmc.data:parchment-${mcVersion}:${parchmentVersion}@zip") + parchment("org.parchmentmc.data:parchment-${parchmentMcVersion}:${parchmentVersion}@zip") }) project.dependencies.add("modImplementation", "net.fabricmc:fabric-loader:${fabricLoaderVersion}") project.dependencies.add("modImplementation", "net.fabricmc.fabric-api:fabric-api:${fabricApiVersion}") diff --git a/refinedarchitect-plugin/src/main/kotlin/versions.kt b/refinedarchitect-plugin/src/main/kotlin/versions.kt index 63e8d5b..5fe636e 100644 --- a/refinedarchitect-plugin/src/main/kotlin/versions.kt +++ b/refinedarchitect-plugin/src/main/kotlin/versions.kt @@ -1,9 +1,10 @@ -const val mcVersion = "1.21" +const val mcVersion = "1.21.1" +const val parchmentMcVersion = "1.21" // See: https://projects.neoforged.net/neoforged/neoforge -const val neoForgeVersion = "21.0.112-beta" -const val fabricLoaderVersion = "0.15.11" -const val fabricApiVersion = "0.100.4+1.21" -const val parchmentVersion = "2024.07.07" +const val neoForgeVersion = "21.1.1" +const val fabricLoaderVersion = "0.16.0" +const val fabricApiVersion = "0.102.0+1.21.1" +const val parchmentVersion = "2024.07.28" // See: https://projects.neoforged.net/neoforged/neoform -const val nfVersion = "1.21-20240613.152323" +const val nfVersion = "1.21.1-20240808.144430" const val javaVersion = 21 \ No newline at end of file From 9a966841c3536684502f3051622c1c7687df0928 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Thu, 8 Aug 2024 18:46:11 +0000 Subject: [PATCH 4/4] chore: prepare release v0.17.0 --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index efecab3..de90f70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [0.17.0] - 2024-08-08 + ### Changed - Updated NeoForge and Fabric to Minecraft 1.21.1. @@ -360,7 +362,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). - Gradle helpers for Fabric and Forge projects. - CI workflows. -[Unreleased]: https://github.com/refinedmods/refinedarchitect/compare/v0.16.9...HEAD +[Unreleased]: https://github.com/refinedmods/refinedarchitect/compare/v0.17.0...HEAD + +[0.17.0]: https://github.com/refinedmods/refinedarchitect/compare/v0.16.9...v0.17.0 [0.16.9]: https://github.com/refinedmods/refinedarchitect/compare/v0.16.8...v0.16.9