Pin :tv dependencies to compose 1.6.3
Test: ./gradlew -p tv assembleDebug assembleAndroidTest
Change-Id: I9d2e27e421e6de1184e57c1274e3d26ebf0aa24a
diff --git a/tv/tv-foundation/build.gradle b/tv/tv-foundation/build.gradle
index bb1ae47..69b4909 100644
--- a/tv/tv-foundation/build.gradle
+++ b/tv/tv-foundation/build.gradle
@@ -39,15 +39,16 @@
implementation("androidx.profileinstaller:profileinstaller:1.3.1")
- api("androidx.annotation:annotation:1.6.0")
- api("androidx.compose.animation:animation:1.6.0")
- api("androidx.compose.foundation:foundation:1.6.0")
- api("androidx.compose.foundation:foundation-layout:1.6.0")
- api("androidx.compose.runtime:runtime:1.6.0")
- api("androidx.compose.ui:ui-util:1.6.0")
- api("androidx.compose.ui:ui:1.6.0")
- api("androidx.compose.ui:ui-graphics:1.6.0")
- api("androidx.compose.ui:ui-text:1.6.0")
+ def composeVersion = "1.6.3"
+ api("androidx.annotation:annotation:$composeVersion")
+ api("androidx.compose.animation:animation:$composeVersion")
+ api("androidx.compose.foundation:foundation:$composeVersion")
+ api("androidx.compose.foundation:foundation-layout:$composeVersion")
+ api("androidx.compose.runtime:runtime:$composeVersion")
+ api("androidx.compose.ui:ui-util:$composeVersion")
+ api("androidx.compose.ui:ui:$composeVersion")
+ api("androidx.compose.ui:ui-graphics:$composeVersion")
+ api("androidx.compose.ui:ui-text:$composeVersion")
androidTestImplementation(libs.truth)
androidTestImplementation(project(":compose:runtime:runtime"))
diff --git a/tv/tv-material/build.gradle b/tv/tv-material/build.gradle
index 258c875..a53a48d 100644
--- a/tv/tv-material/build.gradle
+++ b/tv/tv-material/build.gradle
@@ -32,9 +32,13 @@
dependencies {
api(libs.kotlinStdlib)
- api("androidx.compose.animation:animation:1.5.3")
- api(project(":compose:foundation:foundation"))
- api("androidx.compose.material:material-icons-core:1.5.3")
+
+ def composeVersion = "1.6.3"
+ api("androidx.compose.animation:animation:$composeVersion")
+ api("androidx.compose.foundation:foundation:$composeVersion")
+ api("androidx.compose.foundation:foundation-layout:$composeVersion")
+ api("androidx.compose.material:material-icons-core:$composeVersion")
+
api(project(":tv:tv-foundation"))
implementation("androidx.profileinstaller:profileinstaller:1.3.1")
diff --git a/tv/tv-material/src/main/java/androidx/tv/material3/Checkbox.kt b/tv/tv-material/src/main/java/androidx/tv/material3/Checkbox.kt
index d642e52..338b752 100644
--- a/tv/tv-material/src/main/java/androidx/tv/material3/Checkbox.kt
+++ b/tv/tv-material/src/main/java/androidx/tv/material3/Checkbox.kt
@@ -146,7 +146,8 @@
onClick = onClick,
enabled = enabled,
role = Role.Checkbox,
- interactionSource = interactionSource,
+ // TODO: remove the optional argument once we update to compose 1.7.x
+ interactionSource = interactionSource ?: remember { MutableInteractionSource() },
indication = null
)
} else {
diff --git a/tv/tv-material/src/main/java/androidx/tv/material3/RadioButton.kt b/tv/tv-material/src/main/java/androidx/tv/material3/RadioButton.kt
index c3c3285..97477e2 100644
--- a/tv/tv-material/src/main/java/androidx/tv/material3/RadioButton.kt
+++ b/tv/tv-material/src/main/java/androidx/tv/material3/RadioButton.kt
@@ -29,6 +29,7 @@
import androidx.compose.runtime.Composable
import androidx.compose.runtime.Immutable
import androidx.compose.runtime.State
+import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberUpdatedState
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
@@ -85,7 +86,8 @@
onClick = onClick,
enabled = enabled,
role = Role.RadioButton,
- interactionSource = interactionSource,
+ // TODO: remove the optional argument once we update to compose 1.7.x
+ interactionSource = interactionSource ?: remember { MutableInteractionSource() },
indication = null
)
} else {
