Update gradle for 26.1
Signed-off-by: Username404-59 <w.iron.zombie@gmail.com>
This commit is contained in:
parent
968b184cbe
commit
9116e6c3d1
@ -15,11 +15,11 @@ buildscript {
|
|||||||
}
|
}
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
kotlin("jvm") version "2.3.0"
|
kotlin("jvm") version "2.3.10"
|
||||||
kotlin("plugin.serialization") version "2.3.0"
|
kotlin("plugin.serialization") version "2.3.10"
|
||||||
id("com.github.johnrengelman.shadow") version "8.1.1" apply false
|
id("com.github.johnrengelman.shadow") version "8.1.1" apply false
|
||||||
id("architectury-plugin") version "[3.4.160, 3.5["
|
id("architectury-plugin") version "[3.5.166, 3.6["
|
||||||
id("dev.architectury.loom") version "[1.13.464, 1.14[" apply false
|
id("dev.architectury.loom-no-remap") version "[1.14.473, 1.15[" apply false
|
||||||
id("com.github.ben-manes.versions") version "0.51.0"
|
id("com.github.ben-manes.versions") version "0.51.0"
|
||||||
id("net.kyori.indra.git") version "3.1.3"
|
id("net.kyori.indra.git") version "3.1.3"
|
||||||
id("org.cqfn.diktat.diktat-gradle-plugin") version "1.2.5"
|
id("org.cqfn.diktat.diktat-gradle-plugin") version "1.2.5"
|
||||||
@ -30,7 +30,7 @@ group = "fr.username404"
|
|||||||
version = "0.4.2"
|
version = "0.4.2"
|
||||||
val groupAndName = "${rootProject.group}.${rootProject.name.lowercase()}"
|
val groupAndName = "${rootProject.group}.${rootProject.name.lowercase()}"
|
||||||
|
|
||||||
val javaVer: String = "21"
|
val javaVer: String = "25"
|
||||||
val sourceJavaVer: String = javaVer
|
val sourceJavaVer: String = javaVer
|
||||||
val kotlinVer: String by rootProject
|
val kotlinVer: String by rootProject
|
||||||
val kotlinSplitVersion = kotlinVer.split('.')
|
val kotlinSplitVersion = kotlinVer.split('.')
|
||||||
@ -50,22 +50,17 @@ subprojects {
|
|||||||
ignoreFailures = true
|
ignoreFailures = true
|
||||||
}
|
}
|
||||||
lateinit var mappingsDep: Dependency
|
lateinit var mappingsDep: Dependency
|
||||||
apply(plugin = "dev.architectury.loom")
|
apply(plugin = "dev.architectury.loom-no-remap")
|
||||||
apply(plugin = "org.jetbrains.kotlin.plugin.serialization")
|
apply(plugin = "org.jetbrains.kotlin.plugin.serialization")
|
||||||
extensions.configure<LoomGradleExtension>("loom") {
|
extensions.configure<LoomGradleExtension>("loom") {
|
||||||
if (this@subprojects.project.name != "common") {
|
if (this@subprojects.project.name != "common") {
|
||||||
accessWidenerPath.set(project(":common").extensions.getByType<LoomGradleExtensionAPI>().accessWidenerPath)
|
accessWidenerPath.set(project(":common").extensions.getByType<LoomGradleExtensionAPI>().accessWidenerPath)
|
||||||
}
|
}
|
||||||
mappingsDep = layered {
|
|
||||||
silentMojangMappingsLicense()
|
|
||||||
officialMojangMappings().parchment("org.parchmentmc.data:parchment-1.21.11:2025.12.20")
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
apply(plugin = "com.github.johnrengelman.shadow")
|
apply(plugin = "com.github.johnrengelman.shadow")
|
||||||
val shadowC by configurations.creating
|
val shadowC by configurations.creating
|
||||||
repositories {
|
repositories {
|
||||||
maven(url = "https://jitpack.io"); mavenCentral()
|
maven(url = "https://jitpack.io"); mavenCentral()
|
||||||
maven(url = "https://maven.parchmentmc.org")
|
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation("$kotlinX:kotlinx-coroutines-jdk8:${rootProject.property("kotlin_coroutines_version")}")
|
implementation("$kotlinX:kotlinx-coroutines-jdk8:${rootProject.property("kotlin_coroutines_version")}")
|
||||||
@ -77,7 +72,6 @@ subprojects {
|
|||||||
"com.github.Vatuu:discord-rpc:1.6.2"
|
"com.github.Vatuu:discord-rpc:1.6.2"
|
||||||
).forEach { implementation(it); shadowC(it) { isTransitive = false; exclude("com.sun.jna") } }
|
).forEach { implementation(it); shadowC(it) { isTransitive = false; exclude("com.sun.jna") } }
|
||||||
"minecraft"("com.mojang:minecraft:${rootProject.property("minecraft")}")
|
"minecraft"("com.mojang:minecraft:${rootProject.property("minecraft")}")
|
||||||
"mappings"(mappingsDep)
|
|
||||||
}
|
}
|
||||||
apply(plugin = "com.modrinth.minotaur")
|
apply(plugin = "com.modrinth.minotaur")
|
||||||
extensions.configure<ModrinthExtension>("modrinth") {
|
extensions.configure<ModrinthExtension>("modrinth") {
|
||||||
@ -163,19 +157,6 @@ subprojects {
|
|||||||
overloadaggressively()
|
overloadaggressively()
|
||||||
mergeinterfacesaggressively()
|
mergeinterfacesaggressively()
|
||||||
}
|
}
|
||||||
withType(net.fabricmc.loom.task.RemapJarTask::class) {
|
|
||||||
if (!devBuild) {
|
|
||||||
dependsOn(shrinkJar)
|
|
||||||
val shrinkedJar = shrinkJar.get().outJarFileCollection.singleFile
|
|
||||||
inputFile.set(shrinkedJar)
|
|
||||||
} else inputFile.set(shadowJar.archiveFile)
|
|
||||||
archiveBaseName.set(shadowJar.archiveBaseName)
|
|
||||||
archiveVersion.set("[${rootProject.version}+$minecraftVersion]")
|
|
||||||
archiveClassifier.set(this@subprojects.name)
|
|
||||||
if (this@subprojects.name.contains("forge"))
|
|
||||||
atAccessWideners.set(listOf("${rootProject.name.lowercase()}.accessWidener"))
|
|
||||||
if (!archiveFileName.get().contains("common")) destinationDirectory.set(file("$rootDir/remappedJars"))
|
|
||||||
}
|
|
||||||
getByName("modrinth").dependsOn(build)
|
getByName("modrinth").dependsOn(build)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
architectury { common("fabric", "neoforge"); injectInjectables = true }
|
architectury { common("fabric", "neoforge"); injectInjectables = true }
|
||||||
dependencies {
|
dependencies {
|
||||||
modImplementation("net.fabricmc:fabric-loader:${rootProject.property("fabric_loader_version")}")
|
implementation("net.fabricmc:fabric-loader:${rootProject.property("fabric_loader_version")}")
|
||||||
modImplementation("me.shedaniel.cloth:cloth-config:${rootProject.property("clothconfig_version")}") {
|
implementation("me.shedaniel.cloth:cloth-config:${rootProject.property("clothconfig_version")}") {
|
||||||
exclude(module = "fabric-api")
|
exclude(module = "fabric-api")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
accessWidener v2 named
|
accessWidener v2 official
|
||||||
|
|
||||||
accessible field net/minecraft/client/OptionInstance value Ljava/lang/Object;
|
accessible field net/minecraft/client/OptionInstance value Ljava/lang/Object;
|
||||||
mutable field net/minecraft/client/OptionInstance value Ljava/lang/Object;
|
mutable field net/minecraft/client/OptionInstance value Ljava/lang/Object;
|
||||||
|
|||||||
@ -13,17 +13,17 @@ object Groups {
|
|||||||
architectury { platformSetupLoomIde(); fabric() }
|
architectury { platformSetupLoomIde(); fabric() }
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
modImplementation("${Groups.Fabric}:fabric-loader:${rootProject.property("fabric_loader_version")}")
|
implementation("${Groups.Fabric}:fabric-loader:${rootProject.property("fabric_loader_version")}")
|
||||||
modApi("${Groups.FabricApi}:fabric-rendering-v1:${rootProject.property("fabric_rendering_api_version")}")
|
api("${Groups.FabricApi}:fabric-rendering-v1:${rootProject.property("fabric_rendering_api_version")}")
|
||||||
modApi("${Groups.FabricApi}:fabric-api-base:${rootProject.property("fabric_api_base_version")}")
|
api("${Groups.FabricApi}:fabric-api-base:${rootProject.property("fabric_api_base_version")}")
|
||||||
modApi("me.shedaniel.cloth:cloth-config-fabric:${rootProject.property("clothconfig_version")}") { exclude(group = Groups.FabricApi) }
|
api("me.shedaniel.cloth:cloth-config-fabric:${rootProject.property("clothconfig_version")}") { exclude(group = Groups.FabricApi) }
|
||||||
modImplementation("${Groups.FabricApi}:fabric-resource-loader-v0:${rootProject.property("fabric_resource_loader_version")}")
|
implementation("${Groups.FabricApi}:fabric-resource-loader-v0:${rootProject.property("fabric_resource_loader_version")}")
|
||||||
modImplementation(group = "net.fabricmc", name = "fabric-language-kotlin", version = rootProject.property("fabric_language_kotlin") as String)
|
implementation(group = "net.fabricmc", name = "fabric-language-kotlin", version = rootProject.property("fabric_language_kotlin") as String)
|
||||||
modImplementation("com.terraformersmc:modmenu:${rootProject.property("modmenu_version")}") {
|
implementation("com.terraformersmc:modmenu:${rootProject.property("modmenu_version")}") {
|
||||||
exclude(group = Groups.FabricApi, module = "fabric-api-base")
|
exclude(group = Groups.FabricApi, module = "fabric-api-base")
|
||||||
exclude(group = Groups.FabricApi, module = "fabric-resource-loader-v0")
|
exclude(group = Groups.FabricApi, module = "fabric-resource-loader-v0")
|
||||||
}
|
}
|
||||||
implementation(project(path = ":common", configuration = "namedElements")) { isTransitive = false }
|
implementation(project(path = ":common")) { isTransitive = false }
|
||||||
add("developmentFabric", project(path = ":common")) { isTransitive = false }
|
add("developmentFabric", project(path = ":common")) { isTransitive = false }
|
||||||
shadowC(project(path = ":common", configuration = "transformProductionFabric")) { isTransitive = false }
|
shadowC(project(path = ":common", configuration = "transformProductionFabric")) { isTransitive = false }
|
||||||
}
|
}
|
||||||
|
|||||||
@ -7,16 +7,16 @@ org.gradle.parallel=true
|
|||||||
org.gradle.unsafe.configuration-cache=on
|
org.gradle.unsafe.configuration-cache=on
|
||||||
org.gradle.vfs.watch=true
|
org.gradle.vfs.watch=true
|
||||||
|
|
||||||
minecraft=1.21.11
|
minecraft=26.1
|
||||||
forge_version=21.11.38-beta
|
forge_version=26.1.0.19-beta
|
||||||
kotlinforforge=6.1.0
|
kotlinforforge=6.2.0
|
||||||
kotlinVer=2.3.0
|
kotlinVer=2.3.10
|
||||||
kotlin_coroutines_version=1.10.2
|
kotlin_coroutines_version=1.10.2
|
||||||
serializationVer=1.9.0
|
serializationVer=1.10.0
|
||||||
fabric_loader_version=0.18.4
|
fabric_loader_version=0.19.1
|
||||||
fabric_language_kotlin=1.13.8+kotlin.2.3.0
|
fabric_language_kotlin=1.13.9+kotlin.2.3.10
|
||||||
fabric_resource_loader_version=3.3.4+4fc5413f53
|
fabric_resource_loader_version=3.3.16+4fc5413f59
|
||||||
fabric_rendering_api_version=16.2.5+1fb1cde953
|
fabric_rendering_api_version=23.0.3+2fb0624759
|
||||||
fabric_api_base_version=1.0.5+4ebb5c0853
|
fabric_api_base_version=2.0.3+ece0632359
|
||||||
clothconfig_version=21.11.151
|
clothconfig_version=26.1.154
|
||||||
modmenu_version=17.0.0-beta.2
|
modmenu_version=18.0.0-alpha.8
|
||||||
|
|||||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,5 +1,5 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-rc-2-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|||||||
@ -10,8 +10,8 @@ dependencies {
|
|||||||
return@let if (it.length > 4) it else "$it.+"
|
return@let if (it.length > 4) it else "$it.+"
|
||||||
}}")
|
}}")
|
||||||
implementation("thedarkcolour:kotlinforforge:${rootProject.property("kotlinforforge")}")
|
implementation("thedarkcolour:kotlinforforge:${rootProject.property("kotlinforforge")}")
|
||||||
modApi("me.shedaniel.cloth:cloth-config-neoforge:${rootProject.property("clothconfig_version")}")
|
api("me.shedaniel.cloth:cloth-config-neoforge:${rootProject.property("clothconfig_version")}")
|
||||||
implementation(project(path = ":common", configuration = "namedElements")) { isTransitive = false }
|
implementation(project(path = ":common")) { isTransitive = false }
|
||||||
|
|
||||||
add("developmentNeoForge", project(path = ":common")) { isTransitive = false }
|
add("developmentNeoForge", project(path = ":common")) { isTransitive = false }
|
||||||
shadowC(project(path = ":common", configuration = "transformProductionNeoForge")) { isTransitive = false }
|
shadowC(project(path = ":common", configuration = "transformProductionNeoForge")) { isTransitive = false }
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user