From 53237f3ae0031fe1ecdc3cb95641c1a8ed8abe8e Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Wed, 4 Oct 2017 15:23:08 +0800 Subject: [PATCH] Update Android Studio and Proguard configs --- app/build.gradle | 2 +- app/proguard-rules.pro | 9 ++++----- build.gradle | 2 +- resource/build.gradle | 2 +- unhide/build.gradle | 2 +- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 76424b0a8..371ec0d86 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 26 - buildToolsVersion "26.0.1" + buildToolsVersion "26.0.2" defaultConfig { applicationId "com.topjohnwu.magisk" diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 8ca748fc4..90e610b87 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -16,10 +16,9 @@ # public *; #} +# Keep all names, we are open source anyway :) +-keepnames class ** { *; } + # BouncyCastle --keep class org.bouncycastle.** { *; } +-keep class org.bouncycastle.jcajce.provider.** { *; } -dontwarn javax.naming.** - --dontwarn android.content.** --dontwarn android.animation.** - diff --git a/build.gradle b/build.gradle index 5a58824ca..998838f50 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { maven { url "https://maven.google.com" } } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0-beta6' + classpath 'com.android.tools.build:gradle:3.0.0-beta7' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/resource/build.gradle b/resource/build.gradle index 539749ec9..d5c3aef0d 100644 --- a/resource/build.gradle +++ b/resource/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 26 - buildToolsVersion "26.0.1" + buildToolsVersion "26.0.2" defaultConfig { minSdkVersion 21 targetSdkVersion 26 diff --git a/unhide/build.gradle b/unhide/build.gradle index 77106942a..4864267bb 100644 --- a/unhide/build.gradle +++ b/unhide/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 26 - buildToolsVersion "26.0.1" + buildToolsVersion "26.0.2" defaultConfig { applicationId "com.topjohnwu.unhide" minSdkVersion 21