Skip to content

Commit 1d86705

Browse files
committed
update the Gradle build tool to v9.0.0, JDK 17+ required to build
1 parent 722acbc commit 1d86705

6 files changed

Lines changed: 11 additions & 26 deletions

File tree

.github/workflows/push.yml

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,14 @@ name: CI at GitHub
55
on: [push]
66

77
jobs:
8-
Java8-Linux:
9-
if: contains(toJson(github.event.commits), '[ci skip] ') == false
10-
runs-on: ubuntu-22.04
11-
steps:
12-
- uses: actions/setup-java@v4
13-
with:
14-
distribution: 'zulu'
15-
java-version: 8
16-
- uses: actions/checkout@v5
17-
- run: ./gradlew build javadoc --console=plain --stacktrace
18-
19-
Java11-Linux:
8+
Java17-Linux:
209
if: contains(toJson(github.event.commits), '[ci skip] ') == false
2110
runs-on: ubuntu-24.04
2211
steps:
2312
- uses: actions/setup-java@v4
2413
with:
2514
distribution: 'zulu'
26-
java-version: 11
15+
java-version: 17
2716
- uses: actions/checkout@v5
2817
- uses: gradle/actions/wrapper-validation@v4
2918
- run: ./gradlew build javadoc --console=plain --stacktrace

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ DacWizard was designed for a desktop environment with:
2727
## How to build and run DacWizard from source
2828

2929
1. Install a 64-bit [Java Development Kit (JDK)][adoptium],
30+
version 17 or higher,
3031
if you don't already have one.
3132
2. Point the `JAVA_HOME` environment variable to your JDK installation:
3233
(In other words, set it to the path of a directory/folder

build.gradle.kts

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ plugins {
99

1010
val isMacOS = DefaultNativePlatform.getCurrentOperatingSystem().isMacOsX()
1111
val javaVersion = JavaVersion.current()
12-
val enableNativeAccess = javaVersion.isCompatibleWith(JavaVersion.VERSION_17)
1312

1413
java {
1514
sourceCompatibility = JavaVersion.VERSION_1_8
@@ -43,16 +42,14 @@ checkstyle {
4342

4443
tasks.withType<JavaCompile>().all { // Java compile-time options:
4544
options.compilerArgs.add("-Xdiags:verbose")
46-
if (javaVersion.isCompatibleWith(JavaVersion.VERSION_20)) {
47-
// Suppress warnings that source value 8 is obsolete.
48-
options.compilerArgs.add("-Xlint:-options")
49-
}
45+
46+
// Suppress warnings that source value 8 is obsolete:
47+
options.compilerArgs.add("-Xlint:-options")
48+
5049
options.compilerArgs.add("-Xlint:unchecked")
5150
//options.setDeprecation(true) // to provide detailed deprecation warnings
5251
options.encoding = "UTF-8"
53-
if (javaVersion.isCompatibleWith(JavaVersion.VERSION_1_10)) {
54-
options.release = 8
55-
}
52+
options.release = 8
5653
}
5754

5855
tasks.withType<JavaExec>().all { // Java runtime options:
@@ -63,9 +60,7 @@ tasks.withType<JavaExec>().all { // Java runtime options:
6360
//args("--verbose") // to enable additional log output
6461
classpath = sourceSets.main.get().getRuntimeClasspath()
6562
enableAssertions = true
66-
if (enableNativeAccess) {
67-
jvmArgs("--enable-native-access=ALL-UNNAMED") // suppress System::load() warning
68-
}
63+
jvmArgs("--enable-native-access=ALL-UNNAMED") // suppress System::load() warning
6964
//jvmArgs("-verbose:gc")
7065
jvmArgs("-Xms1024m", "-Xmx1024m") // to enlarge the Java heap
7166
//jvmArgs("-XX:+UseG1GC", "-XX:MaxGCPauseMillis=10")

gradle/wrapper/gradle-wrapper.jar

1.65 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)