diff --git a/build.gradle b/build.gradle index 57570e2ff..f31f5b6a8 100644 --- a/build.gradle +++ b/build.gradle @@ -142,7 +142,7 @@ subprojects { include(dependency('com.sk89q:jchronic:0.2.4a')) include(dependency('com.thoughtworks.paranamer:paranamer:2.6')) include(dependency('com.sk89q.lib:jlibnoise:1.0.0')) - relocate('net.kyori.text', 'com.sk89q.worldedit.util.formatting') { + relocate('net.kyori.text', 'com.sk89q.worldedit.util.formatting.text') { include(dependency('net.kyori:text-api:2.0.0')) } } diff --git a/worldedit-core/build.gradle b/worldedit-core/build.gradle index e47c27f02..a83565dfc 100644 --- a/worldedit-core/build.gradle +++ b/worldedit-core/build.gradle @@ -1,3 +1,5 @@ +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar + apply plugin: 'eclipse' apply plugin: 'idea' @@ -30,4 +32,7 @@ sourceSets { } } -build.dependsOn(shadowJar { classifier = null }) +task jar(type: ShadowJar, overwrite: true) { + from sourceSets.main.output + configurations = [project.configurations.runtime] +} \ No newline at end of file