Update dependencies & slient proguard

- Fix some Java errors

Author: QuentiumYT

api/build.gradle

@@ -1,3 +1,3 @@
 apply plugin: 'java'
 
-version = '1.0.0'
+version = parent.version

app/build.gradle

@@ -1,9 +1,8 @@
 apply plugin: 'java'
 
 dependencies {
-    provided 'com.yuvimasory:orange-extensions:1.3.0'   // OSX support
-    compile project(':api')
-    runtime project(':services')
+    implementation project(':api')
+    runtimeOnly project(':services')
 }
 
 version = parent.version

app/src/main/java/org/jd/gui/OsxApp.java

@@ -7,14 +7,13 @@
 
 package org.jd.gui;
 
-import com.apple.eawt.Application;
+import java.awt.Desktop;
 
 public class OsxApp extends App {
 
     @SuppressWarnings("unchecked")
     public static void main(String[] args) {
-        // Create an instance of the mac OSX Application class
-        Application application = Application.getApplication();
+        Desktop application = Desktop.getDesktop();
 
         App.main(args);
 

build.gradle

@@ -1,11 +1,17 @@
 buildscript {
     repositories {
+        mavenCentral()
         jcenter()
+        maven {
+            url 'https://plugins.gradle.org/m2/'
+        }
     }
     dependencies {
-        classpath 'com.netflix.nebula:gradle-ospackage-plugin:5.3.0'    // RPM & DEB support
-        classpath 'edu.sc.seis.gradle:launch4j:2.4.4'
-        classpath 'net.sf.proguard:proguard-gradle:6.1.0'
+        classpath 'com.netflix.nebula:gradle-ospackage-plugin:9.1.1'
+        classpath 'edu.sc.seis.launch4j:launch4j:3.0.5'
+        classpath('com.guardsquare:proguard-gradle:7.3.2') {
+            exclude group: 'com.android.tools.build'
+        }
     }
 }
 
@@ -15,7 +21,7 @@ apply plugin: 'edu.sc.seis.launch4j'
 apply plugin: 'nebula.ospackage'
 
 // Common configuration //
-rootProject.version='1.6.6'
+rootProject.version = '1.7.0'
 rootProject.ext.set('jdCoreVersion', '1.1.3')
 targetCompatibility = '1.8'
 
@@ -63,7 +69,7 @@ jar {
     subprojects.each { subproject ->
         from subproject.sourceSets.main.output.classesDirs
         from subproject.sourceSets.main.output.resourcesDir
-        deps += subproject.configurations.runtime - subproject.configurations.provided
+        deps += subproject.configurations.runtimeClasspath - subproject.configurations.provided
     }
     subprojects.each { subproject ->
         deps -= subproject.jar.archivePath
@@ -114,10 +120,10 @@ launch4j {
 
     version = textVersion = project.version
     fileDescription = productName = 'JD-GUI'
-    errTitle 'JD-GUI Windows Wrapper'
-    copyright 'JD-GUI (C) 2008-2019 Emmanuel Dupuy'
-    icon projectDir.path + '/src/launch4j/resources/images/jd-gui.ico'
-    jar projectDir.path + '/' + proguard.outJarFiles[0]
+    errTitle = 'JD-GUI Windows Wrapper'
+    copyright = 'JD-GUI (C) 2008-2019 Emmanuel Dupuy'
+    icon = projectDir.path + '/src/launch4j/resources/images/jd-gui.ico'
+    jarTask = proguard
     bundledJrePath = '%JAVA_HOME%'
 }
 

services/build.gradle

@@ -1,20 +1,20 @@
 apply plugin: 'java'
 
 dependencies {
-    compile 'com.fifesoft:rsyntaxtextarea:3.0.4'
-    compile 'org.ow2.asm:asm:7.1'
-    compile 'org.jd:jd-core:' + parent.jdCoreVersion
-    compile project(':api')
-    testCompile 'junit:junit:4.12'
+    implementation 'com.fifesoft:rsyntaxtextarea:3.3.4'
+    implementation 'org.ow2.asm:asm:9.5'
+    implementation 'org.jd:jd-core:' + parent.jdCoreVersion
+    implementation project(':api')
+    testImplementation 'junit:junit:4.13.2'
 }
 
 version = parent.version
 
 // ANTLR //
 ext.antlr4 = [
-        antlrSource: 'src/main/antlr',
-        destinationDir: 'src-generated/antlr/java',
-        grammarPackage: 'org.jd.gui.util.parser.antlr'
+    antlrSource: 'src/main/antlr',
+    destinationDir: 'src-generated/antlr/java',
+    grammarPackage: 'org.jd.gui.util.parser.antlr'
 ]
 
 configurations {
@@ -24,8 +24,8 @@ configurations {
 }
 
 dependencies {
-    compile 'org.antlr:antlr4-runtime:4.5'
-    antlr4 'org.antlr:antlr4:4.5'
+    implementation 'org.antlr:antlr4-runtime:4.13.1'
+    antlr4 'org.antlr:antlr4:4.13.1'
 }
 
 task antlr4OutputDir() {

services/src/main/java/org/jd/gui/model/container/GenericContainer.java

@@ -170,7 +170,7 @@ protected Collection<Container.Entry> loadChildrenFromFileEntry() throws IOExcep
             tmpFile.deleteOnExit();
             Files.copy(fsPath, tmpPath);
 
-            FileSystem subFileSystem = FileSystems.newFileSystem(tmpPath, null);
+            FileSystem subFileSystem = FileSystems.newFileSystem(tmpPath, (ClassLoader) null);
 
             if (subFileSystem != null) {
                 Iterator<Path> rootDirectories = subFileSystem.getRootDirectories().iterator();

services/src/main/java/org/jd/gui/view/component/AbstractTextPage.java

@@ -132,7 +132,7 @@ public void mouseClicked(MouseEvent e) {
         });
 
         Gutter gutter = scrollPane.getGutter();
-        gutter.setFoldIcons(COLLAPSED_ICON, EXPANDED_ICON);
+        // gutter.setFoldIcons(COLLAPSED_ICON, EXPANDED_ICON);
         gutter.setFoldIndicatorForeground(gutter.getBorderColor());
 
         add(scrollPane, BorderLayout.CENTER);

src/proguard/resources/proguard.config.txt

@@ -1,7 +1,7 @@
 # java -jar proguard.jar @proguard.config.txt
 
-#-injars       jd-gui-1.4.2.jar
-#-outjars      jd-gui-1.4.2-min.jar
+#-injars       jd-gui-1.7.0.jar
+#-outjars      jd-gui-1.7.0-min.jar
 #-libraryjars  C:/Program Files/Java/jre1.8.0_121/lib/rt.jar
 #-printmapping myapplication.map
 
@@ -13,7 +13,6 @@
     public static void main(java.lang.String[]);
 }
 
--dontwarn com.apple.eawt.**
 -keepattributes Signature
 
 -keep public interface org.jd.gui.api.** {*;}
@@ -38,3 +37,8 @@
 -adaptresourcefilenames ErrorStrip.properties
 -adaptresourcefilenames RSyntaxTextArea.properties
 -adaptresourcefilenames FocusableTip.properties
+
+-ignorewarning
+
+-dontpreverify
+-dontoptimize