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

CherchesovAzamat · web-flow · commit 557e6cf7bece · 2024-08-20T16:28:45.000+03:00
TECH: Set jvm toolchain version
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"

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,13 @@ android {`
`35`	`35`	`buildFeatures {`
`36`	`36`	`viewBinding = true // for the samples`
`37`	`37`	`}`
	`38`	`+`
	`39`	`+ configurations.configureEach {`
	`40`	`+ resolutionStrategy {`
	`41`	`+ force("androidx.test:core:1.6.1")`
	`42`	`+ // or force libs.test.core`
	`43`	`+ }`
	`44`	`+ }`
`38`	`45`	`}`
`39`	`46`
`40`	`47`	`tasks.withType<KotlinCompile>().configureEach {`
Original file line number	Diff line number	Diff line change
`@@ -31,3 +31,7 @@ tasks.withType<KotlinCompile>().configureEach {`
`31`	`31`	`jvmTarget = JavaVersion.VERSION_1_8.toString()`
`32`	`32`	`}`
`33`	`33`	`}`
	`34`	`+`
	`35`	`+kotlin {`
	`36`	`+ jvmToolchain(8)`
	`37`	`+}`