proguard: fix build for nongms

SimpleAppProjects · Sep 11, 2023 · 94733e5 · 94733e5
1 parent 2533d89
commit 94733e5
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 42 deletions.
diff --git 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
@@ -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
+# 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
diff --git 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
@@ -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
diff --git 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
@@ -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
+# 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