Skip to content

Commit 515f726

Browse files
committed
Update to Java 17, update dependencies
1 parent 073c6b3 commit 515f726

File tree

7 files changed

+12
-22
lines changed

7 files changed

+12
-22
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Set up JDK 16
1616
uses: actions/setup-java@v1
1717
with:
18-
java-version: '16'
18+
java-version: '17'
1919
- name: Install Linux dependencies
2020
run: brew install libimobiledevice libirecovery && P=/home/linuxbrew/.linuxbrew/lib; sudo ln -s $P/libimobiledevice-1.0.so $P/libirecovery-1.0.so $P/libplist-2.0.so /usr/lib/
2121
if: runner.os == 'Linux'

.idea/compiler.xml

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

.idea/misc.xml

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

.idea/runConfigurations.xml

Lines changed: 0 additions & 10 deletions
This file was deleted.

build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
2222
plugins {
2323
id 'java'
2424
id 'application'
25-
id 'com.github.ben-manes.versions' version '0.39.0'
26-
id 'org.beryx.jlink' version '2.24.2'
27-
id 'org.openjfx.javafxplugin' version '0.0.10'
25+
id 'com.github.ben-manes.versions' version '0.41.0'
26+
id 'org.beryx.jlink' version '2.24.4'
27+
id 'org.openjfx.javafxplugin' version '0.0.11'
2828

2929
id 'idea'
3030
}
@@ -42,26 +42,26 @@ def os = DefaultNativePlatform.currentOperatingSystem
4242

4343
startScripts.enabled = distZip.enabled = distTar.enabled = false
4444

45-
java.toolchain.languageVersion = JavaLanguageVersion.of(16)
45+
java.toolchain.languageVersion = JavaLanguageVersion.of(17)
4646

4747
repositories {
4848
mavenCentral()
4949
}
5050

5151
dependencies {
52-
implementation group: 'org.json', name: 'json', version: '20210307'
52+
implementation group: 'org.json', name: 'json', version: '20211205'
5353
implementation ('de.jangassen:nsmenufx:3.1.0') {
5454
exclude group: 'net.java.dev.jna', module: 'jna' //separate jna version
5555
}
56-
implementation 'net.java.dev.jna:jna-jpms:5.9.0'
56+
implementation 'net.java.dev.jna:jna-jpms:5.10.0'
5757
implementation group: 'org.apache.commons', name: 'commons-compress', version: '1.21'
5858

59-
testImplementation 'org.junit.jupiter:junit-jupiter:5.8.1'
59+
testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
6060
testImplementation group: 'org.testfx', name: 'openjfx-monocle', version: 'jdk-12.0.1+2'
6161
}
6262

6363
javafx {
64-
version = '16'
64+
version = '17.0.2'
6565
modules = [ 'javafx.controls', 'javafx.fxml' ]
6666
}
6767

dist/macos/Contents/Frameworks/libjnidispatch.jnilib

100755100644
-71.8 KB
Binary file not shown.
Lines changed: 1 addition & 1 deletion
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-7.0-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)