From ca63eff03508b98745633da5375ba2f002f2d3f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Sep 2022 01:05:09 +0000 Subject: [PATCH 1/2] Bump mockkVersion from 1.12.5 to 1.13.2 Bumps `mockkVersion` from 1.12.5 to 1.13.2. Updates `mockk` from 1.12.5 to 1.13.2 - [Release notes](https://github.com/mockk/mockk/releases) - [Commits](https://github.com/mockk/mockk/compare/1.12.5...1.13.2) Updates `mockk-android` from 1.12.5 to 1.13.2 - [Release notes](https://github.com/mockk/mockk/releases) - [Commits](https://github.com/mockk/mockk/compare/1.12.5...1.13.2) --- updated-dependencies: - dependency-name: io.mockk:mockk dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.mockk:mockk-android dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c08355abfa..067f32132b 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { androidLibraryVersion = "master-SNAPSHOT" mockitoVersion = "4.8.0" mockitoKotlinVersion = "4.0.0" - mockkVersion = "1.12.5" + mockkVersion = "1.13.2" espressoVersion = "3.4.0" workRuntime = "2.7.1" fidoVersion = "4.1.0" From 6c217cffa622fa2e34f031aa16bae6d8b3fd49c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Brey?= Date: Fri, 30 Sep 2022 10:00:24 +0200 Subject: [PATCH 2/2] Update packagingOptions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Álvaro Brey --- app/build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index afa2653cc1..ccfbd77771 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -156,7 +156,8 @@ android { // see http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Configuring-the-Structure packagingOptions { resources { - excludes += ['META-INF/LICENSE.txt', 'META-INF/LICENSE'] + excludes += 'META-INF/LICENSE*' + pickFirst 'MANIFEST.MF' // workaround for duplicated manifest on some dependencies } }