Skip to content

Commit b557238

Browse files
authored
TECH: Bump libraries (#729)
* TECH: Bump libraries
1 parent 7a0d69e commit b557238

14 files changed

Lines changed: 43 additions & 31 deletions

File tree

build-logic/android/src/main/kotlin/convention.android-app.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ plugins {
99

1010
android {
1111
compileOptions {
12-
targetCompatibility = JavaVersion.VERSION_1_8
13-
sourceCompatibility = JavaVersion.VERSION_1_8
12+
targetCompatibility = JavaVersion.VERSION_11
13+
sourceCompatibility = JavaVersion.VERSION_11
1414
}
1515

1616
testBuildType = "debug"
@@ -46,6 +46,6 @@ android {
4646

4747
tasks.withType<KotlinCompile>().configureEach {
4848
kotlinOptions {
49-
jvmTarget = JavaVersion.VERSION_1_8.toString()
49+
jvmTarget = JavaVersion.VERSION_11.toString()
5050
}
5151
}

build-logic/android/src/main/kotlin/convention.android-base.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import com.android.build.gradle.BaseExtension
33
@Suppress("MagicNumber")
44
configure<BaseExtension> {
55

6-
compileSdkVersion(34)
6+
compileSdkVersion(35)
77

88
compileOptions {
9-
sourceCompatibility = JavaVersion.VERSION_1_8
10-
targetCompatibility = JavaVersion.VERSION_1_8
9+
sourceCompatibility = JavaVersion.VERSION_11
10+
targetCompatibility = JavaVersion.VERSION_11
1111
}
1212

1313
defaultConfig {

build-logic/android/src/main/kotlin/convention.android-library.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@ android {
2121
}
2222

2323
compileOptions {
24-
targetCompatibility = JavaVersion.VERSION_1_8
25-
sourceCompatibility = JavaVersion.VERSION_1_8
24+
targetCompatibility = JavaVersion.VERSION_11
25+
sourceCompatibility = JavaVersion.VERSION_11
2626
}
2727
}
2828

2929
tasks.withType<KotlinCompile>().configureEach {
3030
kotlinOptions {
31-
jvmTarget = JavaVersion.VERSION_1_8.toString()
31+
jvmTarget = JavaVersion.VERSION_11.toString()
3232
}
3333
}
3434

3535
kotlin {
36-
jvmToolchain(8)
36+
jvmToolchain(11)
3737
}
Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,22 @@
11

22
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
33

4-
val kotlinLanguageVersion = "1.8"
54

65
tasks.withType<KotlinCompile>().configureEach {
76
kotlinOptions {
87

9-
jvmTarget = JavaVersion.VERSION_1_8.toString()
8+
jvmTarget = JavaVersion.VERSION_11.toString()
109

1110
// TODO: fix all warnings before
1211
// allWarningsAsErrors = true
1312

14-
languageVersion = kotlinLanguageVersion
15-
apiVersion = kotlinLanguageVersion
16-
1713
freeCompilerArgs = freeCompilerArgs +
1814
"-opt-in=kotlin.RequiresOptIn" +
1915
"-progressive"
2016
}
2117
}
2218

2319
tasks.withType<JavaCompile>().configureEach {
24-
sourceCompatibility = JavaVersion.VERSION_1_8.toString()
25-
targetCompatibility = JavaVersion.VERSION_1_8.toString()
20+
sourceCompatibility = JavaVersion.VERSION_11.toString()
21+
targetCompatibility = JavaVersion.VERSION_11.toString()
2622
}

gradle/libs.versions.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
[versions]
2-
kotlin = "2.0.0"
2+
kotlin = "2.1.0"
33
detekt = "1.21.0"
4-
espresso = "3.6.1"
5-
kakao = "3.6.2"
6-
kakaoCompose = "1.0.0"
4+
espresso = "3.7.0"
5+
kakao = "3.6.5"
6+
kakaoCompose = "1.1.0"
77
kakaoExtClicks = "1.0.0"
88
allure = "2.4.0"
9-
compose = "1.7.8"
9+
compose = "1.10.0"
1010
composeCompiler = "1.5.15"
1111
activityCompose = "1.4.0"
1212
androidXTest = "1.6.1"
1313
testOrchestrator = "1.4.2"
1414
lifecycle = "2.6.2"
15-
thirdPartyReport = "0.19.1296"
15+
thirdPartyReport = "0.19.1450"
1616
agp = "7.2.2"
1717
org-jetbrains-kotlin-android = "1.9.0"
1818
core-ktx = "1.9.0"
@@ -24,7 +24,7 @@ material = "1.8.0"
2424
[libraries]
2525
# plugins
2626
kotlinPlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
27-
androidPlugin = "com.android.tools.build:gradle:8.4.2"
27+
androidPlugin = "com.android.tools.build:gradle:8.6.0"
2828
versionsPlugin = "com.github.ben-manes:gradle-versions-plugin:0.50.0"
2929
thirdPartyReportPlugin = { module = "com.kaspersky.gradle:third-party-report", version.ref = "thirdPartyReport" }
3030
airPlugin = { module = "com.kaspersky.gradle:air", version.ref = "thirdPartyReport" }
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Thu Jan 30 16:33:50 MSK 2025
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

kaspresso/src/main/kotlin/com/kaspersky/kaspresso/internal/visual/DefaultScreenshotsComparator.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.kaspersky.kaspresso.internal.visual
22

3+
import android.annotation.SuppressLint
34
import android.graphics.Bitmap
45
import android.graphics.BitmapFactory
56
import android.graphics.Color
@@ -77,10 +78,13 @@ open class DefaultScreenshotsComparator(
7778
abs(b1 - b2) <= colorTolerance
7879
}
7980

81+
@SuppressLint("UseKtx")
8082
protected open fun processScreenshotDiff(original: Bitmap, diffPixels: IntArray, diffName: String): File {
8183
val width = original.width
8284
val height = original.height
83-
val diffBitmap = Bitmap.createBitmap(width, height, original.config)
85+
val config = requireNotNull(original.config) { "Error processing screenshot diff" }
86+
87+
val diffBitmap = Bitmap.createBitmap(width, height, config)
8488
diffBitmap.setPixels(diffPixels, 0, width, 0, 0, width, height)
8589
val scaledBitmap = Bitmap.createScaledBitmap(
8690
diffBitmap,

kaspresso/src/main/kotlin/com/kaspersky/kaspresso/testcases/models/info/TestInfo.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.kaspersky.kaspresso.testcases.models.info
22

3-
data class TestInfo internal constructor(
3+
data class TestInfo(
44
val testName: String,
55
val stepInfos: List<StepInfo> = listOf(),
66
val throwable: Throwable? = null

kautomator/src/main/kotlin/com/kaspersky/components/kautomator/common/EnvironmentDetector.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ private const val ANDROID_RUNTIME = "android"
1212
val environment: Environment by lazy {
1313
val runtimeProperty = System.getProperty(JAVA_RUNTIME_PROPERTY)
1414
when {
15-
runtimeProperty?.toLowerCase(Locale.ROOT)?.contains(ANDROID_RUNTIME) == true -> Environment.AndroidRuntime
15+
runtimeProperty?.lowercase(Locale.ROOT)?.contains(ANDROID_RUNTIME) == true -> Environment.AndroidRuntime
1616
hasClass(ROBOLECTRIC_TEST_RUNNER) -> Environment.Robolectric
1717
else -> throw RuntimeException(
1818
"""

samples/kaspresso-compose-support-sample/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
android {
77
namespace = "com.kaspersky.kaspresso.composesupport.sample"
88
defaultConfig {
9-
minSdk = 24
9+
minSdk = 21
1010

1111
applicationId = "com.kaspersky.kaspresso.composesupport.sample"
1212
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

0 commit comments

Comments
 (0)