Skip to content

Commit

Permalink
Updated JDK to 21.0.0+35
Browse files Browse the repository at this point in the history
  • Loading branch information
bwRavencl committed Sep 20, 2023
1 parent 2c11455 commit f9a7fd5
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

env:
JAVA_DISTRIBUTION: zulu
JAVA_VERSION: 20.0.2+9
JAVA_VERSION: 21.0.0+35
GRADLE_OPTS: -Dorg.gradle.daemon=false

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 4 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ plugins {
version = Grgit.open(dir: projectDir).describe(longDescr: true).replaceFirst(Pattern.quote('-'), '.').replaceFirst(Pattern.quote('-g'), '-')

java {
sourceCompatibility = JavaVersion.VERSION_20
targetCompatibility = JavaVersion.VERSION_20
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}

base {
Expand All @@ -42,8 +42,6 @@ ext {
tmpDir = layout.buildDirectory.dir('tmp')
runtimeDir = tmpDir.map { it.dir('runtime') }

enablePreviewJvmArg = '--enable-preview'

linuxAddOpensValue = "java.desktop/sun.awt.X11=${project.application.mainModule.get()}"
linuxJvmArgs = [
"--add-opens=$linuxAddOpensValue"
Expand Down Expand Up @@ -362,15 +360,11 @@ tasks.spotlessXml.dependsOn copyGameControllerDB
compileJava {
dependsOn generateModuleInfo, generateVersion
source generateVersion.outputs.files, sourceSets.main.java
options.compilerArgs += [
'-Xlint:deprecation',
enablePreviewJvmArg
]
options.compilerArgs += '-Xlint:deprecation'
options.encoding = 'UTF-8'
}

run {
jvmArgs += enablePreviewJvmArg
if (os.linux)
jvmArgs += linuxJvmArgs
}
Expand Down Expand Up @@ -429,9 +423,7 @@ tasks.register('jpackage', Exec) {
"Copyright ${new Date().format('yyyy')} Matteo Hausner",
'--vendor',
'Matteo Hausner',
'--verbose',
'--java-options',
enablePreviewJvmArg
'--verbose'
]
if (os.linux)
linuxJvmArgs.each { commandLineParts.addAll(['--java-options', it]) }
Expand Down

0 comments on commit f9a7fd5

Please sign in to comment.