From 523d37a34259a3c1cb065985b3652978e86bbe0e Mon Sep 17 00:00:00 2001
From: Armin <armin.schnabel@cyface.de>
Date: Thu, 14 Mar 2024 09:40:57 +0100
Subject: [PATCH] Upgrade dependencies (+ sync dependency versions w/main)

---
 build.gradle                                               | 7 ++++---
 .../datacapturing/backend/DataCapturingLocalTest.java      | 4 ++--
 .../de/cyface/datacapturing/backend/DataCapturingTest.java | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 5a1efdc33..cc1885a37 100644
--- a/build.gradle
+++ b/build.gradle
@@ -50,14 +50,15 @@ ext {
     compileSdkVersion = 34
     buildToolsVersion = '34.0.0'
 
-    androidxAnnotationVersion = "1.5.0"
-    androidxAppCompatVersion = "1.2.0"
+    // Android dependencies
+    androidxAnnotationVersion = "1.6.0"
+    androidxAppCompatVersion = "1.6.1"
     localbroadcastmanagerVersion = "1.1.0"
     roomVersion = "2.6.1"
 
     // testing
     junitVersion = "1.1.5"
-    mockitoVersion = "3.3.3"
+    mockitoVersion = "5.7.0"
     hamcrestVersion = "1.3"
     rulesVersion = "1.5.0"
     robolectricVersion = "4.10.2"
diff --git a/datacapturing/src/test/java/de/cyface/datacapturing/backend/DataCapturingLocalTest.java b/datacapturing/src/test/java/de/cyface/datacapturing/backend/DataCapturingLocalTest.java
index f9b838a0f..99d3b725a 100644
--- a/datacapturing/src/test/java/de/cyface/datacapturing/backend/DataCapturingLocalTest.java
+++ b/datacapturing/src/test/java/de/cyface/datacapturing/backend/DataCapturingLocalTest.java
@@ -24,9 +24,9 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
diff --git a/datacapturing/src/test/java/de/cyface/datacapturing/backend/DataCapturingTest.java b/datacapturing/src/test/java/de/cyface/datacapturing/backend/DataCapturingTest.java
index 79a0833ed..f652bb3a5 100644
--- a/datacapturing/src/test/java/de/cyface/datacapturing/backend/DataCapturingTest.java
+++ b/datacapturing/src/test/java/de/cyface/datacapturing/backend/DataCapturingTest.java
@@ -18,7 +18,7 @@
  */
 package de.cyface.datacapturing.backend;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;