Browse Source

Migrate packagingOptions exclusions to packagingOptions / resources / exclusions

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Andy Scherzinger 3 years ago
parent
commit
c7e204172f
1 changed files with 11 additions and 7 deletions
  1. 11 7
      app/build.gradle

+ 11 - 7
app/build.gradle

@@ -95,16 +95,20 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         }
     }
     }
-
     packagingOptions {
     packagingOptions {
-        exclude 'META-INF/LICENSE.txt'
-        exclude 'META-INF/LICENSE'
-        exclude 'META-INF/NOTICE.txt'
-        exclude 'META-INF/NOTICE'
-        exclude 'META-INF/DEPENDENCIES'
-        exclude 'META-INF/rxjava.properties'
+        resources {
+            excludes += [
+                'META-INF/LICENSE.txt',
+                'META-INF/LICENSE',
+                'META-INF/NOTICE.txt',
+                'META-INF/NOTICE',
+                'META-INF/DEPENDENCIES',
+                'META-INF/rxjava.properties'
+            ]
+        }
     }
     }
 
 
+
     android.applicationVariants.all { variant ->
     android.applicationVariants.all { variant ->
         String variantName = variant.name
         String variantName = variant.name
         String capVariantName = variantName.substring(0, 1).toUpperCase(Locale.ROOT) + variantName.substring(1)
         String capVariantName = variantName.substring(0, 1).toUpperCase(Locale.ROOT) + variantName.substring(1)