diff --git a/CHANGELOG.md b/CHANGELOG.md index ea847d6..3bbcd10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,16 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [0.20.1] - 2025-01-28 + +### Added + +- Sources JAR is now created and published. + +### Changed + +- Updated dependencies. + ## [0.20.0] - 2024-11-24 ### Changed @@ -396,7 +406,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.20.0...HEAD +[Unreleased]: https://github.com/refinedmods/refinedarchitect/compare/v0.20.1...HEAD + +[0.20.1]: https://github.com/refinedmods/refinedarchitect/compare/v0.20.0...v0.20.1 [0.20.0]: https://github.com/refinedmods/refinedarchitect/compare/v0.19.1...v0.20.0 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9355b41..94113f2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/refinedarchitect-plugin/build.gradle.kts b/refinedarchitect-plugin/build.gradle.kts index ff2b761..b93bf4a 100644 --- a/refinedarchitect-plugin/build.gradle.kts +++ b/refinedarchitect-plugin/build.gradle.kts @@ -25,12 +25,16 @@ repositories { } dependencies { - implementation("net.neoforged:moddev-gradle:2.0.47-beta") - implementation("fabric-loom:fabric-loom.gradle.plugin:1.8.12") - implementation("gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:1.1.8") + // See: https://projects.neoforged.net/neoforged/ModDevGradle + implementation("net.neoforged:moddev-gradle:2.0.76") + // See: https://mvnrepository.com/artifact/fabric-loom/fabric-loom.gradle.plugin + implementation("fabric-loom:fabric-loom.gradle.plugin:1.9.2") + // See: https://github.com/neoforged/ModDevGradle/blob/main/build.gradle + implementation("gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:1.1.9") implementation("info.solidsoft.gradle.pitest:gradle-pitest-plugin:1.15.0") implementation("org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.4.1.3373") - implementation("me.modmuss50:mod-publish-plugin:0.8.0") + // See: https://github.com/modmuss50/mod-publish-plugin + implementation("me.modmuss50:mod-publish-plugin:0.8.4") } publishing { diff --git a/refinedarchitect-plugin/src/main/kotlin/CommonExtension.kt b/refinedarchitect-plugin/src/main/kotlin/CommonExtension.kt index fd85c6a..d85b16b 100644 --- a/refinedarchitect-plugin/src/main/kotlin/CommonExtension.kt +++ b/refinedarchitect-plugin/src/main/kotlin/CommonExtension.kt @@ -7,7 +7,7 @@ import org.gradle.kotlin.dsl.getByType open class CommonExtension(private val project: Project) : BaseExtension(project) { fun common() { project.extensions.getByType().apply { - neoFormVersion.set(nfVersion) + setNeoFormVersion(nfVersion) val sourceSets = project.extensions.getByType().sourceSets addModdingDependenciesTo(sourceSets["test"]) parchment { diff --git a/refinedarchitect-plugin/src/main/kotlin/NeoForgeExtension.kt b/refinedarchitect-plugin/src/main/kotlin/NeoForgeExtension.kt index e9319e2..25f714e 100644 --- a/refinedarchitect-plugin/src/main/kotlin/NeoForgeExtension.kt +++ b/refinedarchitect-plugin/src/main/kotlin/NeoForgeExtension.kt @@ -28,7 +28,7 @@ open class NeoForgeExtension(private val project: Project) : BaseExtension(proje sourceSets["main"].resources.srcDir(generateModMetadata) sourceSets["main"].resources.srcDirs.add(project.file("src/generated/resources")) project.extensions.getByType().apply { - version.set(neoForgeVersion) + setVersion(neoForgeVersion) addModdingDependenciesTo(sourceSets["test"]) if (modId != null) { mods { diff --git a/refinedarchitect-plugin/src/main/kotlin/refinedarchitect.gradle.kts b/refinedarchitect-plugin/src/main/kotlin/refinedarchitect.gradle.kts index 21193e7..e368a47 100644 --- a/refinedarchitect-plugin/src/main/kotlin/refinedarchitect.gradle.kts +++ b/refinedarchitect-plugin/src/main/kotlin/refinedarchitect.gradle.kts @@ -34,6 +34,7 @@ java { toolchain { languageVersion = JavaLanguageVersion.of(javaVersion) } + withSourcesJar() } dependencies { diff --git a/refinedarchitect-plugin/src/main/kotlin/versions.kt b/refinedarchitect-plugin/src/main/kotlin/versions.kt index d47c13a..051f600 100644 --- a/refinedarchitect-plugin/src/main/kotlin/versions.kt +++ b/refinedarchitect-plugin/src/main/kotlin/versions.kt @@ -1,11 +1,12 @@ const val mcVersion = "1.21.1" -const val parchmentMcVersion = "1.21" +const val parchmentMcVersion = "1.21.1" // See: https://projects.neoforged.net/neoforged/neoforge -const val neoForgeVersion = "21.1.80" +const val neoForgeVersion = "21.1.115" // See: https://fabricmc.net/develop/ -const val fabricLoaderVersion = "0.16.9" -const val fabricApiVersion = "0.109.0+1.21.1" -const val parchmentVersion = "2024.11.10" +const val fabricLoaderVersion = "0.16.10" +const val fabricApiVersion = "0.115.0+1.21.1" +// See: https://parchmentmc.org/docs/getting-started +const val parchmentVersion = "2024.11.17" // See: https://projects.neoforged.net/neoforged/neoform const val nfVersion = "1.21.1-20240808.144430" const val javaVersion = 21 \ No newline at end of file diff --git a/refinedarchitect-versioning/build.gradle.kts b/refinedarchitect-versioning/build.gradle.kts index 61d744b..9c62d1c 100644 --- a/refinedarchitect-versioning/build.gradle.kts +++ b/refinedarchitect-versioning/build.gradle.kts @@ -5,37 +5,42 @@ plugins { catalog { versionCatalog { - // https://launchermeta.mojang.com/mc/game/version_manifest_v2.json + // See: https://launchermeta.mojang.com/mc/game/version_manifest_v2.json val slf4j = version("slf4j", "2.0.9") library("slf4j-api", "org.slf4j", "slf4j-api").versionRef(slf4j) library("slf4j-impl", "org.slf4j", "slf4j-simple").versionRef(slf4j) + // See: https://mvnrepository.com/artifact/org.apiguardian/apiguardian-api val apiGuardian = version("apiGuardian", "1.1.2") library("apiguardian", "org.apiguardian", "apiguardian-api").versionRef(apiGuardian) - val junit5 = version("junit5", "5.11.3") + // See: https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api + val junit5 = version("junit5", "5.11.4") library("junit-api", "org.junit.jupiter", "junit-jupiter-api").versionRef(junit5) library("junit-engine", "org.junit.jupiter", "junit-jupiter-engine").versionRef(junit5) library("junit-params", "org.junit.jupiter", "junit-jupiter-params").versionRef(junit5) - val assertJ = version("assertJ", "3.26.3") + // See: https://mvnrepository.com/artifact/org.assertj/assertj-core + val assertJ = version("assertJ", "3.27.3") library("assertj", "org.assertj", "assertj-core").versionRef(assertJ) - val mockito = version("mockito", "5.14.2") + // See: https://mvnrepository.com/artifact/org.mockito/mockito-core + val mockito = version("mockito", "5.15.2") library("mockito", "org.mockito", "mockito-core").versionRef(mockito) - val equalsVerifier = version("equalsverifier", "3.17.3") + // See: https://mvnrepository.com/artifact/nl.jqno.equalsverifier/equalsverifier + val equalsVerifier = version("equalsverifier", "3.18.1") library("equalsverifier", "nl.jqno.equalsverifier", "equalsverifier").versionRef(equalsVerifier) - // https://www.curseforge.com/minecraft/mc-mods/cloth-config/files + // See: https://www.curseforge.com/minecraft/mc-mods/cloth-config/files val clothConfig = version("cloth-config-fabric", "15.0.140") library("cloth-config", "me.shedaniel.cloth", "cloth-config-fabric").versionRef(clothConfig) - // https://github.com/TechReborn/Energy (https://maven.fabricmc.net/teamreborn/energy/) + // See: https://github.com/TechReborn/Energy (https://maven.fabricmc.net/teamreborn/energy/) val energy = version("teamreborn-energy", "4.1.0") library("teamreborn-energy", "teamreborn", "energy").versionRef(energy) - // https://modrinth.com/mod/modmenu + // See: https://modrinth.com/mod/modmenu val modmenu = version("modmenu", "11.0.3") library("modmenu", "com.terraformersmc", "modmenu").versionRef(modmenu) }