mirrors/ipscan
2
0
Fork 0
mirror of https://github.com/angryip/ipscan.git synced 2025-10-26 11:18:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

#455 update SWT and minimum Java version to 17

Browse Source
This commit is contained in:
Anton Keks 2025-08-13 15:33:50 +03:00
parent e98ae585aa
commit bb2652b947
8 changed files with 56 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/misc.xml generated
View File

@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="FrameworkDetectionExcludesConfiguration">
<file type="web" url="file://$PROJECT_DIR$" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17-openjdk" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="SuppressKotlinCodeStyleNotification">

39
.idea/resourceBundles.xml generated Normal file
View File

@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ResourceBundleManager">
<file url="file://$PROJECT_DIR$/resources/messages.properties" />
<file url="file://$PROJECT_DIR$/resources/messages_de.properties" />
<file url="file://$PROJECT_DIR$/resources/messages_es.properties" />
<file url="file://$PROJECT_DIR$/resources/messages_et.properties" />
<file url="file://$PROJECT_DIR$/resources/messages_fi.properties" />
<file url="file://$PROJECT_DIR$/resources/messages_fr.properties" />
<file url="file://$PROJECT_DIR$/resources/messages_hu.properties" />
<file url="file://$PROJECT_DIR$/resources/messages_it.properties" />
<file url="file://$PROJECT_DIR$/resources/messages_ku.properties" />
<file url="file://$PROJECT_DIR$/resources/messages_lt.properties" />
<file url="file://$PROJECT_DIR$/resources/messages_pt_BR.properties" />
<file url="file://$PROJECT_DIR$/resources/messages_ru.properties" />
<file url="file://$PROJECT_DIR$/resources/messages_tr.properties" />
<file url="file://$PROJECT_DIR$/resources/messages_zh_CN.properties" />
<file url="file://$PROJECT_DIR$/resources/messages_zh_TW.properties" />
<custom-resource-bundle>
<file value="file://$PROJECT_DIR$/resources/messages.properties" />
<file value="file://$PROJECT_DIR$/resources/messages_de.properties" />
<file value="file://$PROJECT_DIR$/resources/messages_es.properties" />
<file value="file://$PROJECT_DIR$/resources/messages_et.properties" />
<file value="file://$PROJECT_DIR$/resources/messages_fi.properties" />
<file value="file://$PROJECT_DIR$/resources/messages_fr.properties" />
<file value="file://$PROJECT_DIR$/resources/messages_gr.properties" />
<file value="file://$PROJECT_DIR$/resources/messages_hu.properties" />
<file value="file://$PROJECT_DIR$/resources/messages_it.properties" />
<file value="file://$PROJECT_DIR$/resources/messages_ku.properties" />
<file value="file://$PROJECT_DIR$/resources/messages_lt.properties" />
<file value="file://$PROJECT_DIR$/resources/messages_pt_BR.properties" />
<file value="file://$PROJECT_DIR$/resources/messages_ru.properties" />
<file value="file://$PROJECT_DIR$/resources/messages_tr.properties" />
<file value="file://$PROJECT_DIR$/resources/messages_zh_CN.properties" />
<file value="file://$PROJECT_DIR$/resources/messages_zh_TW.properties" />
<base-name>messages</base-name>
</custom-resource-bundle>
</component>
</project>

4
.idea/runConfigurations/Main.xml generated
View File

@ -1,7 +1,5 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Main" type="Application" factoryName="Application">
<option name="ALTERNATIVE_JRE_PATH" value="11" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<option name="MAIN_CLASS_NAME" value="net.azib.ipscan.Main" />
<module name="ipscan.main" />
<option name="VM_PARAMETERS" value="-Djava.util.logging.config.file=config/logging.properties" />
@ -9,4 +7,4 @@
<option name="Make" enabled="true" />
</method>
</configuration>
</component>
</component>

9
.idea/runConfigurations/Unit_tests.xml generated
View File

@ -4,7 +4,7 @@
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="--tests *" />
<option name="scriptParameters" value="" />
<option name="taskDescriptions">
<list />
</option>
@ -12,11 +12,16 @@
<list>
<option value=":cleanTest" />
<option value=":test" />
<option value="--tests" />
<option value="*" />
</list>
</option>
<option name="vmOptions" value="" />
</ExternalSystemSettings>
<GradleScriptDebugEnabled>false</GradleScriptDebugEnabled>
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>true</RunAsTest>
<method v="2" />
</configuration>
</component>

3
CHANGELOG
View File

@ -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

4
build.gradle
View File

@ -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}"

2
ext/deb-bundle/DEBIAN/control
View File

@ -4,7 +4,7 @@ Version: VERSION
Priority: optional
Architecture: ARCH
Installed-Size: 1940
Depends: java-runtime (>= 11)
Depends: java-runtime (>= 17)
Maintainer: Anton Keks <anton@azib.net>
License: GPL-2
Description: Angry IP Scanner - fast and friendly IP Scanner

2
ext/rpmbuild/SPECS/ipscan.spec
View File

@ -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.