diff --git a/build.gradle.kts b/build.gradle.kts index 809b8b02..d6c633c5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,16 +3,15 @@ /// See LICENSE at https://github.com/fixrtm/fixRTM for more details import com.anatawa12.jarInJar.gradle.TargetPreset -import com.anatawa12.modPatching.source.internal.readTextOr import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { kotlin("jvm") version "1.8.0" id("net.minecraftforge.gradle") - id("com.anatawa12.mod-patching.binary") version "2.1.3" - id("com.anatawa12.mod-patching.source") version "2.1.3" - id("com.anatawa12.mod-patching.resources-dev") version "2.1.3" - id("com.github.johnrengelman.shadow") version "7.1.2" + id("com.anatawa12.mod-patching.binary") version "2.1.5" + id("com.anatawa12.mod-patching.source") version "2.1.5" + id("com.anatawa12.mod-patching.resources-dev") version "2.1.5" + id("com.github.johnrengelman.shadow") version "8.1.1" id("com.anatawa12.jarInJar") version "1.0.3" } @@ -142,13 +141,15 @@ val runServer = minecraft.runs.create("server") { } val jar by tasks.getting(Jar::class) { - shade.forEach { dep -> - from(project.zipTree(dep)) { - exclude("META-INF", "META-INF/**") - exclude("LICENSE.txt") - } - from(project.zipTree(dep)) { - include("META-INF/services/**") + afterEvaluate { + shade.forEach { dep -> + from(project.zipTree(dep)) { + exclude("META-INF", "META-INF/**") + exclude("LICENSE.txt") + } + from(project.zipTree(dep)) { + include("META-INF/services/**") + } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ffed3a25..fae08049 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.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle.kts b/settings.gradle.kts index e320ad54..9ecaf6a4 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -14,6 +14,6 @@ buildscript { } dependencies { // use latest version by dependabot. dependabot supports dependencies in settings.gralde - classpath("net.minecraftforge.gradle:ForgeGradle:5.1.64") + classpath("net.minecraftforge.gradle:ForgeGradle:6.0.6") } }