Skip to content

Commit a0d5957

Browse files
committed
Merge PR #1663 by @immortius - java 8 switch
2 parents b01170e + ff9dfa8 commit a0d5957

File tree

7 files changed

+11
-13
lines changed

7 files changed

+11
-13
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ idea {
214214

215215
project {
216216
// Set JDK
217-
jdkName = '1.7'
217+
jdkName = '1.8'
218218
wildcards -= '!?*.groovy'
219219

220220
ipr {
@@ -231,7 +231,7 @@ idea {
231231

232232
// Sets sourceCompatibility within IntelliJ (without this root build having the Java plugin applied)
233233
whenMerged {project ->
234-
project.jdk.languageLevel = 'JDK_1_7'
234+
project.jdk.languageLevel = 'JDK_1_8'
235235
}
236236
}
237237
}

config/gradle/common.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ apply plugin: 'checkstyle'
88
apply plugin: 'pmd'
99
apply plugin: 'findbugs'
1010

11+
sourceCompatibility = 1.8
12+
targetCompatibility = 1.8
13+
1114
// We use both Maven Central and our own Artifactory instance, which contains module builds, extra libs, and so on
1215
repositories {
1316
mavenCentral()

engine-tests/src/test/java/org/terasology/utilities/WhiteNoiseTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.terasology.utilities.random.FastRandom;
2323

2424
/**
25-
* A simple validity test for {@link FastNoise}
25+
* A simple validity test for {@link org.terasology.utilities.procedural.WhiteNoise}
2626
*
2727
* @author Martin Steiger
2828
*/

engine/build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,9 @@ dependencies {
100100
// Java magic
101101
compile group: 'net.java.dev.jna', name: 'jna', version: '3.5.2'
102102
compile group: 'net.java.dev.jna', name: 'platform', version: '3.5.2'
103-
compile group: 'org.reflections', name: 'reflections', version: '0.9.9-RC1'
104-
compile group: 'com.esotericsoftware.reflectasm', name: 'reflectasm', version: '1.09'
103+
compile group: 'org.reflections', name: 'reflections', version: '0.9.9'
104+
compile group: 'org.javassist', name: 'javassist', version: '3.19.0-GA'
105+
compile group: 'com.esotericsoftware', name: 'reflectasm', version: '1.11.0'
105106

106107
// Graphics, 3D, UI, etc
107108
compile group: 'org.lwjgl.lwjgl', name: 'lwjgl', version: LwjglVersion
@@ -120,7 +121,8 @@ dependencies {
120121
compile group: 'org.eaxy', name: 'eaxy', version: '0.1'
121122

122123
// Our developed libs
123-
compile group: 'org.terasology', name: 'gestalt-module', version: '2.2.3'
124+
compile group: 'org.terasology', name: 'gestalt-module', version: '2.3.0-RC1'
125+
compile group: 'org.terasology', name: 'gestalt-asset-core', version: '2.3.0-RC1'
124126
compile group: 'org.terasology', name: 'TeraMath', version: '+', changing: true
125127
compile group: 'org.terasology.bullet', name: 'tera-bullet', version: '1.0.3'
126128

engine/src/main/java/org/terasology/input/binds/general/OnlinePlayersButton.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
import org.terasology.input.Keyboard;
2222
import org.terasology.input.RegisterBindButton;
2323

24-
/**
25-
* @author Florian <[email protected]>
26-
*/
2724
@RegisterBindButton(id = "showOnlinePlayers", description = "Show online players", category = "general")
2825
@DefaultBinding(type = InputType.KEY, id = Keyboard.KeyId.TAB)
2926
public class OnlinePlayersButton extends BindButtonEvent {

engine/src/main/java/org/terasology/logic/players/PlayerUtil.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222

2323
/**
2424
* Utility class. Currently only used as container for getColoredPlayerName.
25-
*
26-
* @author Florian <[email protected]>
2725
*/
2826
public class PlayerUtil {
2927

engine/src/main/java/org/terasology/rendering/nui/layers/ingame/OnlinePlayersOverlay.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727

2828
/**
2929
* Overlay that lists all players that are currently online.
30-
*
31-
* @author Florian <[email protected]>
3230
*/
3331
public class OnlinePlayersOverlay extends CoreScreenLayer {
3432
private static final Logger logger = LoggerFactory.getLogger(OnlinePlayersOverlay.class);

0 commit comments

Comments
 (0)