From 2b1e4dcb23f094a6bc9f8cfc3147a701e042fc6b Mon Sep 17 00:00:00 2001
From: Albert Vaca Cintora <albert.vaca@datadoghq.com>
Date: Mon, 2 Jan 2023 21:58:18 +0100
Subject: [PATCH] Bump deps

---
 build.gradle                                    | 6 +++---
 tests/org/kde/kdeconnect/DeviceTest.java        | 2 +-
 tests/org/kde/kdeconnect/NetworkPacketTest.java | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 966d958d..6a217d71 100644
--- a/build.gradle
+++ b/build.gradle
@@ -170,7 +170,7 @@ dependencies {
 
     implementation 'commons-io:commons-io:2.8.0' // newer versions don't work on Android 7: https://stackoverflow.com/questions/73604534/no-static-method-threadlocal-withinitial-commons-io-dependency
     implementation 'org.apache.commons:commons-collections4:4.4'
-    implementation 'org.apache.commons:commons-lang3:3.11'
+    implementation 'org.apache.commons:commons-lang3:3.12.0'
 
     // Kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
@@ -182,8 +182,8 @@ dependencies {
     testImplementation 'org.powermock:powermock-core:2.0.0'
     testImplementation 'org.powermock:powermock-module-junit4:2.0.0'
     testImplementation 'org.powermock:powermock-api-mockito2:2.0.0'
-    testImplementation 'org.mockito:mockito-core:2.23.0'
-    testImplementation 'org.skyscreamer:jsonassert:1.3.0'
+    testImplementation 'org.mockito:mockito-core:3.12.4' // powermock isn't compatible with mockito 4
+    testImplementation 'org.skyscreamer:jsonassert:1.5.1'
 
     // For device controls
     implementation 'org.reactivestreams:reactive-streams:1.0.4'
diff --git a/tests/org/kde/kdeconnect/DeviceTest.java b/tests/org/kde/kdeconnect/DeviceTest.java
index 556ccca0..b11c671f 100644
--- a/tests/org/kde/kdeconnect/DeviceTest.java
+++ b/tests/org/kde/kdeconnect/DeviceTest.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({Base64.class, Log.class, PreferenceManager.class, ContextCompat.class})
diff --git a/tests/org/kde/kdeconnect/NetworkPacketTest.java b/tests/org/kde/kdeconnect/NetworkPacketTest.java
index 54caab6a..ec8cf5b3 100644
--- a/tests/org/kde/kdeconnect/NetworkPacketTest.java
+++ b/tests/org/kde/kdeconnect/NetworkPacketTest.java
@@ -23,8 +23,8 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({DeviceHelper.class, Log.class})