build: Deprecation fixes for Gradle 9.7.0

This commit is contained in:
2026-08-23 10:19:55 +02:00
parent b0819871e0
commit c6ce916e75
66 changed files with 235 additions and 99 deletions
+1 -1
View File
@@ -4,4 +4,4 @@ plugins {
}
group = "de.siphalor.tweed5.minecraft"
version = project.property("tweed5.version").toString()
version = rootProperties["tweed5.version"].get()
@@ -3,13 +3,12 @@ import de.siphalor.tweed5.gradle.plugin.minecraft.mod.MinecraftModded
import net.fabricmc.loom.api.LoomGradleExtensionAPI
import net.fabricmc.loom.task.RemapJarTask
import net.fabricmc.loom.util.Constants
import java.nio.file.Files
import java.nio.file.StandardCopyOption
import java.util.Properties
plugins {
java
id("de.siphalor.minecraft-modding-toolkit.project-plugin")
id("de.siphalor.tweed5.root-properties")
id("de.siphalor.tweed5.unit-tests")
id("de.siphalor.tweed5.publishing")
id("de.siphalor.tweed5.expanded-sources-jar")
@@ -40,11 +39,11 @@ val archivesBaseName = "${project.name}-mc$minecraftVersionDescriptor"
base {
archivesName.set(archivesBaseName)
}
val shortVersion = project.property("tweed5.version").toString()
val shortVersion = rootProperties["tweed5.version"].get()
val minecraftVersion = getMcCatalogVersion("minecraft")
version = "$shortVersion+mc$minecraftVersion"
val testmod by sourceSets.creating {
val testmod = sourceSets.create("testmod") {
compileClasspath += sourceSets.main.get().compileClasspath
runtimeClasspath += sourceSets.main.get().runtimeClasspath
}
@@ -56,10 +55,12 @@ smcmtk {
extensions.configure<LoomGradleExtensionAPI>() {
runs {
create("testmodClient") {
client()
name("${properties["module.name"]} Test Mod (client)")
source(testmod)
afterEvaluate {
register("testmodClient") {
client()
name("${moduleInfo.name.get()} Test Mod (client)")
source(testmod)
}
}
}
}
@@ -2,6 +2,11 @@ plugins {
id("de.siphalor.tweed5.minecraft.mod.bundle")
}
moduleInfo {
name = "Tweed 5 Bundle for POJO weaving"
description = "Bundle of pre-packaged Tweed modules for creating configs from POJOs."
}
dependencies {
minecraftJij("de.siphalor.tweed5:tweed5-annotation-inheritance:${project.version}")
minecraftJij("de.siphalor.tweed5:tweed5-naming-format:${project.version}")
@@ -1,2 +0,0 @@
module.name = Tweed 5 Bundle for POJO weaving
module.description = Bundle of pre-packaged Tweed modules for creating configs from POJOs.
+5
View File
@@ -2,6 +2,11 @@ plugins {
id("de.siphalor.tweed5.minecraft.mod.bundle")
}
moduleInfo {
name = "Tweed 5 Bundle"
description = "Bundle of pre-packaged Tweed modules that are usually required for your Minecraft mod config needs."
}
dependencies {
minecraftJij("de.siphalor.tweed5:tweed5-attributes-extension:${project.version}")
minecraftJij("de.siphalor.tweed5:tweed5-construct:${project.version}")
@@ -1,3 +0,0 @@
module.name = Tweed 5 Bundle
module.description = Bundle of pre-packaged Tweed modules \
that are usually required for your Minecraft mod config needs.
@@ -3,6 +3,11 @@ plugins {
id("de.siphalor.tweed5.minecraft.mod.cross-version")
}
moduleInfo {
name = "Tweed 5 Coat Bridge"
description = "Provides a system that allows to generate a Coat config screen for a Tweed config."
}
dependencies {
compileOnly("de.siphalor.tweed5:tweed5-core")
compileOnly("de.siphalor.tweed5:tweed5-attributes-extension")
@@ -1,2 +0,0 @@
module.name = Tweed 5 Coat Bridge
module.description = Provides a system that allows to generate a Coat config screen for a Tweed config.
@@ -3,6 +3,11 @@ plugins {
id("de.siphalor.tweed5.minecraft.mod.cross-version")
}
moduleInfo {
name = "Tweed 5 Fabric Helper"
description = "A collection of utility classes to make working with Tweed 5 configurations easier on Fabric."
}
dependencies {
modCompileOnly(fabricApi.module("fabric-networking-api-v1", mcLibs.versions.fabric.api.get()))
compileOnly("de.siphalor.tweed5:tweed5-comment-loader-extension")
@@ -1,2 +0,0 @@
module.name = Tweed 5 Fabric Helper
module.description = A collection of utility classes to make working with Tweed 5 configurations easier on Fabric.
+1 -1
View File
@@ -1,4 +1,4 @@
org.gradle.jvmargs = -Xmx2G
org.gradle.configuration-cache = true
minecraft.version.descriptor = 26.2.0
minecraft.version.descriptor = 1.16.5
@@ -2,6 +2,12 @@ plugins {
id("de.siphalor.tweed5.minecraft.mod.dummy")
}
moduleInfo {
name = "Tweed 5 Logging"
description = """Fork and relocation of Apache Commons Logging.
Contains a small fix to support older Log4j versions. Also removes some obsolete classes."""
}
val vendoredCommonsLogging = project.layout.settingsDirectory.file("vendor/commons-logging").asFile
dependencies {
@@ -1,4 +0,0 @@
module.name = Tweed 5 Logging
module.description = Fork and relocation of Apache Commons Logging.\n\
Contains a small fix to support older Log4j versions. \
Also removes some obsolete classes.
@@ -3,6 +3,11 @@ plugins {
id("de.siphalor.tweed5.minecraft.mod.cross-version")
}
moduleInfo {
name = "Tweed 5 Netwoking"
description = "Minecraft networking support for Tweed 5"
}
dependencies {
modCompileOnly(fabricApi.module("fabric-networking-api-v1", mcLibs.versions.fabric.api.get()))
compileOnly("de.siphalor.tweed5:tweed5-core")
@@ -1,2 +0,0 @@
module.name = Tweed 5 Netwoking
module.description = Minecraft networking support for Tweed 5