From f453f3967d81185bc09054bf9cde41204fdfd189 Mon Sep 17 00:00:00 2001 From: Pulverizer <9803259+Pulverizer@users.noreply.github.com> Date: Fri, 6 Oct 2023 16:58:25 +0100 Subject: [PATCH] converting build.gradle to kts --- .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .gradle/buildOutputCleanup/outputFiles.bin | Bin 24779 -> 24995 bytes .idea/workspace.xml | 23 ++++++++-- build.gradle.kts | 41 +++++++++--------- 4 files changed, 40 insertions(+), 24 deletions(-) diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 78ec078288b811873e1b0b01635d9137b4cf24f1..82c3e9bb58c4741ccec7ad447c75e771407a300a 100644 GIT binary patch literal 17 VcmZRc*Xd~;U3lp$0~jdW0{}EO1wa4* literal 17 VcmZRc*Xd~;U3lp$0~jcr0RS{41ug&p diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index 05d29332469a466700d3508bf1c50e9a8a823e24..d357e2a96d96d483ab3e5406e1799a7ff618c8a1 100644 GIT binary patch delta 286 zcmX?oka6*0#tkMCjG3EFB@&tW%Y6L*zS=dF0SppzH}^^}U=&!?@bq&0)HBPWqNMJm7 zc+4zNSrT@6FI3e0KNNT@jOeTtJ^mMJ!u!c*jRN`i<>yK(@hpI@29rG{V3V~akh5JTVF{Dg jFOai-Fc$-p#WP8hCNy}nwlrY{0wBq;AxICiK}d=imsuTD diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 6aee664cf..76e4e2111 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -15,7 +15,8 @@ - + + @@ -244,7 +245,7 @@ - + 1630004325334 @@ -269,7 +270,23 @@ - diff --git a/build.gradle.kts b/build.gradle.kts index edae6705a..5af6091fa 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -83,13 +83,9 @@ versionBody.set(providers.gradleProperty("changelog").map { file(it).readText(Ch }*/ } - configurations { - val provided by configurations.creating - val shade by configurations.creating - - provided.extendsFrom(shade) - implementation.extendsFrom(provided) - } + configurations.create("shade") + configurations.create("provided").extendsFrom(configurations.getByName("shade")) + configurations.implementation.extendsFrom(configurations.getByName("provided")) tasks.jar { setClassifier("base") @@ -111,24 +107,27 @@ versionBody.set(providers.gradleProperty("changelog").map { file(it).readText(Ch } subprojects { -/* shadowJar { - setClassifier("shadow") - configurations = [project.configurations.shade] + tasks.shadowJar { + setClassifier("shadow") + configurations = listOf(project.configurations.getByName("shade")) - dependencies { - include project (":") - } + dependencies { + include(project(":")) + } - manifest { - attributes["MixinConfigs"] = "mixins.movecraft.json" - } + manifest { + attributes["FMLAT"] = "META-INF/movecraft_at.cfg" + attributes["TweakClass"] = "org.spongepowered.asm.launch.MixinTweaker" + attributes["MixinConfigs"] = "mixins.movecraft.json" + attributes["FMLCorePluginContainsFMLMod"] = "true" } - dependencies { - provided project(path = ":", configuration = "provided") - shade project(path = ":", transitive = false) - shade project(path = ":", configuration = "shade") - }*/ + /*dependencies { + "provided" project (path = ":", configuration = "provided") + shade project (path = ":", transitive = false) + shade project (path = ":", configuration = "shade") + }*/ + } } dependencies {