Bug 1802817 - Migrate packagingOptions DSL properties to resources sub-block.

exclude, pickFirst methods are deprecated.
2023-02-14 17:53:17 +02:00
parent 1d0b1abd2d
commit 45f919de20
12 changed files with 43 additions and 24 deletions
--- a/mobile/android/android-components/build.gradle
+++ b/mobile/android/android-components/build.gradle
@@ -216,15 +216,14 @@ subprojects {
                }

                packagingOptions {
-                    exclude 'META-INF/atomicfu.kotlin_module'
-                    exclude 'META-INF/AL2.0'
-                    exclude 'META-INF/LGPL2.1'
-
+                    resources {
+                        excludes += ['META-INF/atomicfu.kotlin_module', 'META-INF/AL2.0', 'META-INF/LGPL2.1']
                        // Required dependencies using byte-buddy; remove after this is
                        // fixed by: https://issuetracker.google.com/issues/170131605
-                    exclude "META-INF/licenses/ASM"
-                    pickFirst "win32-x86-64/attach_hotspot_windows.dll"
-                    pickFirst "win32-x86/attach_hotspot_windows.dll"
+                        excludes.add("META-INF/licenses/ASM")
+
+                        pickFirsts += ['win32-x86-64/attach_hotspot_windows.dll', 'win32-x86/attach_hotspot_windows.dll']
+                    }
                }

                androidResources {
--- a/mobile/android/android-components/components/browser/engine-gecko/build.gradle
+++ b/mobile/android/android-components/components/browser/engine-gecko/build.gradle
@@ -38,7 +38,9 @@ android {
    }

    packagingOptions {
-        exclude 'META-INF/proguard/androidx-annotations.pro'
+        resources {
+            excludes += ['META-INF/proguard/androidx-annotations.pro']
+        }
    }

    namespace  'mozilla.components.browser.engine.gecko'
--- a/mobile/android/android-components/components/browser/icons/build.gradle
+++ b/mobile/android/android-components/components/browser/icons/build.gradle
@@ -22,7 +22,9 @@ android {
    }

    packagingOptions {
-        exclude 'META-INF/proguard/androidx-annotations.pro'
+        resources {
+            excludes += ['META-INF/proguard/androidx-annotations.pro']
+        }
    }

    sourceSets {
--- a/mobile/android/android-components/components/browser/state/build.gradle
+++ b/mobile/android/android-components/components/browser/state/build.gradle
@@ -32,7 +32,9 @@ android {
    }

    packagingOptions {
-        exclude 'META-INF/proguard/androidx-annotations.pro'
+        resources {
+            excludes += ['META-INF/proguard/androidx-annotations.pro']
+        }
    }

    namespace 'mozilla.components.browser.state'
--- a/mobile/android/android-components/components/browser/thumbnails/build.gradle
+++ b/mobile/android/android-components/components/browser/thumbnails/build.gradle
@@ -22,7 +22,9 @@ android {
    }

    packagingOptions {
-        exclude 'META-INF/proguard/androidx-annotations.pro'
+        resources {
+            excludes += ['META-INF/proguard/androidx-annotations.pro']
+        }
    }

    namespace 'mozilla.components.browser.thumbnails'
--- a/mobile/android/android-components/components/feature/accounts-push/build.gradle
+++ b/mobile/android/android-components/components/feature/accounts-push/build.gradle
@@ -23,7 +23,9 @@ android {
    }

    packagingOptions {
-        exclude 'META-INF/proguard/androidx-annotations.pro'
+        resources {
+            excludes += ['META-INF/proguard/androidx-annotations.pro']
+        }
    }

    namespace 'mozilla.components.feature.accounts.push'
--- a/mobile/android/android-components/components/feature/app-links/build.gradle
+++ b/mobile/android/android-components/components/feature/app-links/build.gradle
@@ -23,7 +23,9 @@ android {
    }

    packagingOptions {
-        exclude 'META-INF/proguard/androidx-annotations.pro'
+        resources {
+            excludes += ['META-INF/proguard/androidx-annotations.pro']
+        }
    }

    namespace 'mozilla.components.feature.app.links'
--- a/mobile/android/android-components/components/feature/containers/build.gradle
+++ b/mobile/android/android-components/components/feature/containers/build.gradle
@@ -35,7 +35,9 @@ android {
    }

    packagingOptions {
-        exclude 'META-INF/proguard/androidx-annotations.pro'
+        resources {
+            excludes += ['META-INF/proguard/androidx-annotations.pro']
+        }
    }

    sourceSets {
--- a/mobile/android/android-components/components/feature/logins/build.gradle
+++ b/mobile/android/android-components/components/feature/logins/build.gradle
@@ -29,7 +29,9 @@ android {
    }

    packagingOptions {
-        exclude 'META-INF/proguard/androidx-annotations.pro'
+        resources {
+            excludes += ['META-INF/proguard/androidx-annotations.pro']
+        }
    }

    sourceSets {
--- a/mobile/android/android-components/components/feature/media/build.gradle
+++ b/mobile/android/android-components/components/feature/media/build.gradle
@@ -22,7 +22,9 @@ android {
    }

    packagingOptions {
-        exclude 'META-INF/proguard/androidx-annotations.pro'
+        resources {
+            excludes += ['META-INF/proguard/androidx-annotations.pro']
+        }
    }

    namespace 'mozilla.components.feature.media'
--- a/mobile/android/fenix/app/build.gradle
+++ b/mobile/android/fenix/app/build.gradle
@@ -207,12 +207,12 @@ android {
        lintConfig file("lint.xml")
        baseline file("lint-baseline.xml")
    }
-
    packagingOptions {
-        exclude 'META-INF/atomicfu.kotlin_module'
-        exclude 'META-INF/AL2.0'
-        exclude 'META-INF/LGPL2.1'
+        resources {
+            excludes += ['META-INF/atomicfu.kotlin_module', 'META-INF/AL2.0', 'META-INF/LGPL2.1']
        }
+    }
+

    testOptions {
        unitTests.returnDefaultValues = true
--- a/mobile/android/focus-android/app/build.gradle
+++ b/mobile/android/focus-android/app/build.gradle
@@ -158,11 +158,13 @@ android {
        focusNightly.root = 'src/focusNightly'
        klarNightly.root = 'src/klarNightly'
    }
-
    packagingOptions {
-        pickFirst 'META-INF/atomicfu.kotlin_module'
-        pickFirst 'META-INF/proguard/coroutines.pro'
+        resources {
+            pickFirsts += ['META-INF/atomicfu.kotlin_module', 'META-INF/proguard/coroutines.pro']
        }
+    }
+
+
    namespace 'org.mozilla.focus'
 }