Skip to content

Commit 136381c

Browse files
committed
Merge branch 'jpn/cg-game-sdk-uses-java-17-now' into 'master'
[FEAT][SDK] Game SDK now runs with Java 17 See merge request codingame/game-engine!324
2 parents 27db50a + faad865 commit 136381c

File tree

5 files changed

+13
-9
lines changed

5 files changed

+13
-9
lines changed

engine/core/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<dependency>
1919
<groupId>com.google.inject</groupId>
2020
<artifactId>guice</artifactId>
21-
<version>4.0</version>
21+
<version>7.0.0</version>
2222
<exclusions>
2323
<exclusion>
2424
<groupId>com.google.guava</groupId>
@@ -30,13 +30,13 @@
3030
<dependency>
3131
<groupId>com.google.guava</groupId>
3232
<artifactId>guava</artifactId>
33-
<version>32.1.2-jre</version>
33+
<version>33.1.0-jre</version>
3434
</dependency>
3535

3636
<dependency>
3737
<groupId>com.google.code.gson</groupId>
3838
<artifactId>gson</artifactId>
39-
<version>2.8.2</version>
39+
<version>2.10.1</version>
4040
</dependency>
4141
<dependency>
4242
<groupId>commons-logging</groupId>

engine/core/src/main/java/com/codingame/gameengine/core/GameEngineModule.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22

33
import java.lang.reflect.Type;
44

5-
import javax.inject.Provider;
6-
75
import com.google.inject.AbstractModule;
86
import com.google.inject.Injector;
97
import com.google.inject.Key;
8+
import com.google.inject.Provider;
109
import com.google.inject.Provides;
1110
import com.google.inject.Singleton;
1211
import com.google.inject.util.Types;

playground/misc/misc-3-release-notes.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22

33
The CodinGame SDK is regularly updated and improved. This document lets you know what changed in the latest releases.
44

5-
## Next version
5+
## 4.5.0
6+
7+
### 🎁 Features
8+
9+
- Upgraded configuration to use Java 17
610

711
### 🐞 Bug fix
812

pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@
1111
<url>https://www.codingame.com</url>
1212

1313
<properties>
14-
<maven.compiler.source>1.8</maven.compiler.source>
15-
<maven.compiler.target>1.8</maven.compiler.target>
14+
<java.version>17</java.version>
15+
<maven.compiler.source>17</maven.compiler.source>
16+
<maven.compiler.target>17</maven.compiler.target>
1617
</properties>
1718

1819
<modules>

runner/src/main/java/com/codingame/gameengine/runner/ConfigHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ public GameConfig findConfig(Path rootDir) throws IOException {
404404
}
405405
}
406406
}
407-
} else if ("stub.txt".equals(fileName)) {
407+
} else if ("stub.txt".equals(fileName) || "stub.json".equals(fileName)) {
408408
questionConfig.setStubGenerator(FileUtils.readFileToString(p.toFile(), StandardCharsets.UTF_8));
409409
} else if (statementMatcher.matches()) {
410410
String content = FileUtils.readFileToString(p.toFile(), StandardCharsets.UTF_8);

0 commit comments

Comments
 (0)