Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TECH: Libs versions bump #614

Merged
merged 3 commits into from
Jan 16, 2024
Merged

TECH: Libs versions bump #614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c425e41
TECH: Libs versions bump
Nikitae57 Jan 10, 2024
0b6ee76
TECH: Libs versions bump
Nikitae57 Jan 10, 2024
f83dd93
TECH: Remove transitive dependency restriction
Nikitae57 Jan 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ composeCompiler = "1.5.4"
activityCompose = "1.4.0"
androidXTest = "1.5.0"
testOrchestrator = "1.4.2"
lifecycle = "2.5.1"
lifecycle = "2.6.2"
thirdPartyReport = "0.18.956"

[libraries]
Expand All @@ -29,9 +29,9 @@ kotlinCli = "org.jetbrains.kotlinx:kotlinx-cli:0.3.5"
detektCli = { module = "io.gitlab.arturbosch.detekt:detekt-cli", version.ref = "detekt" }
detektFormatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }

androidXCore = "androidx.core:core:1.9.0"
appcompat = "androidx.appcompat:appcompat:1.6.0"
material = "com.google.android.material:material:1.6.1"
androidXCore = "androidx.core:core:1.12.0"
appcompat = "androidx.appcompat:appcompat:1.6.1"
material = "com.google.android.material:material:1.11.0"
constraint = "androidx.constraintlayout:constraintlayout:2.1.4"
multidex = "androidx.multidex:multidex:2.0.1"

Expand All @@ -45,8 +45,6 @@ kotson = "com.github.salomonbrys.kotson:kotson:2.5.0"

espressoCore = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" }
espressoWeb = { module = "androidx.test.espresso:espresso-web", version.ref = "espresso" }
# Workaround for https://github.com/android/android-test/issues/861
accessibilityFramework = "com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:4.0.0"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we do not need accessibility?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Espresso 3.4.0 had a bug that required accessibility to be added explicitly (android/android-test#861). The issue is closed now

uiAutomator = "androidx.test.uiautomator:uiautomator:2.2.0"
robolectric = "org.robolectric:robolectric:4.8.2"
kakao = { module = "io.github.kakaocup:kakao", version.ref = "kakao" }
Expand All @@ -59,11 +57,11 @@ truth = "com.google.truth:truth:1.1.3"
androidXTestCore = { module = "androidx.test:core", version.ref = "androidXTest" }
androidXTestRules = { module = "androidx.test:rules", version.ref = "androidXTest" }
androidXTestRunner = { module = "androidx.test:runner", version.ref = "androidXTest" }
androidXTestFragmentTesting = "androidx.fragment:fragment-testing:1.5.4"
androidXTestFragmentTesting = "androidx.fragment:fragment-testing:1.6.2"
androidXTestOrchestrator = { module = "androidx.test:orchestrator", version.ref = "testOrchestrator" }
androidXTestExtJunit = "androidx.test.ext:junit:1.1.4"
androidXTestExtJunitKtx = "androidx.test.ext:junit-ktx:1.1.4"
androidXLifecycleRuntimeKtx = "androidx.lifecycle:lifecycle-runtime-ktx:2.5.1"
androidXTestExtJunit = "androidx.test.ext:junit:1.1.5"
androidXTestExtJunitKtx = "androidx.test.ext:junit-ktx:1.1.5"
androidXLifecycleRuntimeKtx = "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2"

composeCompiler = { module = "androidx.compose.compiler:compiler", version.ref = "composeCompiler" }
composeActivity = "androidx.activity:activity-compose:1.5.1"
Expand All @@ -82,6 +80,6 @@ allureKotlinJunit4 = { module = "io.qameta.allure:allure-kotlin-junit4", version
allureKotlinAndroid = { module = "io.qameta.allure:allure-kotlin-android", version.ref = "allure" }

[bundles]
espresso = ["espressoCore", "espressoWeb", "accessibilityFramework"]
espresso = ["espressoCore", "espressoWeb"]
allure = ["allureKotlinModel", "allureKotlinCommons", "allureKotlinJunit4", "allureKotlinAndroid"]
compose = ["composeActivity", "composeUiTooling", "composeMaterial", "composeTestManifest", "composeCompiler"]
4 changes: 1 addition & 3 deletions samples/kaspresso-sample/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,7 @@ dependencies {
testImplementation(libs.androidXTestExtJunit)
testImplementation(libs.robolectric)

debugImplementation(libs.androidXTestFragmentTesting) {
isTransitive = false // Disable transitive dependencies here to avoid runtime crash caused by presence of different versions of the same libs
}
debugImplementation(libs.androidXTestFragmentTesting)

androidTestUtil(libs.androidXTestOrchestrator)
}
Loading