Merge fc26908 into b2f41e9

skylot · May 2, 2016 · 0162d86 · 0162d86
2 parents b2f41e9 + fc26908
commit 0162d86
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,6 @@ language: java
 jdk:
     - oraclejdk8
     - oraclejdk7
-    - openjdk6
 
 before_install:
     - chmod +x gradlew

diff --git a/jadx-core/build.gradle b/jadx-core/build.gradle
@@ -5,7 +5,7 @@ apply plugin: "info.solidsoft.pitest"
 dependencies {
     runtime files(jadxClasspath)
 
-    compile files('lib/dx-1.10.jar')
+    compile files('lib/dx.jar')
     compile 'commons-io:commons-io:2.4'
     compile 'org.ow2.asm:asm:5.0.3'
     compile 'com.intellij:annotations:12.0'

diff --git a/jadx-core/lib/dx-1.10.jar b/jadx-core/lib/dx-1.10.jar
diff --git a/jadx-core/lib/dx.jar b/jadx-core/lib/dx.jar