diff --git a/.idea/misc.xml b/.idea/misc.xml index e55b9a6b..285022f9 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,9 +1,10 @@ + - + diff --git a/.idea/resourceBundles.xml b/.idea/resourceBundles.xml new file mode 100644 index 00000000..06924b0f --- /dev/null +++ b/.idea/resourceBundles.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + messages + + + \ No newline at end of file diff --git a/.idea/runConfigurations/Main.xml b/.idea/runConfigurations/Main.xml index 8f2ab721..89fc72ca 100644 --- a/.idea/runConfigurations/Main.xml +++ b/.idea/runConfigurations/Main.xml @@ -1,7 +1,5 @@ - - \ No newline at end of file + diff --git a/.idea/runConfigurations/Unit_tests.xml b/.idea/runConfigurations/Unit_tests.xml index 1b7ad51d..5bb52a48 100644 --- a/.idea/runConfigurations/Unit_tests.xml +++ b/.idea/runConfigurations/Unit_tests.xml @@ -4,7 +4,7 @@ @@ -12,11 +12,16 @@ \ No newline at end of file diff --git a/CHANGELOG b/CHANGELOG index 163d3b25..5b8b3cf0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Changes in 3.9.2 (unreleased): +- Linux: specify Java 17 as minimum required version in .deb and .rpm packages + Changes in 3.9.1: - Mac: fix permissions in bundled JRE, so that MAC address scanning would work #384 - Linux startup fix if JAVA_HOME has spaces #391 diff --git a/build.gradle b/build.gradle index f63a51dd..4646b274 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,7 @@ String exec(def line, String dir = ".", boolean failOnError = true) { version = exec("git describe --tags", ".", false) ?: "unknown" -sourceCompatibility = targetCompatibility = 11 +sourceCompatibility = targetCompatibility = 17 def javaModules = ["java.base", "java.prefs", "java.logging", "jdk.crypto.ec"] project.ext.set("javaModules", javaModules) @@ -65,7 +65,7 @@ configurations { } dependencies { - def swtVersion = '3.123.0' + def swtVersion = '3.130.0' linux64 "org.eclipse.platform:org.eclipse.swt.gtk.linux.x86_64:${swtVersion}" win64 "org.eclipse.platform:org.eclipse.swt.win32.win32.x86_64:${swtVersion}" macX86 "org.eclipse.platform:org.eclipse.swt.cocoa.macosx.x86_64:${swtVersion}" diff --git a/ext/deb-bundle/DEBIAN/control b/ext/deb-bundle/DEBIAN/control index 19f9cb60..42c1f2f5 100644 --- a/ext/deb-bundle/DEBIAN/control +++ b/ext/deb-bundle/DEBIAN/control @@ -4,7 +4,7 @@ Version: VERSION Priority: optional Architecture: ARCH Installed-Size: 1940 -Depends: java-runtime (>= 11) +Depends: java-runtime (>= 17) Maintainer: Anton Keks License: GPL-2 Description: Angry IP Scanner - fast and friendly IP Scanner diff --git a/ext/rpmbuild/SPECS/ipscan.spec b/ext/rpmbuild/SPECS/ipscan.spec index aaf7b58d..396b6845 100644 --- a/ext/rpmbuild/SPECS/ipscan.spec +++ b/ext/rpmbuild/SPECS/ipscan.spec @@ -7,7 +7,7 @@ Group: Applications/Internet BuildRoot: %{_builddir}/%{name} URL: https://angryip.org/ Packager: Anton Keks -Requires: java >= 11 +Requires: java >= 17 %description Angry IP Scanner is a cross-platform network scanner written in Java.