Merge pull request #658 from KasperskyLab/TECH-Java-8

TECH: Set jvm toolchain version
KasperskyLab · Aug 20, 2024 · 557e6cf · 557e6cf
2 parents 8185355 + b46f7d7
commit 557e6cf
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
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
@@ -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 {

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
@@ -31,3 +31,7 @@ tasks.withType<KotlinCompile>().configureEach {
         jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
 }
+
+kotlin {
+    jvmToolchain(8)
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,8 +1,8 @@
 [versions]
 kotlin = "1.8.22"
 detekt = "1.21.0"
-espresso = "3.5.1"
-kakao = "3.5.1"
+espresso = "3.6.1"
+kakao = "3.6.2"
 kakaoCompose = "0.2.3"
 kakaoExtClicks = "1.0.0"
 allure = "2.4.0"