Use stable build tools + retrolambda

This commit is contained in:
topjohnwu 2017-04-26 19:04:06 +08:00
parent b8ed23efa7
commit 907e01e524
4 changed files with 15 additions and 5 deletions

View File

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

View File

@ -25,3 +25,6 @@
-keep class org.spongycastle.** { *; } -keep class org.spongycastle.** { *; }
-dontwarn javax.naming.** -dontwarn javax.naming.**
# retrolambda
-dontwarn java.lang.invoke.*

View File

@ -6,7 +6,8 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { 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 // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files

View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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