Fix Travis build, update dependencies, fix test

9

.idea/libraries/Maven__net_ess3_Essentials_2_13_1.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: net.ess3:Essentials:2.13.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/ess3/Essentials/2.13.1/Essentials-2.13.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/net/ess3/Essentials/2.13.1/Essentials-2.13.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/ess3/Essentials/2.13.1/Essentials-2.13.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.travis.yml

@@ -11,6 +11,7 @@ language: java
 jdk:
   - oraclejdk8
 sudo: true
+dist: trusty # Needed for Java 8, although we might not need Java 8
 deploy:
   # deploy develop to the staging environment
   - provider: script

BuildConfigUpdater/BuildConfigUpdater.iml

@@ -12,7 +12,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="ButtonCore (1) (com.github.TBMCPlugins.ButtonCore)" />
-    <orderEntry type="module" module-name="ButtonCore (1) (com.github.TBMCPlugins.ButtonCore)" />
     <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.10" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" />
     <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />

ButtonCore/ButtonCore (1) (com.github.TBMCPlugins.ButtonCore).iml

@@ -28,9 +28,17 @@
     <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.10" level="project" />
     <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.10" level="project" />
     <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.16.16" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.8" level="project" />
     <orderEntry type="module" module-name="ButtonProcessor" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.ess3:Essentials:2.13.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.ess3:EssentialsX:2.17.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: io.papermc:paperlib:1.0.2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.ess3:NMSProvider:2.17.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.ess3:UpdatedMetaProvider:2.17.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.ess3:1_8_R1Provider:2.17.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.ess3:1_8_R2Provider:2.17.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.ess3:LegacyProvider:2.17.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.ess3:ReflectionProvider:2.17.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.ess3:FlattenedProvider:2.17.1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.vexsoftware:nuvotifier-universal:2.3.4" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.onarandombox.multiversecore:Multiverse-Core:4.0.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />

ButtonCore/pom.xml

@@ -165,7 +165,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.16.16</version>
+            <version>1.18.8</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -176,8 +176,8 @@
 		</dependency>
 		<dependency>
 			<groupId>net.ess3</groupId>
-			<artifactId>Essentials</artifactId>
+            <artifactId>EssentialsX</artifactId>
-			<version>2.13.1</version>
+            <version>2.17.1</version>
 			<scope>provided</scope>
 		</dependency>
         <dependency>

ButtonCore/src/test/java/buttondevteam/core/PlayerDataTest.java

@@ -31,26 +31,29 @@ public class PlayerDataTest extends TestCase {
 	public void testConfig() throws Exception {
 		TestPrepare.PrepareServer();
 		//FileUtils.deleteDirectory(new File(ChromaGamerBase.TBMC_PLAYERS_DIR));
-		Files.walkFileTree(new File(ChromaGamerBase.TBMC_PLAYERS_DIR).toPath(), new SimpleFileVisitor<Path>() {
+		File file = new File(ChromaGamerBase.TBMC_PLAYERS_DIR);
-			@Override
+		if (file.exists()) {
-			public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
+			Files.walkFileTree(file.toPath(), new SimpleFileVisitor<Path>() {
-				throws IOException {
+				@Override
-				Files.delete(file);
+				public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
-				return FileVisitResult.CONTINUE;
+					throws IOException {
-			}
+					Files.delete(file);
-
-			@Override
-			public FileVisitResult postVisitDirectory(Path dir, IOException e)
-				throws IOException {
-				if (e == null) {
-					Files.delete(dir);
 					return FileVisitResult.CONTINUE;
-				} else {
-					// directory iteration failed
-					throw e;
 				}
-			}
+
-		});
+				@Override
+				public FileVisitResult postVisitDirectory(Path dir, IOException e)
+					throws IOException {
+					if (e == null) {
+						Files.delete(dir);
+						return FileVisitResult.CONTINUE;
+					} else {
+						// directory iteration failed
+						throw e;
+					}
+				}
+			});
+		}
 		UUID uuid = new UUID(0L, 0L);
 		try (TestPlayerClass p = TBMCPlayerBase.getPlayer(uuid, TestPlayerClass.class)) {
 			p.PlayerName().set("Test");

ButtonProcessor/ButtonProcessor.iml

@@ -13,6 +13,8 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.21" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.21" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.21" level="project" />
     <orderEntry type="library" name="Maven: org.spigotmc:spigot-api:1.12.2-R0.1-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
     <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />