From 1813b15388760a036ed91e6e4d89c67a59bd92e3 Mon Sep 17 00:00:00 2001 From: Immortius Date: Fri, 3 Apr 2015 11:43:31 +1100 Subject: [PATCH 1/2] Switched to Java 8 --- build.gradle | 4 ++-- .../java/org/terasology/utilities/WhiteNoiseTest.java | 2 +- engine/build.gradle | 8 +++++--- .../input/binds/general/OnlinePlayersButton.java | 3 --- .../java/org/terasology/logic/players/PlayerUtil.java | 2 -- .../rendering/nui/layers/ingame/OnlinePlayersOverlay.java | 2 -- 6 files changed, 8 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 15e393395bd..228080d935d 100644 --- 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/engine-tests/src/test/java/org/terasology/utilities/WhiteNoiseTest.java b/engine-tests/src/test/java/org/terasology/utilities/WhiteNoiseTest.java index ad0657c58c5..ccb08810f8f 100644 --- 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 index 0dc1b530fd1..60d14de9f10 100755 --- 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 index 63c71919903..dee5ff1e5b4 100644 --- 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 - */ @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 index 04a861bf4ce..73b462a45cd 100644 --- 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 */ 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 index e1cd1ea56dc..330cfb61258 100644 --- 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 */ public class OnlinePlayersOverlay extends CoreScreenLayer { private static final Logger logger = LoggerFactory.getLogger(OnlinePlayersOverlay.class); From ff9dfa8929148c80afd8e9796de2c2c4856c4ea3 Mon Sep 17 00:00:00 2001 From: Immortius Date: Fri, 3 Apr 2015 20:40:01 +1100 Subject: [PATCH 2/2] Set sourceCompatibility and targetCompatibility --- config/gradle/common.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/gradle/common.gradle b/config/gradle/common.gradle index f98883c0c37..99a75e338f2 100644 --- 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()