Merge pull request #758 from vbuberen/update/android_dependencies

Switch to AndroidX, drop Jetifier, update Kotlin dependencies
florent37 · May 5, 2023 · d1c5508 · d1c5508
2 parents 0fcc9c5 + 627853d
commit d1c5508
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -2,7 +2,7 @@
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.7.20'
+    ext.kotlin_version = '1.7.21'
     repositories {
         google()
         mavenCentral()
@@ -50,13 +50,11 @@ dependencies {
 
     def coroutinesVersion = '1.6.4'
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.android.support:multidex:1.0.3'
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation "androidx.multidex:multidex:2.0.1"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
     implementation 'androidx.annotation:annotation:1.5.0'
 
-
     def exoPlayerVersion = '2.18.1'
 
     implementation "com.google.android.exoplayer:exoplayer:$exoPlayerVersion"

diff --git a/android/gradle.properties b/android/gradle.properties
@@ -1,3 +1,2 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
-android.enableJetifier=true
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Nov 04 15:39:06 CET 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME