MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update to new build tools, target API 26

Browse Source
This commit is contained in:
topjohnwu 2017-06-16 03:06:22 +08:00
parent d3ff482c9b
commit 42d14d5ca2
6 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -3,6 +3,6 @@
/local.properties /local.properties
.idea/ .idea/
/build /build
app/app-release.apk app/release
*.hprof *.hprof
app/.externalNativeBuild/ app/.externalNativeBuild/

44
app/build.gradle
View File

@ -1,14 +1,13 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
apply plugin: 'me.tatarka.retrolambda'
android { android {
compileSdkVersion 25 compileSdkVersion 26
buildToolsVersion "25.0.3" buildToolsVersion "26.0.0"
defaultConfig { defaultConfig {
applicationId "com.topjohnwu.magisk" applicationId "com.topjohnwu.magisk"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 25 targetSdkVersion 26
versionCode 41 versionCode 41
versionName "5.0.1" versionName "5.0.1"
ndk { ndk {
@ -29,7 +28,8 @@ android {
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8
} }
dexOptions { dexOptions {
preDexLibraries = true preDexLibraries true
javaMaxHeapSize "2g"
} }
externalNativeBuild { externalNativeBuild {
cmake { cmake {
@ -39,30 +39,26 @@ android {
lintOptions { lintOptions {
disable 'MissingTranslation' disable 'MissingTranslation'
} }
retrolambda {
javaVersion JavaVersion.VERSION_1_7
defaultMethods false
incremental true
}
} }
repositories { repositories {
jcenter() jcenter()
maven { url "https://jitpack.io" } maven { url "https://jitpack.io" }
maven { url "https://maven.google.com" }
} }
dependencies { dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs') implementation fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:recyclerview-v7:25.3.1' implementation 'com.android.support:recyclerview-v7:26.0.0-beta2'
compile 'com.android.support:cardview-v7:25.3.1' implementation 'com.android.support:cardview-v7:26.0.0-beta2'
compile 'com.android.support:design:25.3.1' implementation 'com.android.support:design:26.0.0-beta2'
compile 'com.android.support:support-v4:25.3.1' implementation 'com.android.support:support-v4:26.0.0-beta2'
compile 'com.jakewharton:butterknife:8.5.1' implementation 'com.jakewharton:butterknife:8.6.0'
compile 'com.thoughtbot:expandablerecyclerview:1.4' implementation 'com.thoughtbot:expandablerecyclerview:1.4'
compile 'us.feras.mdv:markdownview:1.1.0' implementation 'us.feras.mdv:markdownview:1.1.0'
compile 'com.madgag.spongycastle:core:1.54.0.0' implementation 'com.madgag.spongycastle:core:1.54.0.0'
compile 'com.madgag.spongycastle:prov:1.54.0.0' implementation 'com.madgag.spongycastle:prov:1.54.0.0'
compile 'com.madgag.spongycastle:pkix:1.54.0.0' implementation 'com.madgag.spongycastle:pkix:1.54.0.0'
compile 'com.madgag.spongycastle:pg:1.54.0.0' implementation 'com.madgag.spongycastle:pg:1.54.0.0'
compile 'com.google.android.gms:play-services-safetynet:9.0.1' implementation 'com.google.android.gms:play-services-safetynet:9.0.1'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1' annotationProcessor 'com.jakewharton:butterknife-compiler:8.6.0'
} }

4
app/proguard-rules.pro vendored
View File

@ -20,6 +20,6 @@
-keep class org.spongycastle.** { *; } -keep class org.spongycastle.** { *; }
-dontwarn javax.naming.** -dontwarn javax.naming.**
# retrolambda -dontwarn android.content.**
-dontwarn java.lang.invoke.* -dontwarn android.animation.**

4
build.gradle
View File

@ -4,10 +4,10 @@ buildscript {
repositories { repositories {
jcenter() jcenter()
mavenCentral() mavenCentral()
maven { url "https://maven.google.com" }
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.2' classpath 'com.android.tools.build:gradle:3.0.0-alpha3'
classpath 'me.tatarka:gradle-retrolambda:3.6.1'
// 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

2
gradle.properties
View File

@ -10,7 +10,7 @@
# Specifies the JVM arguments used for the daemon process. # Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings. # The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx10248m -XX:MaxPermSize=256m # Default value: -Xmx10248m -XX:MaxPermSize=256m
org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=4096m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 org.gradle.jvmargs=-Xmx2560m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
# When configured, Gradle will run in incubating parallel mode. # When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit # This option should only be used with decoupled projects. More details, visit

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Wed Apr 05 09:31:45 CST 2017 #Thu Jun 15 18:40:02 CST 2017
distributionBase=GRADLE_USER_HOME 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.3-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-milestone-1-all.zip