From efec00d965e10345220241566dd8c4c7000a9c66 Mon Sep 17 00:00:00 2001 From: Eric Kok Date: Wed, 24 Apr 2019 22:05:57 +0200 Subject: [PATCH] Enable R8 (Google's Proguard replacement) for smaller, faster (release) apks --- app/build.gradle | 7 ++++++- app/proguard-rules.pro | 1 + .../java/org/transdroid/core/gui/log/DatabaseHelper.java | 2 ++ gradle.properties | 3 ++- 4 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 app/proguard-rules.pro diff --git a/app/build.gradle b/app/build.gradle index 2ebcb550..c46f4a88 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -36,9 +36,14 @@ android { } } buildTypes { + debug { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } release { signingConfig signingConfigs.releaseConfig - minifyEnabled false + minifyEnabled true + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } flavorDimensions "version" diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 00000000..e9caf635 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1 @@ +-dontobfuscate diff --git a/app/src/main/java/org/transdroid/core/gui/log/DatabaseHelper.java b/app/src/main/java/org/transdroid/core/gui/log/DatabaseHelper.java index 34fdcac1..448a3df9 100644 --- a/app/src/main/java/org/transdroid/core/gui/log/DatabaseHelper.java +++ b/app/src/main/java/org/transdroid/core/gui/log/DatabaseHelper.java @@ -20,6 +20,7 @@ import java.sql.SQLException; import android.content.Context; import android.database.sqlite.SQLiteDatabase; +import android.support.annotation.Keep; import android.util.Log; import com.j256.ormlite.android.apptools.OrmLiteSqliteOpenHelper; @@ -35,6 +36,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper { private static final String DATABASE_NAME = "transdroid.db"; private static final int DATABASE_VERSION = 1; + @Keep public DatabaseHelper(Context context) { super(context, DATABASE_NAME, null, DATABASE_VERSION); } diff --git a/gradle.properties b/gradle.properties index 5d08ba75..1272d72e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,4 +15,5 @@ # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true \ No newline at end of file +# org.gradle.parallel=true +android.enableR8=true