From d23dd82fc23a030a9fc949b1fa2f677403d69965 Mon Sep 17 00:00:00 2001
From: Amine <amine.bouabdallaoui@pm.me>
Date: Tue, 31 Dec 2024 11:06:36 +0100
Subject: [PATCH] bump: androix and coroutines.

---
 androidApp/build.gradle.kts                   | 25 +++++++++----------
 .../readerforselfossv2/android/CommonTests.kt |  1 -
 shared/build.gradle.kts                       |  2 +-
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
index 49bc9b3..c45f3bd 100644
--- a/androidApp/build.gradle.kts
+++ b/androidApp/build.gradle.kts
@@ -65,14 +65,14 @@ android {
     kotlinOptions {
         jvmTarget = "17"
     }
-    compileSdk = 34
+    compileSdk = 35
     buildFeatures {
         viewBinding = true
     }
     defaultConfig {
         applicationId = "bou.amine.apps.readerforselfossv2.android"
         minSdk = 25
-        targetSdk = 34
+        targetSdk = 34 // 35 when edge-to-edge is handled
         versionCode = versionCodeFromGit()
         versionName = versionNameFromGit()
 
@@ -123,23 +123,22 @@ dependencies {
 
     implementation(project(":shared"))
     implementation("com.google.android.material:material:1.9.0")
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1")
+    implementation("androidx.appcompat:appcompat:1.7.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1")
 
     implementation("androidx.preference:preference-ktx:1.2.1")
 
     implementation(fileTree(mapOf("include" to listOf("*.jar"), "dir" to "libs")))
 
     // Android Support
-    implementation("androidx.appcompat:appcompat:1.6.1")
     implementation("com.google.android.material:material:1.9.0")
-    implementation("androidx.recyclerview:recyclerview:1.3.1")
+    implementation("androidx.recyclerview:recyclerview:1.4.0-rc01")
     implementation("androidx.legacy:legacy-support-v4:1.0.0")
-    implementation("androidx.vectordrawable:vectordrawable:1.2.0-beta01")
+    implementation("androidx.vectordrawable:vectordrawable:1.2.0")
     implementation("androidx.cardview:cardview:1.0.0")
-    implementation("androidx.annotation:annotation:1.7.0")
-    implementation("androidx.work:work-runtime-ktx:2.8.1")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+    implementation("androidx.annotation:annotation:1.9.1")
+    implementation("androidx.work:work-runtime-ktx:2.10.0")
+    implementation("androidx.constraintlayout:constraintlayout:2.2.0")
     implementation("org.jsoup:jsoup:1.15.4")
 
     //multidex
@@ -161,7 +160,7 @@ dependencies {
 
     // Pager
     implementation("me.relex:circleindicator:2.1.6")
-    implementation("androidx.viewpager2:viewpager2:1.1.0-beta02")
+    implementation("androidx.viewpager2:viewpager2:1.1.0")
 
     //Dependency Injection
     implementation("org.kodein.di:kodein-di:7.14.0")
@@ -177,7 +176,7 @@ dependencies {
     //PhotoView
     implementation("com.github.chrisbanes:PhotoView:2.3.0")
 
-    implementation("androidx.core:core-ktx:1.12.0")
+    implementation("androidx.core:core-ktx:1.15.0")
 
     implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
 
@@ -190,7 +189,7 @@ dependencies {
     //test
     testImplementation("junit:junit:4.13.2")
     testImplementation("io.mockk:mockk:1.12.0")
-    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1")
+    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
     implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
     androidTestImplementation("androidx.test:runner:1.6.2")
     androidTestImplementation("androidx.test:rules:1.6.1")
diff --git a/androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/CommonTests.kt b/androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/CommonTests.kt
index 09ac1fd..3a233d2 100644
--- a/androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/CommonTests.kt
+++ b/androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/CommonTests.kt
@@ -22,7 +22,6 @@ fun performLogin(someUrl: String? = null) {
         )
     )
     onView(withId(R.id.signInButton)).perform(click())
-    Thread.sleep(10000)
 }
 
 fun loginAndInitHome() {
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
index d317c4b..5403cbf 100644
--- a/shared/build.gradle.kts
+++ b/shared/build.gradle.kts
@@ -37,7 +37,7 @@ kotlin {
                 implementation("io.ktor:ktor-client-logging:$ktorVersion")
                 implementation("io.ktor:ktor-client-auth:$ktorVersion")
                 implementation("io.ktor:ktor-client-cio:$ktorVersion")
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1")
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
 
                 implementation("org.jsoup:jsoup:1.15.4")