Relocate squirrelid in source, fix flyway shading.

buildSrc/src/main/kotlin/LibsConfig.kt

@@ -30,9 +30,7 @@ fun Project.applyLibrariesConfiguration() {
         archiveClassifier.set("")
 
         dependencies {
-            exclude(dependency("com.google.guava:guava"))
-            exclude(dependency("com.google.code.gson:gson"))
-            exclude(dependency("org.checkerframework:checker-qual"))
+            exclude(dependency("com.google.code.findbugs:jsr305:1.3.9"))
         }
 
         relocate("com.sk89q.squirrelid", "com.sk89q.worldguard.util.profile")

buildSrc/src/main/kotlin/PlatformConfig.kt

@@ -106,6 +106,11 @@ fun Project.applyShadowConfiguration() {
             include(project(":worldguard-libs:core"))
             //include(project(":worldguard-libs:${project.name.replace("worldguard-", "")}"))
             include(project(":worldguard-core"))
+
+            relocate("org.flywaydb", "com.sk89q.worldguard.internal.flywaydb") {
+                include(dependency("org.flywaydb:flyway-core:3.0"))
+            }
+            relocate("com.sk89q.squirrelid", "com.sk89q.worldguard.util.profile")
         }
         exclude("GradleStart**")
         exclude(".cache")

worldguard-core/build.gradle.kts

@@ -9,9 +9,7 @@ applyPlatformAndCoreConfiguration()
 dependencies {
     "compile"(project(":worldguard-libs:core"))
     "compile"("com.sk89q.worldedit:worldedit-core:7.0.1-SNAPSHOT")
-    "implementation"("com.sk89q:squirrelid:0.2.0")
     "implementation"("org.flywaydb:flyway-core:3.0")
-    "implementation"("org.khelekore:prtree:1.5.0")
 
     "compileOnly"("com.google.code.findbugs:jsr305:1.3.9")
     "testImplementation"("org.hamcrest:hamcrest-library:1.2.1")

worldguard-core/src/main/java/com/sk89q/worldguard/WorldGuard.java

@@ -24,14 +24,14 @@
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.sk89q.minecraft.util.commands.CommandException;
-import com.sk89q.squirrelid.cache.HashMapCache;
-import com.sk89q.squirrelid.cache.ProfileCache;
-import com.sk89q.squirrelid.cache.SQLiteCache;
-import com.sk89q.squirrelid.resolver.BukkitPlayerService;
-import com.sk89q.squirrelid.resolver.CacheForwardingService;
-import com.sk89q.squirrelid.resolver.CombinedProfileService;
-import com.sk89q.squirrelid.resolver.HttpRepositoryService;
-import com.sk89q.squirrelid.resolver.ProfileService;
+import com.sk89q.worldguard.util.profile.cache.HashMapCache;
+import com.sk89q.worldguard.util.profile.cache.ProfileCache;
+import com.sk89q.worldguard.util.profile.cache.SQLiteCache;
+import com.sk89q.worldguard.util.profile.resolver.BukkitPlayerService;
+import com.sk89q.worldguard.util.profile.resolver.CacheForwardingService;
+import com.sk89q.worldguard.util.profile.resolver.CombinedProfileService;
+import com.sk89q.worldguard.util.profile.resolver.HttpRepositoryService;
+import com.sk89q.worldguard.util.profile.resolver.ProfileService;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.util.task.SimpleSupervisor;
 import com.sk89q.worldedit.util.task.Supervisor;

worldguard-core/src/main/java/com/sk89q/worldguard/commands/region/RegionPrintoutBuilder.java

@@ -19,7 +19,7 @@
 
 package com.sk89q.worldguard.commands.region;
 
-import com.sk89q.squirrelid.cache.ProfileCache;
+import com.sk89q.worldguard.util.profile.cache.ProfileCache;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.util.Location;

worldguard-core/src/main/java/com/sk89q/worldguard/commands/task/RegionLister.java

@@ -22,7 +22,7 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.sk89q.minecraft.util.commands.CommandException;
-import com.sk89q.squirrelid.Profile;
+import com.sk89q.worldguard.util.profile.Profile;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.util.formatting.component.PaginationBox;
 import com.sk89q.worldedit.util.formatting.text.Component;

worldguard-core/src/main/java/com/sk89q/worldguard/domains/DefaultDomain.java

@@ -22,8 +22,8 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.sk89q.squirrelid.Profile;
-import com.sk89q.squirrelid.cache.ProfileCache;
+import com.sk89q.worldguard.util.profile.Profile;
+import com.sk89q.worldguard.util.profile.cache.ProfileCache;
 import com.sk89q.worldedit.util.formatting.text.Component;
 import com.sk89q.worldedit.util.formatting.text.TextComponent;
 import com.sk89q.worldedit.util.formatting.text.event.ClickEvent;

worldguard-core/src/main/java/com/sk89q/worldguard/protection/managers/migration/UUIDMigration.java

@@ -20,8 +20,8 @@
 package com.sk89q.worldguard.protection.managers.migration;
 
 import com.google.common.base.Predicate;
-import com.sk89q.squirrelid.Profile;
-import com.sk89q.squirrelid.resolver.ProfileService;
+import com.sk89q.worldguard.util.profile.Profile;
+import com.sk89q.worldguard.util.profile.resolver.ProfileService;
 import com.sk89q.worldguard.domains.DefaultDomain;
 import com.sk89q.worldguard.domains.PlayerDomain;
 import com.sk89q.worldguard.protection.flags.registry.FlagRegistry;

worldguard-core/src/main/java/com/sk89q/worldguard/protection/util/DomainInputResolver.java

@@ -21,9 +21,9 @@
 
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
-import com.sk89q.squirrelid.Profile;
-import com.sk89q.squirrelid.resolver.ProfileService;
-import com.sk89q.squirrelid.util.UUIDs;
+import com.sk89q.worldguard.util.profile.Profile;
+import com.sk89q.worldguard.util.profile.resolver.ProfileService;
+import com.sk89q.worldguard.util.profile.util.UUIDs;
 import com.sk89q.worldguard.domains.DefaultDomain;
 
 import javax.annotation.Nullable;

worldguard-libs/core/build.gradle.kts

@@ -2,4 +2,5 @@ applyLibrariesConfiguration()
 
 dependencies {
     "shade"("com.sk89q:squirrelid:${Versions.SQUIRRELID}")
+    "shade"("org.khelekore:prtree:1.5.0")
 }