Merge PR #1663 by @immortius - java 8 switch

MovingBlocks · Apr 4, 2015 · a0d5957 · a0d5957
2 parents b01170e + ff9dfa8
commit a0d5957
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -214,7 +214,7 @@ idea {
 
     project {
         // Set JDK
-        jdkName = '1.7'
+        jdkName = '1.8'
         wildcards -= '!?*.groovy'
 
         ipr {
@@ -231,7 +231,7 @@ idea {
 
             // Sets sourceCompatibility within IntelliJ (without this root build having the Java plugin applied)
             whenMerged {project ->
-                project.jdk.languageLevel = 'JDK_1_7'
+                project.jdk.languageLevel = 'JDK_1_8'
             }
         }
     }

diff --git a/config/gradle/common.gradle b/config/gradle/common.gradle
@@ -8,6 +8,9 @@ apply plugin: 'checkstyle'
 apply plugin: 'pmd'
 apply plugin: 'findbugs'
 
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
+
 // We use both Maven Central and our own Artifactory instance, which contains module builds, extra libs, and so on
 repositories {
     mavenCentral()

diff --git a/engine-tests/src/test/java/org/terasology/utilities/WhiteNoiseTest.java b/engine-tests/src/test/java/org/terasology/utilities/WhiteNoiseTest.java
@@ -22,7 +22,7 @@
 import org.terasology.utilities.random.FastRandom;
 
 /**
- * A simple validity test for {@link FastNoise}
+ * A simple validity test for {@link org.terasology.utilities.procedural.WhiteNoise}
  *
  * @author Martin Steiger
  */

diff --git a/engine/build.gradle b/engine/build.gradle
@@ -100,8 +100,9 @@ dependencies {
     // Java magic
     compile group: 'net.java.dev.jna', name: 'jna', version: '3.5.2'
     compile group: 'net.java.dev.jna', name: 'platform', version: '3.5.2'
-    compile group: 'org.reflections', name: 'reflections', version: '0.9.9-RC1'
-    compile group: 'com.esotericsoftware.reflectasm', name: 'reflectasm', version: '1.09'
+    compile group: 'org.reflections', name: 'reflections', version: '0.9.9'
+    compile group: 'org.javassist', name: 'javassist', version: '3.19.0-GA'
+    compile group: 'com.esotericsoftware', name: 'reflectasm', version: '1.11.0'
 
     // Graphics, 3D, UI, etc
     compile group: 'org.lwjgl.lwjgl', name: 'lwjgl', version: LwjglVersion
@@ -120,7 +121,8 @@ dependencies {
     compile group: 'org.eaxy', name: 'eaxy', version: '0.1'
 
     // Our developed libs
-    compile group: 'org.terasology', name: 'gestalt-module', version: '2.2.3'
+    compile group: 'org.terasology', name: 'gestalt-module', version: '2.3.0-RC1'
+    compile group: 'org.terasology', name: 'gestalt-asset-core', version: '2.3.0-RC1'
     compile group: 'org.terasology', name: 'TeraMath', version: '+', changing: true
     compile group: 'org.terasology.bullet', name: 'tera-bullet', version: '1.0.3'
 

diff --git a/engine/src/main/java/org/terasology/input/binds/general/OnlinePlayersButton.java b/engine/src/main/java/org/terasology/input/binds/general/OnlinePlayersButton.java
@@ -21,9 +21,6 @@
 import org.terasology.input.Keyboard;
 import org.terasology.input.RegisterBindButton;
 
-/**
- * @author Florian <[email protected]>
- */
 @RegisterBindButton(id = "showOnlinePlayers", description = "Show online players", category = "general")
 @DefaultBinding(type = InputType.KEY, id = Keyboard.KeyId.TAB)
 public class OnlinePlayersButton extends BindButtonEvent {

diff --git a/engine/src/main/java/org/terasology/logic/players/PlayerUtil.java b/engine/src/main/java/org/terasology/logic/players/PlayerUtil.java
@@ -22,8 +22,6 @@
 
 /**
  * Utility class. Currently only used as container for getColoredPlayerName.
- *
- * @author Florian <[email protected]>
  */
 public class PlayerUtil {
 

diff --git a/engine/src/main/java/org/terasology/rendering/nui/layers/ingame/OnlinePlayersOverlay.java b/engine/src/main/java/org/terasology/rendering/nui/layers/ingame/OnlinePlayersOverlay.java
@@ -27,8 +27,6 @@
 
 /**
  * Overlay that lists all players that are currently online.
- *
- * @author Florian <[email protected]>
  */
 public class OnlinePlayersOverlay extends CoreScreenLayer {
     private static final Logger logger = LoggerFactory.getLogger(OnlinePlayersOverlay.class);
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,8 +22,6 @@ @@
     /**
      * Utility class. Currently only used as container for getColoredPlayerName.
-     *
-     * @author Florian <[email protected]>
      */
     public class PlayerUtil {
@@ Expand Down @@