Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating to JDK 17 #83

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,19 @@ Because ZomboidDoc reads directly from game code the compiled Lua library is gua
### Prerequisites

- Project Zomboid[<sup>?</sup>](#requirements "tested with 41.50-IWBUMS")
- [JDK 8](https://adoptopenjdk.net/?variant=openjdk8&jvmVariant=hotspot)[<sup>?</sup>](#requirements "tested with OpenJDK 1.8.0_282")
- [JDK 17](https://adoptopenjdk.net/?variant=openjdk17&jvmVariant=hotspot)[<sup>?</sup>](#requirements "tested with OpenJDK 17.0.7+7")

### Config

**Changing the Gradle JVM to version 17**

1) Go to File/Settings on the IntelliJ settings.
2) Navigate to Build, Execution, Deployment/Build Tools/Gradle
3) Set "Gradle JVM" to JDK 17

**Setting project SDK to version 17**
1) Go to File/Project Structure/Project
2) Set "Project SDK" to the same version as your Gradle JDK

### Gradle

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ application {

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(8))
languageVersion.set(JavaLanguageVersion.of(17))
vendor = JvmVendorSpec.ADOPTOPENJDK
}
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionSha256Sum=1433372d903ffba27496f8d5af24265310d2da0d78bf6b4e5138831d4fe066e9
2 changes: 1 addition & 1 deletion zomboid.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ tasks.register('decompileZomboid', JavaExec.class) {
}
//noinspection GroovyAssignabilityCheck,GroovyAccessibility
it.javaLauncher = javaToolchains.launcherFor {
languageVersion = JavaLanguageVersion.of(11)
languageVersion = JavaLanguageVersion.of(17)
}
it.classpath files("$ideaHome/plugins/java-decompiler/lib/java-decompiler.jar")
it.main 'org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler'
Expand Down