Permalink
Browse files

Moved SquirrelID relocation to core project.

This allows projects depending on core to properly use the ProfileService and ProfileResolver without themselves relocating the package.
  • Loading branch information...
wizjany committed Jan 27, 2019
1 parent 3f7a9f9 commit adc44acacf712f8a7aab67a18ce7ebadf71e4d12
Showing with 11 additions and 8 deletions.
  1. +1 −1 settings.gradle
  2. +9 −5 worldguard-core/build.gradle
  3. +1 −2 worldguard-legacy/build.gradle
@@ -1,3 +1,3 @@
rootProject.name = 'worldguard'

include 'worldguard-core', 'worldguard-sponge', 'worldguard-legacy'
include 'worldguard-core', 'worldguard-legacy'
@@ -14,12 +14,16 @@ dependencies {
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 })
@@ -9,7 +9,7 @@ repositories {
}

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 @@ shadowJar {
}

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')

}

0 comments on commit adc44ac

Please sign in to comment.