From 47b9716bdcae6754c44f42702ce4871e45a4f90d Mon Sep 17 00:00:00 2001 From: Kenzie Togami Date: Wed, 10 Jul 2019 17:29:43 -0700 Subject: [PATCH] Migrate Fabric to Kotlin DSL --- worldedit-fabric/build.gradle | 108 ----------------------------- worldedit-fabric/build.gradle.kts | 109 ++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 108 deletions(-) delete mode 100644 worldedit-fabric/build.gradle create mode 100644 worldedit-fabric/build.gradle.kts diff --git a/worldedit-fabric/build.gradle b/worldedit-fabric/build.gradle deleted file mode 100644 index 70acc7a1d..000000000 --- a/worldedit-fabric/build.gradle +++ /dev/null @@ -1,108 +0,0 @@ -import net.fabricmc.loom.task.RemapJarTask - -buildscript { - repositories { - jcenter() - maven { - name = 'Fabric' - url = 'https://maven.fabricmc.net/' - } - maven { - name = 'sponge' - url = 'https://repo.spongepowered.org/maven' - } - } - - dependencies { - classpath 'net.fabricmc:fabric-loom:0.2.4-SNAPSHOT' - classpath 'org.spongepowered:mixin:0.7.11-SNAPSHOT' - } -} - -PlatformConfigKt.applyPlatformAndCoreConfiguration(project) -PlatformConfigKt.applyShadowConfiguration(project) - -apply plugin: 'eclipse' -apply plugin: 'fabric-loom' - -def minecraftVersion = "1.14.3" -def fabricVersion = "0.3.0+build.187" -def yarnMappings = "1.14.3+build.1" -def loaderVersion = "0.4.8+build.155" - -configurations.all { Configuration it -> - it.resolutionStrategy { ResolutionStrategy rs -> - rs.force("com.google.guava:guava:21.0") - } -} - -dependencies { - compile project(':worldedit-core') - compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.8.1' - - minecraft "com.mojang:minecraft:${minecraftVersion}" - mappings "net.fabricmc:yarn:${yarnMappings}" - modCompile "net.fabricmc:fabric-loader:${loaderVersion}" - - modCompile "net.fabricmc.fabric-api:fabric-api:${fabricVersion}" - - testCompile group: 'org.mockito', name: 'mockito-core', version: '1.9.0-rc1' -} - -sourceCompatibility = 1.8 -targetCompatibility = 1.8 - -minecraft { -} - -project.archivesBaseName = "${project.archivesBaseName}-mc${minecraftVersion}" - -processResources { - // this will ensure that this task is redone when the versions change. - inputs.property 'version', project.internalVersion - - from(sourceSets.main.resources.srcDirs) { - include "fabric.mod.json" - expand "version": project.internalVersion - } - - // copy everything else except the mod json - from(sourceSets.main.resources.srcDirs) { - exclude "fabric.mod.json" - } -} - -jar { - manifest { - attributes("Class-Path": "truezip.jar WorldEdit/truezip.jar js.jar WorldEdit/js.jar", - "WorldEdit-Version": version) - } -} - -shadowJar { - archiveClassifier.set("dist-dev") - dependencies { - relocate "org.slf4j", "com.sk89q.worldedit.slf4j" - relocate "org.apache.logging.slf4j", "com.sk89q.worldedit.log4jbridge" - - include(dependency('org.slf4j:slf4j-api')) - include(dependency("org.apache.logging.log4j:log4j-slf4j-impl")) - } -} - -task deobfJar(type: Jar) { - from sourceSets.main.output - archiveClassifier.set("dev") -} - -artifacts { - archives deobfJar -} - -task shadowJarRemap(type: RemapJarTask) { - input shadowJar.archiveFile - output new File(shadowJar.archiveFile.get().asFile.getAbsolutePath().replaceFirst('-dev\\.jar$', ".jar")) -} - -shadowJarRemap.dependsOn(shadowJar) -build.dependsOn(shadowJarRemap) \ No newline at end of file diff --git a/worldedit-fabric/build.gradle.kts b/worldedit-fabric/build.gradle.kts new file mode 100644 index 000000000..f6417686a --- /dev/null +++ b/worldedit-fabric/build.gradle.kts @@ -0,0 +1,109 @@ +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar +import net.fabricmc.loom.task.RemapJarTask + +buildscript { + repositories { + jcenter() + maven { + name = "Fabric" + url = uri("https://maven.fabricmc.net/") + } + maven { + name = "sponge" + url = uri("https://repo.spongepowered.org/maven") + } + } + + dependencies { + "classpath"("net.fabricmc:fabric-loom:0.2.4-SNAPSHOT") + "classpath"("org.spongepowered:mixin:0.7.11-SNAPSHOT") + } +} + +applyPlatformAndCoreConfiguration() +applyShadowConfiguration() + +apply(plugin = "fabric-loom") + +val minecraftVersion = "1.14.3" +val fabricVersion = "0.3.0+build.187" +val yarnMappings = "1.14.3+build.1" +val loaderVersion = "0.4.8+build.155" + +configurations.all { + resolutionStrategy { + force("com.google.guava:guava:21.0") + } +} + +dependencies { + "compile"(project(":worldedit-core")) + "compile"("org.apache.logging.log4j:log4j-slf4j-impl:2.8.1") + + "minecraft"("com.mojang:minecraft:$minecraftVersion") + "mappings"("net.fabricmc:yarn:$yarnMappings") + "modCompile"("net.fabricmc:fabric-loader:$loaderVersion") + + "modCompile"("net.fabricmc.fabric-api:fabric-api:$fabricVersion") + + "testCompile"("org.mockito:mockito-core:1.9.0-rc1") +} + +configure { + archivesBaseName = "$archivesBaseName-mc$minecraftVersion" +} + +val sourceSets = project.the().sourceSets + +tasks.named("processResources") { + // this will ensure that this task is redone when the versions change. + inputs.property("version", project.ext["internalVersion"]) + + from(sourceSets["main"].resources.srcDirs) { + include("fabric.mod.json") + expand("version" to project.ext["internalVersion"]) + } + + // copy everything else except the mod json + from(sourceSets["main"].resources.srcDirs) { + exclude("fabric.mod.json") + } +} + +tasks.named("jar") { + manifest { + attributes("Class-Path" to "truezip.jar WorldEdit/truezip.jar js.jar WorldEdit/js.jar", + "WorldEdit-Version" to project.version) + } +} + +tasks.named("shadowJar") { + archiveClassifier.set("dist-dev") + dependencies { + relocate("org.slf4j", "com.sk89q.worldedit.slf4j") + relocate("org.apache.logging.slf4j", "com.sk89q.worldedit.log4jbridge") + + include(dependency("org.slf4j:slf4j-api")) + include(dependency("org.apache.logging.log4j:log4j-slf4j-impl")) + } +} + +tasks.register("deobfJar") { + from(sourceSets["main"].output) + archiveClassifier.set("dev") +} + +artifacts { + add("archives", tasks.named("deobfJar")) +} + +tasks.register("remapShadowJar") { + val shadowJar = tasks.getByName("shadowJar") + dependsOn(shadowJar) + setInput(shadowJar.archiveFile) + setOutput(shadowJar.archiveFile.get().asFile.getAbsolutePath().replaceFirst("-dev\\.jar$", ".jar")) +} + +tasks.named("assemble").configure { + dependsOn("remapShadowJar") +}