From 8b63a86c9eb420649b34eb2b47ff45a1c6d8a061 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Oct 2022 08:25:30 +0000 Subject: [PATCH 1/3] Bump mockk from 1.12.3 to 1.13.2 Bumps `mockk` from 1.12.3 to 1.13.2. Updates `mockk` from 1.12.3 to 1.13.2 - [Release notes](https://github.com/mockk/mockk/releases) - [Commits](https://github.com/mockk/mockk/compare/1.12.3...1.13.2) Updates `mockk-android` from 1.12.3 to 1.13.2 - [Release notes](https://github.com/mockk/mockk/releases) - [Commits](https://github.com/mockk/mockk/compare/1.12.3...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] --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index db4a961648f..0ffe1dd503d 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -29,7 +29,7 @@ def vanniktechEmoji = "0.16.0-SNAPSHOT" def sentry = "6.6.0" def fragment = "1.5.4" // Testing -def mockk = "1.12.3" // We need to use 1.12.3 to have mocking in androidTest until a new version is released: https://github.com/mockk/mockk/issues/819 +def mockk = "1.13.2" // We need to use 1.12.3 to have mocking in androidTest until a new version is released: https://github.com/mockk/mockk/issues/819 def espresso = "3.4.0" def androidxTest = "1.4.0" def androidxOrchestrator = "1.4.1" From 851dd8582071907db0d6c199fe7eccb28f842ae3 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 25 Oct 2022 16:40:58 +0200 Subject: [PATCH 2/3] Remove unused dep. --- vector-app/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/vector-app/build.gradle b/vector-app/build.gradle index 9a0bfdfa63f..af8693fde1c 100644 --- a/vector-app/build.gradle +++ b/vector-app/build.gradle @@ -409,7 +409,6 @@ dependencies { androidTestImplementation('com.adevinta.android:barista:4.2.0') { exclude group: 'org.jetbrains.kotlin' } - androidTestImplementation libs.mockk.mockkAndroid androidTestUtil libs.androidx.orchestrator androidTestImplementation libs.androidx.fragmentTesting androidTestImplementation "org.jetbrains.kotlin:kotlin-reflect:1.7.20" From 22a813053f09620d471ac43895fb76b6fd399bf4 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 25 Oct 2022 17:33:41 +0200 Subject: [PATCH 3/3] Remove legacy comment --- dependencies.gradle | 2 +- matrix-sdk-android/build.gradle | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 0ffe1dd503d..208246170d9 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -29,7 +29,7 @@ def vanniktechEmoji = "0.16.0-SNAPSHOT" def sentry = "6.6.0" def fragment = "1.5.4" // Testing -def mockk = "1.13.2" // We need to use 1.12.3 to have mocking in androidTest until a new version is released: https://github.com/mockk/mockk/issues/819 +def mockk = "1.13.2" def espresso = "3.4.0" def androidxTest = "1.4.0" def androidxOrchestrator = "1.4.1" diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle index 968d8515ac9..9f6aa5f567a 100644 --- a/matrix-sdk-android/build.gradle +++ b/matrix-sdk-android/build.gradle @@ -204,7 +204,6 @@ dependencies { implementation libs.google.phonenumber testImplementation libs.tests.junit - // Note: version sticks to 1.9.2 due to https://github.com/mockk/mockk/issues/281 testImplementation libs.mockk.mockk testImplementation libs.tests.kluent testImplementation libs.jetbrains.coroutinesTest