From 3818f3f771945aa30ff8920cc6bc207b78a2523f Mon Sep 17 00:00:00 2001
From: Martin Zeitler <martin@syslogic.io>
Date: Sat, 14 Jan 2023 15:18:53 +0100
Subject: [PATCH] multiDexEnabled & proguard rules added; closes #18.

---
 java/app/build.gradle                   | 29 ++++++++++++++++++++-----
 java/app/src/main/AndroidManifest.xml   |  5 +++--
 java/app/src/main/res/raw/keep.xml      |  5 +++++
 java/huawei.pro                         |  0
 kotlin/app/build.gradle                 | 20 ++++++++++++++---
 kotlin/app/src/main/AndroidManifest.xml |  5 +++--
 kotlin/app/src/main/res/raw/keep.xml    |  5 +++++
 kotlin/huawei.pro                       |  2 ++
 8 files changed, 58 insertions(+), 13 deletions(-)
 create mode 100644 java/app/src/main/res/raw/keep.xml
 create mode 100644 java/huawei.pro
 create mode 100644 kotlin/app/src/main/res/raw/keep.xml
 create mode 100644 kotlin/huawei.pro

diff --git a/java/app/build.gradle b/java/app/build.gradle
index ba50025..9231d52 100644
--- a/java/app/build.gradle
+++ b/java/app/build.gradle
@@ -14,9 +14,16 @@ android {
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        multiDexEnabled true
     }
+
     signingConfigs {
-        debug {}
+        debug {
+            storeFile new File("${System.properties['user.home']}${File.separator}.android${File.separator}debug.keystore")
+            storePassword "android"
+            keyAlias "androiddebugkey"
+            keyPassword "android"
+        }
         release {
             storeFile file("xxx.xxx")
             storePassword "xxxxxx"
@@ -25,15 +32,24 @@ android {
             v2SigningEnabled true
         }
     }
+
     buildTypes {
+        debug {
+            signingConfig signingConfigs.debug
+            minifyEnabled false
+        }
         release {
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             // signingConfig signingConfigs.release
             minifyEnabled true
-        }
-        debug {
-            // signingConfig signingConfigs.debug
-            minifyEnabled false
+            shrinkResources true
+            testCoverageEnabled false
+            zipAlignEnabled true
+            pseudoLocalesEnabled false
+            renderscriptDebuggable false
+            minifyEnabled true
+            jniDebuggable false
+            debuggable false
+            proguardFile "${project.rootDir}/huawei.pro"
         }
     }
 
@@ -56,6 +72,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'com.huawei.hms:maps:6.8.1.301'
     implementation 'com.squareup.okhttp3:okhttp:4.9.3'
 
diff --git a/java/app/src/main/AndroidManifest.xml b/java/app/src/main/AndroidManifest.xml
index 1be4141..f28020e 100644
--- a/java/app/src/main/AndroidManifest.xml
+++ b/java/app/src/main/AndroidManifest.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
diff --git a/java/app/src/main/res/raw/keep.xml b/java/app/src/main/res/raw/keep.xml
new file mode 100644
index 0000000..6257443
--- /dev/null
+++ b/java/app/src/main/res/raw/keep.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:keep="@layout/hms_download_progress,@drawable/screen_off,@layout/upsdk*"
+    tools:shrinkMode="strict" />
diff --git a/java/huawei.pro b/java/huawei.pro
new file mode 100644
index 0000000..e69de29
diff --git a/kotlin/app/build.gradle b/kotlin/app/build.gradle
index 5d44eb1..dfccf55 100644
--- a/kotlin/app/build.gradle
+++ b/kotlin/app/build.gradle
@@ -15,10 +15,15 @@ android {
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        multiDexEnabled true
     }
 
     signingConfigs {
         debug {
+            storeFile new File("${System.properties['user.home']}${File.separator}.android${File.separator}debug.keystore")
+            storePassword "android"
+            keyAlias "androiddebugkey"
+            keyPassword "android"
         }
         release {
             storeFile file("xxx.xxx")
@@ -28,15 +33,24 @@ android {
             v2SigningEnabled true
         }
     }
+
     buildTypes {
         debug {
-            // signingConfig signingConfigs.debug
+            signingConfig signingConfigs.debug
             minifyEnabled false
         }
         release {
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             // signingConfig signingConfigs.release
             minifyEnabled true
+            shrinkResources true
+            testCoverageEnabled false
+            zipAlignEnabled true
+            pseudoLocalesEnabled false
+            renderscriptDebuggable false
+            minifyEnabled true
+            jniDebuggable false
+            debuggable false
+            proguardFile "${project.rootDir}/huawei.pro"
         }
     }
 
@@ -47,7 +61,6 @@ android {
             variant.outputs.all {
                 outputFileName = fileName
             }
-
     }
 
     compileOptions {
@@ -59,6 +72,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'com.huawei.hms:maps:6.8.1.301'
     implementation 'com.squareup.okhttp3:okhttp:4.9.3'
     //noinspection GradleDependency
diff --git a/kotlin/app/src/main/AndroidManifest.xml b/kotlin/app/src/main/AndroidManifest.xml
index 0215562..3f1a0c1 100644
--- a/kotlin/app/src/main/AndroidManifest.xml
+++ b/kotlin/app/src/main/AndroidManifest.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
diff --git a/kotlin/app/src/main/res/raw/keep.xml b/kotlin/app/src/main/res/raw/keep.xml
new file mode 100644
index 0000000..6257443
--- /dev/null
+++ b/kotlin/app/src/main/res/raw/keep.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:keep="@layout/hms_download_progress,@drawable/screen_off,@layout/upsdk*"
+    tools:shrinkMode="strict" />
diff --git a/kotlin/huawei.pro b/kotlin/huawei.pro
new file mode 100644
index 0000000..ab4f08b
--- /dev/null
+++ b/kotlin/huawei.pro
@@ -0,0 +1,2 @@
+# https://developer.huawei.com/consumer/en/doc/development/HMSCore-Guides/android-sdk-config-obfuscation-scripts-0000001061882229
+