drop Java 7 support

SinSiXX · Jul 15, 2019 · 189ac17 · 189ac17
1 parent f2b366c
commit 189ac17
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 This is the source code of Angry IP Scanner, licensed with GPL v2. [Official site](https://angryip.org/)
 
-The code is written mostly in Java (currently, source level 1.7).
+The code is written mostly in Java (currently, source level 1.8).
 IntelliJ IDEA is recommended for coding (Community Edition is fine).
 
 Projects supports building for Linux, Windows and Mac OS X.

diff --git a/build.gradle b/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'java'
 
-version = '3.5.5'
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+version = '3.6.0'
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 def osName = System.getProperty("os.name")
 def is64 = System.getProperty("os.arch").contains("64")

diff --git a/ext/deb-bundle/DEBIAN/control b/ext/deb-bundle/DEBIAN/control
@@ -4,7 +4,7 @@ Version: VERSION-1
 Priority: optional
 Architecture: ARCH
 Installed-Size: 1940
-Depends: openjdk-11-jre | openjdk-10-jre | oracle-java10-installer | openjdk-9-jre | oracle-java9-installer | openjdk-8-jre | oracle-java8-installer | openjdk-7-jre | oracle-java7-installer
+Depends: openjdk-12-jre | openjdk-11-jre | openjdk-10-jre | oracle-java10-installer | openjdk-9-jre | oracle-java9-installer | openjdk-8-jre | oracle-java8-installer
 Maintainer: Anton Keks <[email protected]>
 Description: Angry IP Scanner - fast and friendly IP Scanner
  Angry IP Scanner is a cross-platform network scanner written in Java.

diff --git a/ext/launch4j/ipscan.xml b/ext/launch4j/ipscan.xml
@@ -12,7 +12,7 @@
   <manifest>../../ext/launch4j/ipscan.manifest</manifest>
   <icon>../../resources/images/icon.ico</icon>
   <jre>
-    <minVersion>1.7.0</minVersion>
+    <minVersion>1.8.0</minVersion>
   </jre>
   <versionInfo>
     <fileVersion>3.0.0.0</fileVersion>

diff --git 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:			jre >= 1.7.0
+Requires:			jre >= 1.8.0
 
 %description
 Angry IP Scanner is a cross-platform network scanner written in Java.

diff --git a/ext/win-installer/Installer/detectjvm.xml b/ext/win-installer/Installer/detectjvm.xml
@@ -15,7 +15,7 @@
   <jre>
     <path></path>
     <bundledJre64Bit>false</bundledJre64Bit>
-    <minVersion>1.7.0</minVersion>
+    <minVersion>1.8.0</minVersion>
     <maxVersion></maxVersion>
     <jdkPreference>preferJre</jdkPreference>
   </jre>

diff --git a/ipscan.iml b/ipscan.iml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.id="ipscan" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="3.5.5" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager">
-    <output url="file://$MODULE_DIR$/build/classes/java/main" />
-    <output-test url="file://$MODULE_DIR$/build/classes/java/test" />
+    <output url="file://$MODULE_DIR$/out/production/classes" />
+    <output-test url="file://$MODULE_DIR$/out/test/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/ext/rocksaw/src" isTestSource="false" />