From 94733e5b60f22d664f8814395fe133ba4e6cba70 Mon Sep 17 00:00:00 2001
From: Dave Antoine <thewizrd.dev@gmail.com>
Date: Sun, 10 Sep 2023 20:27:57 -0400
Subject: [PATCH] proguard: fix build for nongms

---
 common/build.gradle                 |  1 +
 common/proguard-rules.pro           | 24 +++---------------------
 shared_resources/build.gradle       |  1 +
 shared_resources/proguard-rules.pro |  3 +++
 weather-api/build.gradle            |  1 +
 weather-api/proguard-rules.pro      | 24 +++---------------------
 6 files changed, 12 insertions(+), 42 deletions(-)
 create mode 100644 shared_resources/proguard-rules.pro

diff --git a/common/build.gradle b/common/build.gradle
index c979a12a8..5ada0ae62 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -45,6 +45,7 @@ android {
         nongms {
             dimension 'gms'
             buildConfigField "boolean", "IS_NONGMS", "true"
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         fullgms {
             dimension 'gms'
diff --git a/common/proguard-rules.pro b/common/proguard-rules.pro
index 481bb4348..22fc01377 100644
--- a/common/proguard-rules.pro
+++ b/common/proguard-rules.pro
@@ -1,21 +1,3 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
+# Please add these rules to your existing keep rules in order to suppress warnings.
+# This is generated automatically by the Android Gradle plugin.
+-dontwarn java.lang.invoke.StringConcatFactory
\ No newline at end of file
diff --git a/shared_resources/build.gradle b/shared_resources/build.gradle
index 0f46cf952..da7621c01 100644
--- a/shared_resources/build.gradle
+++ b/shared_resources/build.gradle
@@ -66,6 +66,7 @@ android {
         nongms {
             dimension 'gms'
             buildConfigField "boolean", "IS_NONGMS", "true"
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         fullgms {
             dimension 'gms'
diff --git a/shared_resources/proguard-rules.pro b/shared_resources/proguard-rules.pro
new file mode 100644
index 000000000..22fc01377
--- /dev/null
+++ b/shared_resources/proguard-rules.pro
@@ -0,0 +1,3 @@
+# Please add these rules to your existing keep rules in order to suppress warnings.
+# This is generated automatically by the Android Gradle plugin.
+-dontwarn java.lang.invoke.StringConcatFactory
\ No newline at end of file
diff --git a/weather-api/build.gradle b/weather-api/build.gradle
index 4693038e6..1c63ade51 100644
--- a/weather-api/build.gradle
+++ b/weather-api/build.gradle
@@ -47,6 +47,7 @@ android {
     productFlavors {
         nongms {
             dimension 'gms'
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         fullgms {
             dimension 'gms'
diff --git a/weather-api/proguard-rules.pro b/weather-api/proguard-rules.pro
index 481bb4348..22fc01377 100644
--- a/weather-api/proguard-rules.pro
+++ b/weather-api/proguard-rules.pro
@@ -1,21 +1,3 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
+# Please add these rules to your existing keep rules in order to suppress warnings.
+# This is generated automatically by the Android Gradle plugin.
+-dontwarn java.lang.invoke.StringConcatFactory
\ No newline at end of file