Skip to content

Commit b430005

Browse files
committed
Upgrade to Java 17 builds.
1 parent 5f49cea commit b430005

File tree

4 files changed

+20
-11
lines changed

4 files changed

+20
-11
lines changed

.github/workflows/development.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@ jobs:
1313

1414
steps:
1515
- uses: actions/checkout@v2
16-
- name: Set up JDK 1.8
17-
uses: actions/setup-java@v1
16+
- name: Set up JDK 17
17+
uses: actions/setup-java@v2
1818
with:
19-
java-version: 1.8
20-
java-package: jdk+fx
19+
distribution: 'temurin'
20+
java-version: '17'
21+
java-package: jdk
2122
- name: Grant execute permission for gradlew
2223
run: chmod +x gradlew
2324
- name: Build with Gradle

.github/workflows/stable.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@ jobs:
1717
- uses: actions/checkout@v2
1818
with:
1919
ref: stable
20-
- name: Set up JDK 1.8
21-
uses: actions/setup-java@v1
20+
- name: Set up JDK 17
21+
uses: actions/setup-java@v2
2222
with:
23-
java-version: 1.8
24-
java-package: jdk+fx
23+
distribution: 'temurin'
24+
java-version: '17'
25+
java-package: jdk
2526
- name: Grant execute permission for gradlew
2627
run: chmod +x gradlew
2728
- name: Build with Gradle

build.gradle

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
apply plugin: 'java'
2-
apply plugin: 'idea'
1+
plugins {
2+
id 'org.openjfx.javafxplugin' version '0.0.10'
3+
}
34

45
repositories {
56
mavenLocal()
@@ -24,6 +25,12 @@ dependencies {
2425
bundled 'org.jocl:jocl:2.0.2'
2526
}
2627

28+
javafx {
29+
version = '17'
30+
modules = ['javafx.base', 'javafx.controls', 'javafx.fxml']
31+
configuration = 'provided'
32+
}
33+
2734
processResources {
2835
from "src/main/opencl/include", { into "kernel" }
2936
}
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)