Bump Android dependencies

2 files changed, 15 insertions, 13 deletions

diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 54b2b96643..adeecc4c5a 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -23,7 +23,6 @@ if (keystorePropertiesFile.exists()) {
 
 android {
     compileSdkVersion(Versions.Android.compileSdkVersion)
-    buildToolsVersion(Versions.Android.buildToolsVersion)
 
     defaultConfig {
         applicationId = "net.mullvad.mullvadvpn"
@@ -106,6 +105,10 @@ android {
         }
     }
 
+    packagingOptions {
+        jniLibs.useLegacyPackaging = true
+    }
+
     project.tasks.preBuild.dependsOn("ensureJniDirectoryExist")
 }
 
diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt
index 23e8571867..a0ff748841 100644
--- a/android/buildSrc/src/main/kotlin/Versions.kt
+++ b/android/buildSrc/src/main/kotlin/Versions.kt
@@ -1,17 +1,16 @@
 object Versions {
     const val commonsValidator = "1.7"
-    const val jodaTime = "2.10.2"
+    const val jodaTime = "2.10.14"
     const val junit = "4.13"
     const val jvmTarget = "1.8"
-    const val koin = "2.2.2"
-    const val kotlin = "1.4.31"
-    const val kotlinx = "1.5.1"
+    const val koin = "2.2.3"
+    const val kotlin = "1.5.31"
+    const val kotlinx = "1.5.2"
     const val leakCanary = "2.8.1"
-    const val mockk = "1.12.0"
+    const val mockk = "1.12.3"
 
     object Android {
-        const val buildToolsVersion = "30.0.3"
-        const val compileSdkVersion = 30
+        const val compileSdkVersion = 31
         const val material = "1.4.0"
         const val minSdkVersion = 26
         const val targetSdkVersion = 30
@@ -20,20 +19,20 @@ object Versions {
     object AndroidX {
         const val appcompat = "1.3.1"
         const val coreKtx = "1.6.0"
-        const val constraintlayout = "2.1.0"
+        const val constraintlayout = "2.1.3"
         const val coordinatorlayout = "1.1.0"
         const val espresso = "3.3.0"
-        const val lifecycle = "2.3.1"
+        const val lifecycle = "2.4.1"
         const val fragment = "1.3.2"
         const val recyclerview = "1.2.1"
         const val junit = "1.1.3"
     }
 
     object Plugin {
-        const val android = "4.1.3"
+        const val android = "4.2.2"
         const val playPublisher = "2.7.5"
-        const val kotlin = "1.4.31"
+        const val kotlin = "1.5.32"
         const val dependencyCheck = "6.5.0.1"
-        const val gradleVersions = "0.41.0"
+        const val gradleVersions = "0.42.0"
     }
 }