Use stable build tools + retrolambda

topjohnwu · Apr 26, 2017 · 907e01e · 907e01e
1 parent b8ed23e
commit 907e01e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,15 +1,16 @@
 apply plugin: 'com.android.application'
+apply plugin: 'me.tatarka.retrolambda'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "26.0.0-rc1"
+    buildToolsVersion "25.0.3"
 
     defaultConfig {
         applicationId "com.topjohnwu.magisk"
         minSdkVersion 21
         targetSdkVersion 25
-        versionCode 30
-        versionName "4.3.2"
+        versionCode 31
+        versionName "4.3.3"
         ndk {
             moduleName 'zipadjust'
             abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
@@ -37,6 +38,11 @@ android {
     lintOptions {
         disable 'MissingTranslation'
     }
+    retrolambda {
+        javaVersion JavaVersion.VERSION_1_7
+        defaultMethods false
+        incremental true
+    }
 }
 repositories {
     jcenter()

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -25,3 +25,6 @@
 -keep class org.spongycastle.** { *; }
 -dontwarn javax.naming.**
 
+# retrolambda
+-dontwarn java.lang.invoke.*
+
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.4.0-alpha6'
+        classpath 'com.android.tools.build:gradle:2.3.1'
+        classpath 'me.tatarka:gradle-retrolambda:3.6.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip