diff --git a/settings.gradle b/settings.gradle index 4f4305ae..bad689fe 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,3 @@ rootProject.name = 'worldguard' -include 'worldguard-core', 'worldguard-sponge', 'worldguard-legacy' +include 'worldguard-core', 'worldguard-legacy' diff --git a/worldguard-core/build.gradle b/worldguard-core/build.gradle index be5ea8db..597a43ab 100644 --- a/worldguard-core/build.gradle +++ b/worldguard-core/build.gradle @@ -14,12 +14,16 @@ sourceSets { main { java { - srcDir 'src/main/java' - } + srcDir 'src/main/java' + } resources { - srcDir 'src/main/resources' - } + srcDir 'src/main/resources' + } } } -build.dependsOn(shadowJar) +shadowJar { + relocate('com.sk89q.squirrelid', 'com.sk89q.worldguard.util.profile') +} + +build.dependsOn(shadowJar { classifier = null }) diff --git a/worldguard-legacy/build.gradle b/worldguard-legacy/build.gradle index 0a25cafa..a1ac67ee 100644 --- a/worldguard-legacy/build.gradle +++ b/worldguard-legacy/build.gradle @@ -9,7 +9,7 @@ } dependencies { - compile project(':worldguard-core') + compile project(path: ':worldguard-core', configuration: 'shadow') compile 'org.bukkit:bukkit:1.13-R0.1-SNAPSHOT' compile 'com.sk89q.worldedit:worldedit-bukkit:7.0.0-SNAPSHOT' compile ('com.sk89q:commandbook:2.3') { @@ -47,7 +47,6 @@ compile project(':worldguard-core') } relocate('org.flywaydb', 'com.sk89q.worldguard.internal.flywaydb') - relocate('com.sk89q.squirrelid', 'com.sk89q.worldguard.util.profile') relocate('org.json.simple', 'com.sk89q.worldguard.util.jsonsimple') }