Merge "Point tv-material to earlier tv-foundation release" into andro…

…idx-main
androidx · Jun 1, 2023 · 88877d7 · 88877d7
2 parents 9ab06f8 + 1e2f5eb
commit 88877d7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/tv/tv-material/build.gradle b/tv/tv-material/build.gradle
@@ -24,14 +24,23 @@ plugins {
     id("org.jetbrains.kotlin.android")
 }
 
+// needed for the tv-foundation pinning. Can be removed later.
+configurations.all {
+    resolutionStrategy {
+        preferProjectModules()
+    }
+}
+
 dependencies {
     api(libs.kotlinStdlib)
 
     def composeVersion = '1.4.3'
+    def composeBetaVersion = "1.5.0-beta01"
 
     api("androidx.compose.animation:animation:$composeVersion")
     api("androidx.compose.material:material-icons-core:$composeVersion")
-    api(project(":tv:tv-foundation"))
+    api("androidx.tv:tv-foundation:1.0.0-alpha06")
+    api("androidx.compose.foundation:foundation:$composeBetaVersion")
 
     implementation(libs.kotlinStdlibCommon)
     implementation("androidx.profileinstaller:profileinstaller:1.3.1")

diff --git a/tv/tv-material/src/androidTest/java/androidx/tv/material3/ImmersiveListTest.kt b/tv/tv-material/src/androidTest/java/androidx/tv/material3/ImmersiveListTest.kt
@@ -52,13 +52,15 @@ import androidx.test.platform.app.InstrumentationRegistry
 import androidx.tv.foundation.lazy.list.TvLazyColumn
 import androidx.tv.foundation.lazy.list.TvLazyRow
 import com.google.common.truth.Truth.assertThat
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 
 class ImmersiveListTest {
     @get:Rule
     val rule = createComposeRule()
 
+    @Ignore("b/285317959")
     @OptIn(ExperimentalTvMaterial3Api::class, ExperimentalAnimationApi::class)
     @Test
     fun immersiveList_scroll_backgroundChanges() {
@@ -122,6 +124,7 @@ class ImmersiveListTest {
         rule.onNodeWithTag("background-2").assertDoesNotExist()
     }
 
+    @Ignore("b/285317959")
     @Test
     fun immersiveList_scrollToRegainFocusInLazyColumn_checkBringIntoView() {
         val focusRequesterList = mutableListOf<FocusRequester>()
@@ -152,6 +155,7 @@ class ImmersiveListTest {
         assertThat(checkNodeCompletelyVisible("immersive-list")).isTrue()
     }
 
+    @Ignore("b/285317959")
     @Test
     fun immersiveList_scrollToRegainFocusInTvLazyColumn_checkBringIntoView() {
         val focusRequesterList = mutableListOf<FocusRequester>()