Update dependencies

tmurakami · Sep 6, 2019 · fd89d0b · fd89d0b
1 parent cf76568
commit fd89d0b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.5.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
-        classpath 'com.github.ben-manes:gradle-versions-plugin:0.22.0'
+        classpath 'com.github.ben-manes:gradle-versions-plugin:0.24.0'
         classpath 'pl.allegro.tech.build:axion-release-plugin:1.10.2'
         classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.6'
     }
@@ -55,7 +55,7 @@ dependencyUpdates.resolutionStrategy {
 
 ext {
     deps = [jarjar     : 'org.pantsbuild:jarjar:1.7.2',
-            dexlib2    : 'org.smali:dexlib2:2.3',
+            dexlib2    : 'org.smali:dexlib2:2.3.1',
             junit      : 'junit:junit:4.12',
             objenesis26: 'org.objenesis:objenesis:2.6',]
 

diff --git a/dexopener/build.gradle b/dexopener/build.gradle
@@ -39,10 +39,7 @@ def repackagedJar = "$buildDir/libs/repackaged.jar"
 
 dependencies {
     jarjar deps.jarjar
-    repackage deps.dexlib2, {
-        exclude group: 'com.beust', module: 'jcommander'
-        exclude group: 'com.google.code.findbugs', module: 'jsr305'
-    }
+    repackage deps.dexlib2
     compileOnly deps.androidx.annotation
     implementation files(project(':classloaderhelper').jar)
     implementation files(repackagedJar) { builtBy 'repackageDependencies' }

diff --git a/dexopener/proguard-rules-repackage.pro b/dexopener/proguard-rules-repackage.pro
@@ -3,7 +3,8 @@
 -dontnote java.lang.invoke.**
 -dontnote com.google.common.**
 
--dontwarn javax.annotation.**
+-dontwarn java.lang.ClassValue
+-dontwarn javax.lang.model.element.Modifier
 -dontwarn sun.misc.Unsafe
 
 -keepattributes Exceptions,InnerClasses,Signature,SourceFile,LineNumberTable,EnclosingMethod

diff --git 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-5.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -125,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`