Major work towards 1.13 compat

Author: me4502

build.gradle

@@ -26,9 +26,9 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.1'
-        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:3.0.1'
-        classpath 'org.ajoberstar:gradle-git:0.12.0'
+        classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.3'
+        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.7.5'
+        classpath 'org.ajoberstar:gradle-git:1.7.2'
     }
 }
 
@@ -50,7 +50,7 @@ subprojects {
     apply plugin: 'maven'
     apply plugin: 'checkstyle'
     apply plugin: 'com.github.johnrengelman.shadow'
-    apply plugin: 'com.jfrog.artifactory-upload'
+    apply plugin: 'com.jfrog.artifactory'
 
     group = 'com.sk89q.worldguard'
     version = '7.0.0-SNAPSHOT'
@@ -62,6 +62,7 @@ subprojects {
     checkstyle.configFile = new File(rootProject.projectDir, "config/checkstyle/checkstyle.xml")
 
     repositories {
+        mavenLocal()
         mavenCentral()
         maven { url "http://repo.spongepowered.org/maven/" }
         maven { url "https://hub.spigotmc.org/nexus/content/groups/public" }
@@ -101,6 +102,10 @@ subprojects {
         classifier 'dist'
         dependencies {
             include(dependency('org.khelekore:prtree:1.5.0'))
+            include(dependency('com.sk89q:squirrelid:0.1.0'))
+            include(dependency('org.flywaydb:flyway-core:3.0'))
+            include(dependency('com.googlecode.json-simple:json-simple:1.1.1'))
+            include(dependency('net.sf.opencsv:opencsv:2.0'))
         }
         exclude 'GradleStart**'
         exclude '.cache'

config/checkstyle/checkstyle.xml

@@ -27,7 +27,6 @@
       <property name="max" value="2"/>
     </module>
     <module name="SuperFinalize"/> <!-- We don't actually use this -->
-    <module name="JUnitTestCase"/> <!-- Checks tearDown(), setUp() etc. -->
 
     <!-- Style -->
     <module name="LeftCurly"> <!-- Left brace never goes on another line -->

config/checkstyle/import-control.xml

@@ -14,6 +14,8 @@
   <subpackage name="worldguard">
     <allow pkg="org.khelekore"/>
     <allow pkg="org.flywaydb"/>
+    <allow pkg="org.yaml"/>
+    <allow pkg="org.json"/>
 
     <subpackage name="bukkit">
       <allow pkg="org.bukkit"/>

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,5 @@
-#Fri Nov 13 12:12:21 EST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -2,11 +2,14 @@ apply plugin: 'eclipse'
 apply plugin: 'idea'
 
 dependencies {
-    compile 'com.sk89q.worldedit:worldedit-core:6.1.1-SNAPSHOT'
+    compile 'com.sk89q.worldedit:worldedit-core:7.0.0-SNAPSHOT'
     compile 'com.sk89q.intake:intake:4.2-SNAPSHOT'
     compile 'com.sk89q:squirrelid:0.1.0'
     compile 'org.flywaydb:flyway-core:3.0'
     compile 'org.khelekore:prtree:1.5.0'
+    compile 'net.sf.opencsv:opencsv:2.0'
+    compile 'com.googlecode.json-simple:json-simple:1.1.1'
+    compile 'com.google.code.findbugs:jsr305:1.3.9'
 }
 
 sourceSets {

gradlew

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC
+    "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+    "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+<module name="Checker">
+  <!-- Tabs are strictly banned -->
+  <module name="FileTabCharacter"/>
+
+  <module name="TreeWalker">
+    <!-- Important basics -->
+    <!-- <module name="PackageDeclaration"/> Unlikely that we would miss this in a PR -->
+    <module name="OuterTypeFilename"/> <!-- TypeName -> TypeName.java -->
+
+    <!--
+    Control package usage, so people don't insert Bukkit into WE where it shouldn't belong, etc.
+    It is a bit draconian, so update as necessary!
+    -->
+    <module name="ImportControl">
+      <property name="file" value="worldguard-core/config/checkstyle/import-control.xml"/>
+    </module>
+
+    <!-- Code -->
+    <module name="HideUtilityClassConstructor"/> <!-- Utility classes should not have a constructor -->
+    <module name="CovariantEquals"/>
+    <module name="EqualsHashCode"/> <!-- equals() and hashCode() go together -->
+    <module name="NestedTryDepth"> <!-- SHOULD not need to adjust this -->
+      <property name="max" value="2"/>
+    </module>
+    <module name="SuperFinalize"/> <!-- We don't actually use this -->
+
+    <!-- Style -->
+    <module name="LeftCurly"> <!-- Left brace never goes on another line -->
+      <property name="option" value="eol"/>
+    </module> <!-- We don't check right brace -->
+    <module name="DefaultComesLast"/> <!-- default case in switch should be last -->
+    <module name="GenericWhitespace"/>
+
+    <!-- Naming -->
+    <module name="ClassTypeParameterName">
+      <property name="format" value="^[A-Z][a-zA-Z0-9]*$"/>
+    </module>
+    <module name="LocalFinalVariableName"/>
+    <module name="LocalVariableName">
+      <property name="format" value="^[a-z_][a-zA-Z0-9]*$"/>
+    </module>
+    <module name="MemberName">
+      <property name="format" value="^[a-z_][a-zA-Z0-9]*$"/>
+    </module>
+    <module name="MethodName">
+      <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
+    </module>
+    <!-- <module name="PackageName"/> Unlikely that we would miss this in a PR -->
+    <module name="ParameterName"/>
+    <!-- <module name="TypeName"/> Unlikely that we would miss this in a PR -->
+  </module>
+
+  <!-- Require the header, something that many people forget and we hate to fix -->
+  <!-- You should configure the header in your IDE -->
+  <module name="Header">
+    <property name="headerFile" value="config/checkstyle/header.txt"/>
+    <property name="fileExtensions" value="java"/>
+  </module>
+</module>

gradlew.bat

@@ -0,0 +1,40 @@
+<!--
+  ~ WorldGuard, a suite of tools for Minecraft
+  ~ Copyright (C) sk89q <http://www.sk89q.com>
+  ~ Copyright (C) WorldGuard team and contributors
+  ~
+  ~ This program is free software: you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as published by the
+  ~ Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+  ~ for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public License
+  ~ along with this program. If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<!DOCTYPE import-control PUBLIC
+    "-//Puppy Crawl//DTD Import Control 1.1//EN"
+    "http://www.puppycrawl.com/dtds/import_control_1_1.dtd">
+
+<import-control pkg="com.sk89q">
+  <allow pkg="java"/>
+  <allow pkg="javax"/>
+  <allow pkg="org.junit"/>
+  <allow pkg="junit"/>
+  <allow pkg="org.mockito"/>
+  <allow pkg="org.hamcrest"/>
+  <allow pkg="com.sk89q"/>
+  <allow pkg="org.enginehub"/>
+  <allow pkg="org.yaml.snakeyaml"/>
+  <allow pkg="au.com.bytecode.opencsv"/>
+  <allow pkg="org.khelekore.prtree"/>
+  <allow pkg="com.google.common"/>
+  <allow pkg="com.jolbox.bonecp"/>
+  <allow pkg="org.flywaydb.core"/>
+  <allow pkg="org.json.simple"/>
+</import-control>