From 61264290336fdd86d7285385ee2fae26ed40b204 Mon Sep 17 00:00:00 2001
From: Maarten Vercruysse <67873169+MV-GH@users.noreply.github.com>
Date: Wed, 2 Aug 2023 09:23:16 +0200
Subject: [PATCH] Update deps, gradle and target SDK 34 (#1120)

* Update deps, gradle and target SDK 34

* Smoll change

* Trigger woodpecker

* Remove change from diff branch
---
 app/build.gradle.kts        | 21 ++++++++++++---------
 benchmarks/build.gradle.kts |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index da1b8c6b1..cd693a056 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -12,13 +12,13 @@ plugins {
 apply(from = "update_instances.gradle.kts")
 
 android {
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         applicationId = "com.jerboa"
         namespace = "com.jerboa"
         minSdk = 26
-        targetSdk = 33
+        targetSdk = 34
         versionCode = 41
         versionName = "0.0.41"
 
@@ -99,8 +99,6 @@ android {
 }
 
 dependencies {
-    val composeVersion = "1.5.0-beta03"
-
     implementation("androidx.appcompat:appcompat:1.6.1")
     implementation("com.github.alorma:compose-settings-ui-m3:0.27.0")
 
@@ -154,24 +152,28 @@ dependencies {
     // Unfortunately, ui tooling, and the markdown thing, still brings in the other material2 dependencies
     implementation("androidx.compose.material3:material3:1.1.1")
     implementation("androidx.compose.material3:material3-window-size-class:1.1.1")
-    implementation("androidx.compose.material:material-icons-extended:$composeVersion")
+
     implementation("org.ocpsoft.prettytime:prettytime:5.0.6.Final")
     implementation("io.coil-kt:coil-compose:2.4.0")
-    implementation("androidx.navigation:navigation-compose:2.7.0-beta01")
+    implementation("androidx.navigation:navigation-compose:2.7.0-rc01")
     testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.1")
     testImplementation("androidx.arch.core:core-testing:2.2.0")
     implementation("com.squareup.retrofit2:retrofit:2.9.0")
     implementation("com.squareup.retrofit2:converter-gson:2.9.0")
 
+    val composeVersion = "1.5.0-rc01"
     implementation("androidx.compose.ui:ui:$composeVersion")
     implementation("androidx.compose.ui:ui-tooling-preview:$composeVersion")
+    androidTestImplementation("androidx.compose.ui:ui-test-junit4:$composeVersion")
+    debugImplementation("androidx.compose.ui:ui-tooling:$composeVersion")
+    debugImplementation("androidx.compose.ui:ui-test-manifest:$composeVersion")
+    implementation("androidx.compose.material:material-icons-extended:$composeVersion")
+
     implementation("androidx.activity:activity-compose:1.7.2")
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
-    androidTestImplementation("androidx.compose.ui:ui-test-junit4:$composeVersion")
-    debugImplementation("androidx.compose.ui:ui-tooling:$composeVersion")
-    debugImplementation("androidx.compose.ui:ui-test-manifest:$composeVersion")
+
     implementation("net.engawapg.lib:zoomable:1.4.3")
     implementation("androidx.browser:browser:1.5.0")
 
@@ -179,4 +181,5 @@ dependencies {
     baselineProfile(project(":benchmarks"))
 
     implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.5")
+
 }
diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index e3b375fb5..f2c41a104 100644
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -21,12 +21,12 @@ android {
     }
 
     defaultConfig {
+        testInstrumentationRunnerArguments += mapOf("suppressErrors" to "EMULATOR")
         minSdk = 26
         targetSdk =  34
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         // Only use the emulator to test benchmarks
-        testInstrumentationRunnerArguments += mapOf("suppressErrors" to "EMULATOR")
     }
 
     targetProjectPath = ":app"