From 15ac31ce7acff130d2b27dbb8210bdc3f91f2de5 Mon Sep 17 00:00:00 2001
From: Nikita Evdokimov <nikita-e57@yandex.ru>
Date: Wed, 14 Aug 2024 17:32:15 +0300
Subject: [PATCH 1/4] TECH: Set jvm toolchain version
---
.../src/main/kotlin/convention.android-library.gradle.kts | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/build-logic/android/src/main/kotlin/convention.android-library.gradle.kts b/build-logic/android/src/main/kotlin/convention.android-library.gradle.kts
index f43dea865..8de73a928 100644
--- a/build-logic/android/src/main/kotlin/convention.android-library.gradle.kts
+++ b/build-logic/android/src/main/kotlin/convention.android-library.gradle.kts
@@ -31,3 +31,7 @@ tasks.withType<KotlinCompile>().configureEach {
jvmTarget = JavaVersion.VERSION_1_8.toString()
}
}
+
+kotlin {
+ jvmToolchain(8)
+}
From 0d9d6944bbafde01bbae8d4e588fca24ff3b8a2d Mon Sep 17 00:00:00 2001
From: Nikita Evdokimov <nikita-e57@yandex.ru>
Date: Thu, 15 Aug 2024 12:50:34 +0300
Subject: [PATCH 2/4] TECH: Bump kakao
---
gradle/libs.versions.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2e9f7b32d..0dcc46b6a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
kotlin = "1.8.22"
detekt = "1.21.0"
espresso = "3.5.1"
-kakao = "3.5.1"
+kakao = "3.6.2"
kakaoCompose = "0.2.3"
kakaoExtClicks = "1.0.0"
allure = "2.4.0"
From ce0a4761392aa335879979217d64fadbcfa02424 Mon Sep 17 00:00:00 2001
From: Nikita Evdokimov <nikita-e57@yandex.ru>
Date: Fri, 16 Aug 2024 11:21:48 +0300
Subject: [PATCH 3/4] TECH: Try to fix tests again
---
gradle/libs.versions.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 142753f2d..45e4fc994 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
[versions]
kotlin = "1.8.22"
detekt = "1.21.0"
-espresso = "3.5.1"
+espresso = "3.6.1"
kakao = "3.6.2"
kakaoCompose = "0.2.3"
kakaoExtClicks = "1.0.0"
From b46f7d7f1338544388e371bb7b4b97a673cea836 Mon Sep 17 00:00:00 2001
From: Nikita Evdokimov <nikita-e57@yandex.ru>
Date: Fri, 16 Aug 2024 14:21:19 +0300
Subject: [PATCH 4/4] TECH: Try to fix tests again
---
.../src/main/kotlin/convention.android-app.gradle.kts | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/build-logic/android/src/main/kotlin/convention.android-app.gradle.kts b/build-logic/android/src/main/kotlin/convention.android-app.gradle.kts
index a0dd0cd71..f7977da42 100644
--- a/build-logic/android/src/main/kotlin/convention.android-app.gradle.kts
+++ b/build-logic/android/src/main/kotlin/convention.android-app.gradle.kts
@@ -35,6 +35,13 @@ android {
buildFeatures {
viewBinding = true // for the samples
}
+
+ configurations.configureEach {
+ resolutionStrategy {
+ force("androidx.test:core:1.6.1")
+ // or force libs.test.core
+ }
+ }
}
tasks.withType<KotlinCompile>().configureEach {