Moved SquirrelID relocation to core project. (#394)

This allows projects depending on core to properly use the ProfileService and ProfileResolver without themselves relocating the package.
EngineHub · Jan 28, 2019 · 72a392aca2e3d3408bdacc0cf7ae8d00dad460f3 · 72a392a
1 parent c6442e6
commit 72a392aca2e3d3408bdacc0cf7ae8d00dad460f3
Unified Split

Showing with 11 additions and 8 deletions.

+1 −1 settings.gradle

+9 −5 worldguard-core/build.gradle

+1 −2 worldguard-legacy/build.gradle
diff --git 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
@@ -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 })
diff --git a/worldguard-legacy/build.gradle b/worldguard-legacy/build.gradle
@@ -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')
 }