diff --git a/build.gradle.kts b/build.gradle.kts index f2dbb48..2d547c6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,26 +6,22 @@ import net.fabricmc.loom.LoomGradleExtension buildscript { dependencies { - classpath("com.guardsquare:proguard-gradle:[7.3.1, 7.4[") { + classpath("com.guardsquare:proguard-gradle:[7.4, 7.5[") { exclude("com.android.tools.build") } } } plugins { - kotlin("jvm") version "1.8.21" - kotlin("plugin.serialization") version "1.8.21" - id("com.github.johnrengelman.shadow") version "7.1.2" apply false + kotlin("jvm") version "1.9.22" + kotlin("plugin.serialization") version "1.9.22" + id("com.github.johnrengelman.shadow") version "8.1.1" apply false id("architectury-plugin") version "[3.4.124, 3.5[" - id("dev.architectury.loom") version ( - JavaVersion.current().let { version -> - "[0.10.0, ${if (version.isCompatibleWith(JavaVersion.VERSION_17)) "0.12.1" else "0.10.1"}[" - } - ) apply false - id("com.github.ben-manes.versions") version "0.42.0" - id("net.kyori.indra.git") version "3.0.1" + id("dev.architectury.loom") version "1.4-SNAPSHOT" apply false + id("com.github.ben-manes.versions") version "0.51.0" + id("net.kyori.indra.git") version "3.1.3" id("org.cqfn.diktat.diktat-gradle-plugin") version "1.2.5" - id("com.modrinth.minotaur") version "2.7.5" apply false + id("com.modrinth.minotaur") version "2.8.7" apply false } group = "fr.username404" @@ -169,10 +165,8 @@ subprojects { overloadaggressively() mergeinterfacesaggressively() } - withType(net.fabricmc.loom.task.PrepareJarRemapTask::class) { - dependsOn(shrinkJar) - } withType(net.fabricmc.loom.task.RemapJarTask::class) { + dependsOn(shrinkJar) val shrinkedJar = shrinkJar.get().outJarFileCollection.singleFile archiveBaseName.set(shadowJar.archiveBaseName) archiveVersion.set("[${rootProject.version}+$mcBase]") diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 774fae8..07f5430 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-rc-1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists