Skip to content

Commit 79d3ad4

Browse files
authored
TECH: Update compose (#719)
* TECH: Update compose
1 parent 69ca72c commit 79d3ad4

File tree

5 files changed

+18
-13
lines changed

5 files changed

+18
-13
lines changed

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ plugins {
66
id("convention.dependency-updates")
77
id("io.gitlab.arturbosch.detekt") version "1.21.0"
88
id("convention.air")
9+
alias(libs.plugins.compose.compiler) apply false
910
}
1011

1112
buildscript {

compose-support/build.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ publish {
1515

1616
dependencies {
1717
api(libs.kakaoCompose)
18+
api(libs.kakaoTest)
19+
api(libs.kakaoUi)
20+
api(libs.kakaoSemantics)
1821
api(libs.composeUiTest)
1922

2023
implementation(projects.kaspresso)

gradle/libs.versions.toml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[versions]
2-
kotlin = "1.8.22"
2+
kotlin = "2.0.0"
33
detekt = "1.21.0"
44
espresso = "3.6.1"
55
kakao = "3.6.2"
6-
kakaoCompose = "0.2.3"
6+
kakaoCompose = "1.0.0"
77
kakaoExtClicks = "1.0.0"
88
allure = "2.4.0"
9-
compose = "1.5.4"
10-
composeCompiler = "1.4.8"
9+
compose = "1.7.8"
10+
composeCompiler = "1.5.15"
1111
activityCompose = "1.4.0"
1212
androidXTest = "1.6.1"
1313
testOrchestrator = "1.4.2"
@@ -38,7 +38,7 @@ detektFormatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", v
3838

3939
androidXCore = "androidx.core:core:1.12.0"
4040
appcompat = "androidx.appcompat:appcompat:1.6.1"
41-
material = "com.google.android.material:material:1.11.0"
41+
material = "com.google.android.material:material:1.12.0"
4242
constraint = "androidx.constraintlayout:constraintlayout:2.1.4"
4343
multidex = "androidx.multidex:multidex:2.0.1"
4444

@@ -56,11 +56,14 @@ uiAutomator = "androidx.test.uiautomator:uiautomator:2.3.0"
5656
robolectric = "org.robolectric:robolectric:4.8.2"
5757
kakao = { module = "io.github.kakaocup:kakao", version.ref = "kakao" }
5858
kakaoCompose = { module = "io.github.kakaocup:compose", version.ref = "kakaoCompose" }
59+
kakaoTest = { module = "io.github.kakaocup:compose-test", version.ref = "kakaoCompose" }
60+
kakaoUi = { module = "io.github.kakaocup:compose-ui", version.ref = "kakaoCompose" }
61+
kakaoSemantics = { module = "io.github.kakaocup:compose-semantics", version.ref = "kakaoCompose" }
5962
kakaoExtClicks = { module = "io.github.kakaocup:kakao-ext-clicks", version.ref = "kakaoExtClicks" }
6063
junit = "junit:junit:4.13.2"
6164
junitJupiter = "org.junit.jupiter:junit-jupiter:5.9.0"
6265
assertj = "org.assertj:assertj-core:3.11.1"
63-
truth = "com.google.truth:truth:1.3.0"
66+
truth = "com.google.truth:truth:1.4.4"
6467
mockk = "io.mockk:mockk:1.13.12"
6568

6669
androidXTestCore = { module = "androidx.test:core", version.ref = "androidXTest" }
@@ -72,7 +75,6 @@ androidXTestExtJunit = "androidx.test.ext:junit:1.1.5"
7275
androidXTestExtJunitKtx = "androidx.test.ext:junit-ktx:1.1.5"
7376
androidXLifecycleRuntimeKtx = "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2"
7477

75-
composeCompiler = { module = "androidx.compose.compiler:compiler", version.ref = "composeCompiler" }
7678
composeActivity = "androidx.activity:activity-compose:1.5.1"
7779
composeUiTooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
7880
composeMaterial = { module = "androidx.compose.material:material", version.ref = "compose" }
@@ -95,7 +97,8 @@ com-google-android-material-material = { group = "com.google.android.material",
9597
[bundles]
9698
espresso = ["espressoCore", "espressoWeb"]
9799
allure = ["allureKotlinModel", "allureKotlinCommons", "allureKotlinJunit4", "allureKotlinAndroid"]
98-
compose = ["composeActivity", "composeUiTooling", "composeMaterial", "composeTestManifest", "composeCompiler"]
100+
compose = ["composeActivity", "composeUiTooling", "composeMaterial", "composeTestManifest"]
99101
[plugins]
100102
com-android-library = { id = "com.android.library", version.ref = "agp" }
101103
org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "org-jetbrains-kotlin-android" }
104+
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

kaspresso/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ publish {
2121
dependencies {
2222
api(projects.kautomator)
2323
api(libs.kakao)
24+
api(libs.kakao)
2425
api(libs.kakaoExtClicks)
2526
api(libs.bundles.espresso)
2627
api(libs.uiAutomator)

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
plugins {
22
id("convention.android-app")
3+
alias(libs.plugins.compose.compiler)
34
}
45

56
android {
67
namespace = "com.kaspersky.kaspresso.composesupport.sample"
78
defaultConfig {
8-
minSdk = 21
9+
minSdk = 24
910

1011
applicationId = "com.kaspersky.kaspresso.composesupport.sample"
1112
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -16,10 +17,6 @@ android {
1617
compose = true
1718
}
1819

19-
composeOptions {
20-
kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
21-
}
22-
2320
sourceSets {
2421
// configure shared test folder
2522
val sharedTestFolder = "src/sharedTest/kotlin"

0 commit comments

Comments
 (0)