Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-11-23 02:55:23 +01:00
Code Issues Projects Releases Wiki Activity

Moved SquirrelID relocation to core project. (#394)

Browse Source 
This allows projects depending on core to properly use the ProfileService and ProfileResolver without themselves relocating the package.
This commit is contained in:
Wizjany 2019-01-27 19:47:08 -05:00 committed by GitHub
parent c6442e6669
commit 72a392aca2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
settings.gradle
View File

@ -1,3 +1,3 @@
rootProject.name = 'worldguard'
include 'worldguard-core', 'worldguard-sponge', 'worldguard-legacy'
include 'worldguard-core', 'worldguard-legacy'

14
worldguard-core/build.gradle
View File

@ -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 })

3
worldguard-legacy/build.gradle
View File

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