From 7b4321ecee403c6c73d538ff32c150f8a92e4699 Mon Sep 17 00:00:00 2001
From: Skylot <skylot@gmail.com>
Date: Sat, 2 Jun 2018 14:39:33 +0300
Subject: [PATCH] gui: fix build for java 10 and update dependencies (#291)

---
 .gitignore                                    |   1 -
 .travis.yml                                   |  64 ++++++++++--------
 build.gradle                                  |   4 +-
 gradle.properties                             |   1 +
 gradle/wrapper/gradle-wrapper.jar             | Bin 54333 -> 54413 bytes
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 jadx-cli/build.gradle                         |   2 +-
 jadx-core/build.gradle                        |  10 +--
 .../jadx/core/dex/visitors/ModVisitor.java    |  18 ++---
 .../core/dex/visitors/SimplifyVisitor.java    |   4 +-
 .../main/java/jadx/core/utils/DebugUtils.java |   2 +
 jadx-gui/build.gradle                         |  11 ++-
 .../src/main/java/jadx/gui/ui/CodePanel.java  |   2 +-
 .../jadx/gui/utils/TextStandardActions.java   |  16 ++---
 14 files changed, 71 insertions(+), 66 deletions(-)
 create mode 100644 gradle.properties

diff --git a/.gitignore b/.gitignore
index ead4e1c4..902e0fea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,6 @@ build/
 classes/
 idea/
 .gradle/
-gradle.properties
 
 jadx-output/
 *-tmp/
diff --git a/.travis.yml b/.travis.yml
index 3a060eb0..7087a01d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,39 +1,49 @@
 language: java
-jdk:
-    - oraclejdk8
+sudo: false
+dist: trusty
+
+before_install:
+  - wget https://github.com/sormuras/bach/raw/master/install-jdk.sh
+  - chmod +x gradlew
 
 env:
-    - TERM=dumb GRADLE_OPTS="-Dorg.gradle.daemon=false"
+  global:
+    - TERM=dumb
 
-before_install:
-    - chmod +x gradlew
+matrix:
+  include:
+    - env: JDK=oracle-8
+      jdk: oraclejdk8
+    - env: JDK=oracle-10
+      install: . ./install-jdk.sh -F 10 -L BCL
 
 script:
-    - sed -i " 1 s/.*/&-b$TRAVIS_BUILD_NUMBER-$(git rev-parse --short HEAD)/" version
-    - cat version
-    - sed -i "s/BUILD_VERSION/$(head -c -1 version)/g" bintray.json
-    - ./gradlew clean build
+  - java -version
+  - sed -i " 1 s/.*/&-b$TRAVIS_BUILD_NUMBER-$(git rev-parse --short HEAD)/" version
+  - cat version
+  - sed -i "s/BUILD_VERSION/$(head -c -1 version)/g" bintray.json
+  - ./gradlew clean build
 
 after_success:
-    - ./gradlew clean build jacocoTestReport
-    - bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports"
-    - ./gradlew clean sonarqube -Dsonar.host.url=$SONAR_HOST -Dsonar.organization=$SONAR_ORG -Dsonar.login=$SONAR_TOKEN
-    - ./gradlew clean dist
+  - test $JDK = "oracle-8" && ./gradlew clean build jacocoTestReport && bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports"
+  - test $JDK = "oracle-8" && ./gradlew clean sonarqube -Dsonar.host.url=$SONAR_HOST -Dsonar.organization=$SONAR_ORG -Dsonar.login=$SONAR_TOKEN || echo "Skip sonar build and upload"
 
-deploy:
-    provider: bintray
-    edge:
-      branch: v1.8.47
-    file: bintray.json
-    user: skylot
-    key: $BINTRAY_KEY
-    skip_cleanup: true
-    on:
-      branch: master
-      tags: false
+before_deploy:
+  - ./gradlew clean dist
 
-sudo: false
+deploy:
+  provider: bintray
+  edge:
+    branch: v1.8.47
+  file: bintray.json
+  user: skylot
+  key: $BINTRAY_KEY
+  skip_cleanup: true
+  on:
+    branch: master
+    tags: false
+    condition: $JDK = oracle-8
 
 notifications:
-    email:
-        - skylot@gmail.com
+  email:
+    - skylot@gmail.com
diff --git a/build.gradle b/build.gradle
index 7e43a940..531f3d30 100644
--- a/build.gradle
+++ b/build.gradle
@@ -41,7 +41,7 @@ allprojects {
         testCompile 'ch.qos.logback:logback-classic:1.2.3'
         testCompile 'junit:junit:4.12'
         testCompile 'org.hamcrest:hamcrest-library:1.3'
-        testCompile 'org.mockito:mockito-core:2.15.0'
+        testCompile 'org.mockito:mockito-core:2.18.3'
         testCompile 'org.spockframework:spock-core:1.1-groovy-2.4'
         testCompile 'cglib:cglib-nodep:3.2.6'
     }
@@ -53,7 +53,7 @@ allprojects {
     }
 
     jacoco {
-        toolVersion = "0.8.0"
+        toolVersion = "0.8.1"
     }
     jacocoTestReport {
         reports {
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 00000000..6b1823d8
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1 @@
+org.gradle.daemon=false
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index c44b679acd3f794ddbb3aa5e919244914911014a..91ca28c8b802289c3a438766657a5e98f20eff03 100644
GIT binary patch
delta 7643
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

delta 7476
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 568c50bf..16d28051 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-bin.zip
diff --git a/jadx-cli/build.gradle b/jadx-cli/build.gradle
index e77c09f9..c1bb1679 100644
--- a/jadx-cli/build.gradle
+++ b/jadx-cli/build.gradle
@@ -5,7 +5,7 @@ applicationName = 'jadx'
 
 dependencies {
     compile(project(':jadx-core'))
-    compile 'com.beust:jcommander:1.72'
+    compile 'com.beust:jcommander:1.74'
     compile 'ch.qos.logback:logback-classic:1.2.3'
 }
 
diff --git a/jadx-core/build.gradle b/jadx-core/build.gradle
index 54c5dc95..46471a64 100644
--- a/jadx-core/build.gradle
+++ b/jadx-core/build.gradle
@@ -5,12 +5,12 @@ dependencies {
 
     compile files('lib/dx-1.14.jar')
     compile 'commons-io:commons-io:2.6'
-    compile 'org.ow2.asm:asm:6.0'
-    compile 'org.jetbrains:annotations:15.0'
-    compile 'uk.com.robust-it:cloning:1.9.9'
+    compile 'org.ow2.asm:asm:6.2'
+    compile 'org.jetbrains:annotations:16.0.2'
+    compile 'uk.com.robust-it:cloning:1.9.10'
 
-    testCompile 'org.smali:smali:2.2.2'
-    testCompile 'org.smali:baksmali:2.2.2'
+    testCompile 'org.smali:smali:2.2.3'
+    testCompile 'org.smali:baksmali:2.2.3'
 
     testCompile 'org.apache.commons:commons-lang3:3.7'
 }
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/ModVisitor.java b/jadx-core/src/main/java/jadx/core/dex/visitors/ModVisitor.java
index f1530ee5..1b4e8050 100644
--- a/jadx-core/src/main/java/jadx/core/dex/visitors/ModVisitor.java
+++ b/jadx-core/src/main/java/jadx/core/dex/visitors/ModVisitor.java
@@ -249,14 +249,9 @@ public class ModVisitor extends AbstractVisitor {
 				|| !parentClass.getInnerClasses().contains(classNode)) {
 			return;
 		}
-		if (!classNode.getAccessFlags().isStatic()
-				&& (callMth.getArgsCount() == 0
-				|| !callMth.getArgumentsTypes().get(0).equals(parentClass.getClassInfo().getType()))) {
-			return;
-		}
 		// TODO: calculate this constructor and other constructor usage
 		Map<InsnArg, FieldNode> argsMap = getArgsToFieldsMapping(callMthNode, co);
-		if (argsMap.isEmpty()) {
+		if (argsMap.isEmpty() && !callMthNode.getArguments(true).isEmpty()) {
 			return;
 		}
 
@@ -285,9 +280,14 @@ public class ModVisitor extends AbstractVisitor {
 
 	private static Map<InsnArg, FieldNode> getArgsToFieldsMapping(MethodNode callMthNode, ConstructorInsn co) {
 		Map<InsnArg, FieldNode> map = new LinkedHashMap<>();
-		ClassNode parentClass = callMthNode.getParentClass();
+		MethodInfo callMth = callMthNode.getMethodInfo();
+		ClassNode cls = callMthNode.getParentClass();
+		ClassNode parentClass = cls.getParentClass();
 		List<RegisterArg> argList = callMthNode.getArguments(false);
-		int startArg = parentClass.getAccessFlags().isStatic() ? 0 : 1;
+		int startArg = 0;
+		if (callMth.getArgsCount() != 0 && callMth.getArgumentsTypes().get(0).equals(parentClass.getClassInfo().getType())) {
+			startArg = 1;
+		}
 		int argsCount = argList.size();
 		for (int i = startArg; i < argsCount; i++) {
 			RegisterArg arg = argList.get(i);
@@ -298,7 +298,7 @@ public class ModVisitor extends AbstractVisitor {
 			FieldNode fieldNode = null;
 			if (useInsn.getType() == InsnType.IPUT) {
 				FieldInfo field = (FieldInfo) ((IndexInsnNode) useInsn).getIndex();
-				fieldNode = parentClass.searchField(field);
+				fieldNode = cls.searchField(field);
 				if (fieldNode == null || !fieldNode.getAccessFlags().isSynthetic()) {
 					return Collections.emptyMap();
 				}
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/SimplifyVisitor.java b/jadx-core/src/main/java/jadx/core/dex/visitors/SimplifyVisitor.java
index d8a9ae95..60c68e9a 100644
--- a/jadx-core/src/main/java/jadx/core/dex/visitors/SimplifyVisitor.java
+++ b/jadx-core/src/main/java/jadx/core/dex/visitors/SimplifyVisitor.java
@@ -208,8 +208,8 @@ public class SimplifyVisitor extends AbstractVisitor {
 					} // end of if constructor is for StringBuilder
 				} // end of if we found a constructor early in the chain
 
-			} catch (Throwable e) {
-				LOG.debug("Can't convert string concatenation: {} insn: {}", mth, insn, e);
+			} catch (Exception e) {
+				LOG.warn("Can't convert string concatenation: {} insn: {}", mth, insn, e);
 			}
 		}
 		return null;
diff --git a/jadx-core/src/main/java/jadx/core/utils/DebugUtils.java b/jadx-core/src/main/java/jadx/core/utils/DebugUtils.java
index 40176659..c930e96d 100644
--- a/jadx-core/src/main/java/jadx/core/utils/DebugUtils.java
+++ b/jadx-core/src/main/java/jadx/core/utils/DebugUtils.java
@@ -6,6 +6,7 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 
+import org.jetbrains.annotations.TestOnly;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -32,6 +33,7 @@ import jadx.core.utils.exceptions.CodegenException;
 import jadx.core.utils.exceptions.JadxRuntimeException;
 
 @Deprecated
+@TestOnly
 public class DebugUtils {
 	private static final Logger LOG = LoggerFactory.getLogger(DebugUtils.class);
 
diff --git a/jadx-gui/build.gradle b/jadx-gui/build.gradle
index 6c8158f1..caa5123d 100644
--- a/jadx-gui/build.gradle
+++ b/jadx-gui/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-    id 'edu.sc.seis.launch4j' version '2.4.3'
-    id 'com.github.johnrengelman.shadow' version '2.0.2'
+    id 'edu.sc.seis.launch4j' version '2.4.4'
+    id 'com.github.johnrengelman.shadow' version '2.0.4'
 }
 
 apply plugin: 'application'
@@ -11,14 +11,14 @@ dependencies {
     compile(project(":jadx-core"))
     compile(project(":jadx-cli"))
     compile 'com.fifesoft:rsyntaxtextarea:2.6.1'
-    compile 'com.google.code.gson:gson:2.8.2'
+    compile 'com.google.code.gson:gson:2.8.5'
     compile files('libs/jfontchooser-1.0.5.jar')
     compile 'hu.kazocsaba:image-viewer:1.2.3'
 
     compile 'org.apache.commons:commons-lang3:3.7'
 
-    compile 'io.reactivex.rxjava2:rxjava:2.1.13'
-    compile "com.github.akarnokd:rxjava2-swing:0.2.12"
+    compile 'io.reactivex.rxjava2:rxjava:2.1.14'
+    compile "com.github.akarnokd:rxjava2-swing:0.2.13"
 }
 
 applicationDistribution.with {
@@ -63,7 +63,6 @@ launch4j {
     initialHeapPercent = 5
     maxHeapSize = 4096
     maxHeapPercent = 70
-
 }
 
 test {
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/CodePanel.java b/jadx-gui/src/main/java/jadx/gui/ui/CodePanel.java
index e6cfad19..ac754533 100644
--- a/jadx-gui/src/main/java/jadx/gui/ui/CodePanel.java
+++ b/jadx-gui/src/main/java/jadx/gui/ui/CodePanel.java
@@ -30,7 +30,7 @@ class CodePanel extends ContentPanel {
 		add(searchBar, BorderLayout.NORTH);
 		add(scrollPane);
 
-		KeyStroke key = KeyStroke.getKeyStroke(KeyEvent.VK_F, InputEvent.CTRL_MASK);
+		KeyStroke key = KeyStroke.getKeyStroke(KeyEvent.VK_F, InputEvent.CTRL_DOWN_MASK);
 		Utils.addKeyBinding(codeArea, key, "SearchAction", new SearchAction());
 	}
 
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/TextStandardActions.java b/jadx-gui/src/main/java/jadx/gui/utils/TextStandardActions.java
index bfd58950..9b5e254b 100644
--- a/jadx-gui/src/main/java/jadx/gui/utils/TextStandardActions.java
+++ b/jadx-gui/src/main/java/jadx/gui/utils/TextStandardActions.java
@@ -1,8 +1,6 @@
 package jadx.gui.utils;
 
 import javax.swing.*;
-import javax.swing.event.UndoableEditEvent;
-import javax.swing.event.UndoableEditListener;
 import javax.swing.text.JTextComponent;
 import javax.swing.undo.UndoManager;
 import java.awt.*;
@@ -102,26 +100,22 @@ public class TextStandardActions {
 	}
 
 	private void addKeyActions() {
-		KeyStroke undoKey = KeyStroke.getKeyStroke(KeyEvent.VK_Z, InputEvent.CTRL_MASK);
+		KeyStroke undoKey = KeyStroke.getKeyStroke(KeyEvent.VK_Z, InputEvent.CTRL_DOWN_MASK);
 		textComponent.getInputMap().put(undoKey, undoAction);
-		KeyStroke redoKey = KeyStroke.getKeyStroke(KeyEvent.VK_R, InputEvent.CTRL_MASK);
+		KeyStroke redoKey = KeyStroke.getKeyStroke(KeyEvent.VK_R, InputEvent.CTRL_DOWN_MASK);
 		textComponent.getInputMap().put(redoKey, redoAction);
 	}
 
 	private void registerListeners() {
 		textComponent.addMouseListener(new MouseAdapter() {
+			@Override
 			public void mouseReleased(MouseEvent e) {
-				if (e.getModifiers() == InputEvent.BUTTON3_MASK
-						&& e.getSource() == textComponent) {
+				if (e.getButton() == 3 && e.getSource() == textComponent) {
 					process(e);
 				}
 			}
 		});
-		textComponent.getDocument().addUndoableEditListener(new UndoableEditListener() {
-			public void undoableEditHappened(UndoableEditEvent event) {
-				undoManager.addEdit(event.getEdit());
-			}
-		});
+		textComponent.getDocument().addUndoableEditListener(event -> undoManager.addEdit(event.getEdit()));
 	}
 
 	private void process(MouseEvent e) {
-- 
GitLab