From dbaab152ef52051b65342be0db833dcd9fb299c3 Mon Sep 17 00:00:00 2001
From: tom5079 <tom5079@naver.com>
Date: Mon, 10 Aug 2020 01:32:56 +0900
Subject: [PATCH] Build optimization

---
 app/build.gradle                                  | 12 ++++++++++--
 .../quaver/pupil/ui/fragment/SettingsFragment.kt  | 15 ++++++---------
 gradle.properties                                 |  5 ++++-
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2e40a77f..7eed9b62 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -22,19 +22,27 @@ android {
         versionCode 57
         versionName "4.21-hotfix1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
         debug {
+            minifyEnabled true
+            shrinkResources true
+
             debuggable true
             applicationIdSuffix ".debug"
             versionNameSuffix "-DEBUG"
 
             buildConfigField('Boolean', 'CENSOR', 'false')
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+
+            ext.enableCrashlytics = false
+            ext.alwaysUpdateBuildId = false
         }
         release {
+            minifyEnabled true
+            shrinkResources true
+
             buildConfigField('Boolean', 'CENSOR', 'false')
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
@@ -57,7 +65,7 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.7"
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.20.0"
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.preference:preference:1.1.1'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
diff --git a/app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt b/app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt
index 6973b2df..baca6f22 100644
--- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt
@@ -79,16 +79,13 @@ class SettingsFragment :
     }
 
     private fun getDirSize(dir: File) : String {
-        return if (activity != null)
-            getString(R.string.settings_storage_usage,
-                Runtime.getRuntime().exec("du -hs " + dir.absolutePath).let {
-                    BufferedReader(InputStreamReader(it.inputStream)).use { reader ->
-                        reader.readLine()?.split('\t')?.firstOrNull() ?: "0"
-                    }
+        return context?.getString(R.string.settings_storage_usage,
+            Runtime.getRuntime().exec("du -hs " + dir.absolutePath).let {
+                BufferedReader(InputStreamReader(it.inputStream)).use { reader ->
+                    reader.readLine()?.split('\t')?.firstOrNull() ?: "0"
                 }
-            )
-        else
-            ""
+            }
+        ) ?: ""
     }
 
     override fun onPreferenceClick(preference: Preference?): Boolean {
diff --git a/gradle.properties b/gradle.properties
index 18d909fd..0ed0ee79 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,7 +11,10 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 #Thu Jan 30 12:29:48 KST 2020
+org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+org.gradle.parallel=true
+org.gradle.daemon=true
+org.gradle.configureondemand=true
 kotlin.code.style=official
 android.enableJetifier=true
-org.gradle.jvmargs=-Xmx1024M -Dkotlin.daemon.jvm.options\="-Xmx1024M"
 android.useAndroidX=true
\ No newline at end of file