From e531eb85e3b075b98ca1cdb3706148eb058faa64 Mon Sep 17 00:00:00 2001
From: Arty Bishop <bishop.arty@gmail.com>
Date: Sat, 27 Aug 2022 19:09:14 +0100
Subject: [PATCH] Enabled R8 build minification

---
 .github/workflows/main.yml | 7 ++++---
 app/build.gradle           | 9 +++------
 build.gradle               | 4 ++--
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7ef25cf6..ef5ac690 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -32,7 +32,7 @@ jobs:
           alias: ${{ secrets.KEY_ALIAS }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
         env:
-          BUILD_TOOLS_VERSION: "31.0.0"
+          BUILD_TOOLS_VERSION: "33.0.0"
 
       - name: Sign Bundle
         uses: r0adkll/sign-android-release@v1
@@ -44,18 +44,19 @@ jobs:
           alias: ${{ secrets.KEY_ALIAS }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
         env:
-          BUILD_TOOLS_VERSION: "31.0.0"
+          BUILD_TOOLS_VERSION: "33.0.0"
 
       - name: Rename APK
         run: |
           mv ${{steps.sign_apk.outputs.signedReleaseFile}} app/build/outputs/apk/release/look4sat.apk
 
       - name: Deploy Bundle to Play Store
-        uses: r0adkll/upload-google-play@v1.0.15
+        uses: r0adkll/upload-google-play@v1.0.17
         with:
           serviceAccountJsonPlainText: ${{secrets.SERVICE_ACCOUNT_JSON}}
           packageName: com.rtbishop.look4sat
           track: production
+          mappingFile: app/build/outputs/mapping/release/mapping.txt
           whatsNewDirectory: fastlane/metadata/android/en-US/whatsnew
           releaseFiles: ${{steps.sign_bundle.outputs.signedReleaseFile}}
 
diff --git a/app/build.gradle b/app/build.gradle
index a9022d09..8309b1ef 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,12 +29,9 @@ android {
     }
     buildTypes {
         release {
-            postprocessing {
-                removeUnusedCode true
-                removeUnusedResources true
-                obfuscate false
-                optimizeCode true
-            }
+            minifyEnabled true
+            shrinkResources true
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
     buildFeatures {
diff --git a/build.gradle b/build.gradle
index 29817ef2..197ac2d7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
         work_version = '2.7.1'
         room_version = '2.4.3'
         material_version = '1.6.1'
-        osmdroid_version = '6.1.13'
+        osmdroid_version = '6.1.14'
         json_version = '20220320'
         compose_version = '1.2.1'
         activity_compose_version = '1.4.0'
@@ -22,7 +22,7 @@ buildscript {
         leakcanary_version = '2.9.1'
         junit_version = '4.13.2'
         mockito_version = '4.7.0'
-        robolectric_version = '4.8.1'
+        robolectric_version = '4.8.2'
         coroutines_test_version = '1.6.4'
         androidx_test_version = '1.4.0'
         androidx_junit_version = '1.1.3'