From 7fd5052c20eb3da9cf4bbfd8604ef339c1ca9f73 Mon Sep 17 00:00:00 2001 From: Frank Dietrich Date: Sun, 22 May 2016 17:48:52 +0200 Subject: [PATCH 1/8] maven-shade-plugin version changed to 2.4.3 because INVOKESPECIAL/STATIC on interfaces require ASM 5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4dd32ce4..de49c19c 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ maven-shade-plugin - 2.3 + 2.4.3 package From 72481c95f479ee561b9ab04467d7bd96d6bfef84 Mon Sep 17 00:00:00 2001 From: Frank Dietrich Date: Sun, 22 May 2016 17:49:37 +0200 Subject: [PATCH 2/8] remove explicit declaration of default directories --- pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pom.xml b/pom.xml index de49c19c..34e178d9 100644 --- a/pom.xml +++ b/pom.xml @@ -11,12 +11,6 @@ UTF-8 - src/main/java - - - src/main/resources - - maven-compiler-plugin From 7be4192dcbe4304bdf63b1b71fe02ad0623e1c79 Mon Sep 17 00:00:00 2001 From: Frank Dietrich Date: Sun, 22 May 2016 17:54:15 +0200 Subject: [PATCH 3/8] comment out dependencies whose code is within the bytecode-viewer source tree --- pom.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 34e178d9..dfc3e154 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,8 @@ - + + org.codehaus.janino janino @@ -118,11 +119,11 @@ isoparser 1.1.9 - + org.zeroturnaround zt-zip From 127b9b1879d56a4928b29fd1b74445fa740b3578 Mon Sep 17 00:00:00 2001 From: Frank Dietrich Date: Sun, 22 May 2016 17:55:31 +0200 Subject: [PATCH 4/8] amend CFR version to be in sync with the version in ./libs/ --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dfc3e154..7d8c53a7 100644 --- a/pom.xml +++ b/pom.xml @@ -138,7 +138,7 @@ org.benf cfr - 0.108 + 0.115 ca.benow From 4a7724ea755070e37d2c38b3611ea9c67841a3b5 Mon Sep 17 00:00:00 2001 From: Frank Dietrich Date: Sun, 22 May 2016 17:56:44 +0200 Subject: [PATCH 5/8] amend shade plugin filters to remove warnings during package phase --- pom.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pom.xml b/pom.xml index 7d8c53a7..784b09f5 100644 --- a/pom.xml +++ b/pom.xml @@ -49,6 +49,26 @@ META-INF/* + + ca.benow:jd + + org/fife/** + + + + org.jf:baksmali + + org/apache/commons/cli/** + + + + dex2jar:dex2jar + + org/objectweb/asm/xml/Processor.class + org/objectweb/asm/util/TraceClassVisitor.class + org/objectweb/asm/util/CheckClassAdapter.class + + com.fifesoft:rsyntaxtextarea From 3c8fa51f060a775885b1fa5bc226f3b9b3ecbf90 Mon Sep 17 00:00:00 2001 From: Frank Dietrich Date: Sun, 22 May 2016 18:02:24 +0200 Subject: [PATCH 6/8] amend .gitignore to exclude the ./target/ directory from repository --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b64d1edc..220b9cfb 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,6 @@ .classpath .project *.iml -.idea/ \ No newline at end of file +.idea/ +target/ + From 5595d2bd99fb1fdf57966b9f277d1955043e9c75 Mon Sep 17 00:00:00 2001 From: Frank Dietrich Date: Sun, 22 May 2016 18:03:08 +0200 Subject: [PATCH 7/8] add script to install the dependecies from ./libs/ directory into local repository --- publish_libs_to_repository.sh | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100755 publish_libs_to_repository.sh diff --git a/publish_libs_to_repository.sh b/publish_libs_to_repository.sh new file mode 100755 index 00000000..b3671faa --- /dev/null +++ b/publish_libs_to_repository.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +# the script will install the dependencies from ./libs/ diretory into the local Maven repository + +install() { + if [ ! -z "$5" ]; then + classifier=-Dclassifier=$5 + else + unset classifier + fi + mvn install:install-file -Dfile=libs/$1 -DgroupId=$2 -DartifactId=$3 -Dversion=$4 ${classifier} -Dpackaging=jar +} + +install procyon-decompiler-0.5.30.jar com.strobel procyon 0.5.30 +install cfr_0_115.jar org.benf cfr 0.115 +install jd-gui-1.0.0-RC4.jar ca.benow jd 1.4.0 +install byteanalysis-1.0.jar eu.bibl byteanalysis 1.0 +install apktool_2.0.1_obf-2.jar brut apktool 2.0.1 +install fernflower-2016.jar org.jetbrains.java decompiler 2015-1 +install dex_obf.jar dex2jar dex2jar 0.0.1 +install smali-2.0.3-obf-patched.jar org.jf smali 2.0.3 patched +install baksmali-2.0.3_obf.jar org.jf baksmali 2.0.3 From f21428f7e2fef95c7ab9c07ec6c578f5bd3fbd75 Mon Sep 17 00:00:00 2001 From: Frank Dietrich Date: Sun, 22 May 2016 18:05:13 +0200 Subject: [PATCH 8/8] remove auto-generated file dependency-reduced-pom.xml --- .gitignore | 1 + dependency-reduced-pom.xml | 75 -------------------------------------- 2 files changed, 1 insertion(+), 75 deletions(-) delete mode 100644 dependency-reduced-pom.xml diff --git a/.gitignore b/.gitignore index 220b9cfb..b177b003 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ *.iml .idea/ target/ +dependency-reduced-pom.xml diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml deleted file mode 100644 index c7f07f1f..00000000 --- a/dependency-reduced-pom.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - 4.0.0 - the.bytecode.club - bytecode-viewer - 3.0.0 - - src/main/java - - - src/main/resources - - - - - maven-compiler-plugin - 3.3 - - 1.7 - 1.7 - true - - - - maven-jar-plugin - 2.6 - - - maven-shade-plugin - 2.3 - - - package - - shade - - - - - the.bytecode.club.bytecodeviewer.BytecodeViewer - - - - - *:* - - META-INF/* - - - - com.fifesoft:rsyntaxtextarea - - ** - - - - true - - - - - - - - - bytecode-viewer - Bytecode Viewer Repository - http://repo.samczsun.com/content/repositories/bytecode-viewer/ - - - - UTF-8 - - -