Skip to content

Update dependency androidx.compose:compose-bom to v2025.04.01 #84

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

Merged
merged 3 commits into from
Apr 28, 2025
Merged

Update dependency androidx.compose:compose-bom to v2025.04.01 #84

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
7242a72
Update dependency androidx.compose:compose-bom to v2025.04.01
renovate[bot] Apr 23, 2025
d25a4ca
Ignore DAGP warning
MGaetan89 Apr 23, 2025
c709b5d
Use the new way to test Composables
MGaetan89 Apr 24, 2025
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
4 changes: 4 additions & 0 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ dependencyAnalysis {
onAny {
severity("fail")
}

onUnusedDependencies {
exclude(libs.androidx.compose.ui.tooling.asProvider())
}
}

project(":demo") {
Expand Down
3 changes: 1 addition & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ android-gradle-plugin = "8.9.2"
androidx-activity = "1.10.1"
androidx-annotation = "1.9.1"
androidx-annotation-experimental = "1.4.1"
androidx-compose = "2025.04.00"
androidx-compose = "2025.04.01"
androidx-core = "1.16.0"
androidx-fragment = "1.8.6"
androidx-lifecycle = "2.8.7"
Expand Down Expand Up @@ -43,7 +43,6 @@ androidx-compose-ui = { group = "androidx.compose.ui", name = "ui" }
androidx-compose-ui-geometry = { group = "androidx.compose.ui", name = "ui-geometry" }
androidx-compose-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
androidx-compose-ui-test = { group = "androidx.compose.ui", name = "ui-test" }
androidx-compose-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
androidx-compose-ui-text = { group = "androidx.compose.ui", name = "ui-text" }
androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
Expand Down
1 change: 0 additions & 1 deletion mediarouter-compose/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ dependencies {

testImplementation(libs.androidx.activity)
testImplementation(libs.androidx.compose.ui.test)
testImplementation(libs.androidx.compose.ui.test.junit4)
testImplementation(libs.androidx.lifecycle.viewmodel.testing)
testImplementation(libs.androidx.mediarouter.testing)
testImplementation(libs.androidx.test.core)
Expand Down
20 changes: 9 additions & 11 deletions ...uter-compose/src/test/java/ch/srgssr/androidx/mediarouter/compose/MediaRouteButtonTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,31 +8,29 @@ package ch.srgssr.androidx.mediarouter.compose
import android.content.Context
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.test.junit4.ComposeTestRule
import androidx.compose.ui.test.junit4.createComposeRule
import androidx.compose.ui.test.ComposeUiTest
import androidx.compose.ui.test.ExperimentalTestApi
import androidx.compose.ui.test.onNodeWithTag
import androidx.compose.ui.test.performClick
import androidx.compose.ui.test.runComposeUiTest
import androidx.core.content.getSystemService
import androidx.mediarouter.media.MediaRouter
import androidx.mediarouter.testing.MediaRouterTestHelper
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import org.junit.Rule
import org.junit.runner.RunWith
import kotlin.test.AfterTest
import kotlin.test.BeforeTest
import kotlin.test.Test
import kotlin.test.assertEquals

@OptIn(ExperimentalTestApi::class)
@RunWith(AndroidJUnit4::class)
class MediaRouteButtonTest {
private lateinit var context: Context
private lateinit var dialogTypes: MutableList<DialogType>
private lateinit var router: MediaRouter

@get:Rule
val composeTestRule = createComposeRule()

@BeforeTest
fun before() {
context = ApplicationProvider.getApplicationContext()
Expand Down Expand Up @@ -81,9 +79,9 @@ class MediaRouteButtonTest {

private fun assertMediaRouteButtonState(
expectedDialogTypes: List<DialogType>,
action: (ComposeTestRule.() -> Unit)? = null,
) {
composeTestRule.setContent {
action: (ComposeUiTest.() -> Unit)? = null,
) = runComposeUiTest {
setContent {
MediaRouteButton(
modifier = Modifier.testTag(TEST_TAG),
mediaRouteChooserDialog = {},
Expand All @@ -95,8 +93,8 @@ class MediaRouteButtonTest {
}

action?.let {
composeTestRule.it()
composeTestRule.waitForIdle()
it()
waitForIdle()
}

assertEquals(expectedDialogTypes, dialogTypes)
Expand Down