Pin dependencies for Material.
Pin dependencies for material.
Test: n/a
Change-Id: I154e7c28f344e3f41bc94e7cc08e4810debe19ab
diff --git a/compose/material3/adaptive/adaptive-layout/build.gradle b/compose/material3/adaptive/adaptive-layout/build.gradle
index 9400e45..f37fbdb 100644
--- a/compose/material3/adaptive/adaptive-layout/build.gradle
+++ b/compose/material3/adaptive/adaptive-layout/build.gradle
@@ -42,14 +42,14 @@
dependencies {
implementation(libs.kotlinStdlib)
api(project(":compose:material3:adaptive:adaptive"))
- api("androidx.compose.animation:animation-core:1.7.0-rc01")
- api("androidx.compose.ui:ui:1.7.0-rc01")
- implementation("androidx.compose.animation:animation:1.7.0-rc01")
+ api("androidx.compose.animation:animation-core:1.7.0")
+ api("androidx.compose.ui:ui:1.7.0")
+ implementation("androidx.compose.animation:animation:1.7.0")
implementation("androidx.compose.foundation:foundation:1.6.5")
implementation("androidx.compose.foundation:foundation-layout:1.6.5")
implementation("androidx.compose.ui:ui-geometry:1.6.5")
implementation("androidx.compose.ui:ui-util:1.6.5")
- implementation("androidx.window:window-core:1.3.0-rc01")
+ implementation("androidx.window:window-core:1.3.0")
}
}
@@ -83,7 +83,7 @@
dependencies {
implementation(project(":compose:material3:material3"))
implementation(project(":compose:test-utils"))
- implementation(project(":window:window-testing"))
+ implementation("androidx.window:window-testing:1.3.0")
implementation(libs.junit)
implementation(libs.testRunner)
implementation(libs.truth)
diff --git a/compose/material3/adaptive/adaptive-navigation/build.gradle b/compose/material3/adaptive/adaptive-navigation/build.gradle
index 67fef66..dbbcdc2 100644
--- a/compose/material3/adaptive/adaptive-navigation/build.gradle
+++ b/compose/material3/adaptive/adaptive-navigation/build.gradle
@@ -78,7 +78,7 @@
dependencies {
implementation(project(":compose:material3:material3"))
implementation(project(":compose:test-utils"))
- implementation(project(":window:window-testing"))
+ implementation("androidx.window:window-testing:1.3.0")
implementation(libs.junit)
implementation(libs.testRunner)
implementation(libs.truth)
diff --git a/compose/material3/adaptive/adaptive/build.gradle b/compose/material3/adaptive/adaptive/build.gradle
index 7ab026e..1cb594e 100644
--- a/compose/material3/adaptive/adaptive/build.gradle
+++ b/compose/material3/adaptive/adaptive/build.gradle
@@ -43,7 +43,7 @@
implementation(libs.kotlinStdlib)
api("androidx.compose.foundation:foundation:1.6.5")
api("androidx.compose.ui:ui-geometry:1.6.5")
- api("androidx.window:window-core:1.3.0-rc01")
+ api("androidx.window:window-core:1.3.0")
}
}
@@ -63,7 +63,7 @@
dependencies {
api("androidx.annotation:annotation:1.8.1")
api("androidx.annotation:annotation-experimental:1.4.1")
- api("androidx.window:window:1.3.0-rc01")
+ api("androidx.window:window:1.3.0")
}
}
@@ -78,7 +78,7 @@
dependencies {
implementation(project(":compose:material3:material3"))
implementation(project(":compose:test-utils"))
- implementation(project(":window:window-testing"))
+ implementation("androidx.window:window-testing:1.3.0")
implementation(libs.junit)
implementation(libs.testRunner)
implementation(libs.truth)
diff --git a/compose/material3/adaptive/adaptive/src/androidInstrumentedTest/kotlin/androidx/compose/material3/adaptive/CollectWindowSizeAsStateTest.kt b/compose/material3/adaptive/adaptive/src/androidInstrumentedTest/kotlin/androidx/compose/material3/adaptive/CollectWindowSizeAsStateTest.kt
deleted file mode 100644
index bf9047b..0000000
--- a/compose/material3/adaptive/adaptive/src/androidInstrumentedTest/kotlin/androidx/compose/material3/adaptive/CollectWindowSizeAsStateTest.kt
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright 2023 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.compose.material3.adaptive
-
-import android.app.Activity
-import android.content.Context
-import android.content.res.Configuration
-import android.graphics.Rect
-import androidx.annotation.UiContext
-import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.runtime.State
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.test.junit4.createComposeRule
-import androidx.compose.ui.unit.IntSize
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.filters.SmallTest
-import androidx.window.layout.WindowMetrics
-import androidx.window.layout.WindowMetricsCalculator
-import androidx.window.layout.WindowMetricsCalculatorDecorator
-import com.google.common.truth.Truth.assertThat
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@SmallTest
-@RunWith(AndroidJUnit4::class)
-class CollectWindowSizeAsStateTest {
- @get:Rule val rule = createComposeRule()
-
- @Test
- fun test_collectWindowSizeAsState() {
- var actualWindowSize: IntSize = IntSize.Zero
-
- val mockWindowSize = mutableStateOf(MockWindowSize1)
- WindowMetricsCalculator.overrideDecorator(
- MockWindowMetricsCalculatorDecorator(mockWindowSize)
- )
-
- rule.setContent {
- val testConfiguration = Configuration(LocalConfiguration.current)
- testConfiguration.screenWidthDp = mockWindowSize.value.width
- testConfiguration.screenHeightDp = mockWindowSize.value.height
- CompositionLocalProvider(LocalConfiguration provides testConfiguration) {
- actualWindowSize = currentWindowSize()
- }
- }
-
- rule.runOnIdle { assertThat(actualWindowSize).isEqualTo(MockWindowSize1) }
-
- mockWindowSize.value = MockWindowSize2
-
- rule.runOnIdle { assertThat(actualWindowSize).isEqualTo(MockWindowSize2) }
- }
-
- companion object {
- val MockWindowSize1 = IntSize(1000, 600)
- val MockWindowSize2 = IntSize(800, 400)
- }
-}
-
-internal class MockWindowMetricsCalculatorDecorator(private val mockWindowSize: State<IntSize>) :
- WindowMetricsCalculatorDecorator {
- override fun decorate(calculator: WindowMetricsCalculator): WindowMetricsCalculator {
- return MockWindowMetricsCalculator(mockWindowSize)
- }
-}
-
-internal class MockWindowMetricsCalculator(private val mockWindowSize: State<IntSize>) :
- WindowMetricsCalculator {
- override fun computeCurrentWindowMetrics(activity: Activity): WindowMetrics {
- return WindowMetrics(
- Rect(0, 0, mockWindowSize.value.width, mockWindowSize.value.height),
- density = 1f
- )
- }
-
- override fun computeMaximumWindowMetrics(activity: Activity): WindowMetrics {
- return computeCurrentWindowMetrics(activity)
- }
-
- override fun computeCurrentWindowMetrics(@UiContext context: Context): WindowMetrics {
- return WindowMetrics(
- Rect(0, 0, mockWindowSize.value.width, mockWindowSize.value.height),
- density = 1f
- )
- }
-}
diff --git a/compose/material3/adaptive/adaptive/src/androidInstrumentedTest/kotlin/androidx/compose/material3/adaptive/CurrentWindowAdaptiveInfoTest.kt b/compose/material3/adaptive/adaptive/src/androidInstrumentedTest/kotlin/androidx/compose/material3/adaptive/CurrentWindowAdaptiveInfoTest.kt
deleted file mode 100644
index 8ef9012..0000000
--- a/compose/material3/adaptive/adaptive/src/androidInstrumentedTest/kotlin/androidx/compose/material3/adaptive/CurrentWindowAdaptiveInfoTest.kt
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright 2023 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.compose.material3.adaptive
-
-import android.content.res.Configuration
-import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.test.junit4.createComposeRule
-import androidx.compose.ui.unit.Density
-import androidx.compose.ui.unit.IntSize
-import androidx.compose.ui.unit.toSize
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.filters.SmallTest
-import androidx.window.core.layout.WindowSizeClass
-import androidx.window.layout.FoldingFeature
-import androidx.window.layout.WindowLayoutInfo
-import androidx.window.layout.WindowMetricsCalculator
-import androidx.window.testing.layout.WindowLayoutInfoPublisherRule
-import com.google.common.truth.Truth.assertThat
-import org.junit.Rule
-import org.junit.Test
-import org.junit.rules.RuleChain
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@OptIn(ExperimentalMaterial3AdaptiveApi::class)
-@SmallTest
-@RunWith(AndroidJUnit4::class)
-class CurrentWindowAdaptiveInfoTest {
- private val composeRule = createComposeRule()
- private val layoutInfoRule = WindowLayoutInfoPublisherRule()
-
- @get:Rule val testRule: TestRule
-
- init {
- testRule = RuleChain.outerRule(layoutInfoRule).around(composeRule)
- }
-
- @Test
- fun test_currentWindowAdaptiveInfo() {
- lateinit var actualAdaptiveInfo: WindowAdaptiveInfo
- val mockWindowSize = mutableStateOf(MockWindowSize1)
- WindowMetricsCalculator.overrideDecorator(
- MockWindowMetricsCalculatorDecorator(mockWindowSize)
- )
-
- composeRule.setContent {
- val testConfiguration = Configuration(LocalConfiguration.current)
- testConfiguration.screenWidthDp = mockWindowSize.value.width
- testConfiguration.screenHeightDp = mockWindowSize.value.height
- CompositionLocalProvider(
- LocalDensity provides MockDensity,
- LocalConfiguration provides testConfiguration
- ) {
- actualAdaptiveInfo = currentWindowAdaptiveInfo()
- }
- }
-
- layoutInfoRule.overrideWindowLayoutInfo(WindowLayoutInfo(MockFoldingFeatures1))
-
- composeRule.runOnIdle {
- val mockSize = with(MockDensity) { MockWindowSize1.toSize().toDpSize() }
- assertThat(actualAdaptiveInfo.windowSizeClass)
- .isEqualTo(WindowSizeClass.compute(mockSize.width.value, mockSize.height.value))
- assertThat(actualAdaptiveInfo.windowPosture)
- .isEqualTo(calculatePosture(MockFoldingFeatures1))
- }
-
- layoutInfoRule.overrideWindowLayoutInfo(WindowLayoutInfo(MockFoldingFeatures2))
- mockWindowSize.value = MockWindowSize2
-
- composeRule.runOnIdle {
- val mockSize = with(MockDensity) { MockWindowSize2.toSize().toDpSize() }
- assertThat(actualAdaptiveInfo.windowSizeClass)
- .isEqualTo(WindowSizeClass.compute(mockSize.width.value, mockSize.height.value))
- assertThat(actualAdaptiveInfo.windowPosture)
- .isEqualTo(calculatePosture(MockFoldingFeatures2))
- }
- }
-
- companion object {
- private val MockFoldingFeatures1 =
- listOf(
- MockFoldingFeature(orientation = FoldingFeature.Orientation.HORIZONTAL),
- MockFoldingFeature(orientation = FoldingFeature.Orientation.VERTICAL),
- MockFoldingFeature(orientation = FoldingFeature.Orientation.HORIZONTAL)
- )
-
- private val MockFoldingFeatures2 =
- listOf(
- MockFoldingFeature(
- isSeparating = false,
- orientation = FoldingFeature.Orientation.HORIZONTAL,
- state = FoldingFeature.State.FLAT
- ),
- )
-
- private val MockWindowSize1 = IntSize(400, 800)
- private val MockWindowSize2 = IntSize(800, 400)
-
- private val MockDensity = Density(1f, 1f)
- }
-}
diff --git a/compose/material3/material3-adaptive-navigation-suite/build.gradle b/compose/material3/material3-adaptive-navigation-suite/build.gradle
index 1c8f9ff..6d42780 100644
--- a/compose/material3/material3-adaptive-navigation-suite/build.gradle
+++ b/compose/material3/material3-adaptive-navigation-suite/build.gradle
@@ -44,7 +44,7 @@
api(project(":compose:material3:material3"))
api(project(":compose:material3:adaptive:adaptive"))
implementation("androidx.compose.ui:ui-util:1.6.0")
- implementation("androidx.window:window-core:1.3.0-beta02")
+ implementation("androidx.window:window-core:1.3.0")
}
}
@@ -77,7 +77,7 @@
dependsOn(commonTest)
dependencies {
implementation(project(":compose:test-utils"))
- implementation(project(":window:window-testing"))
+ implementation("androidx.window:window-testing:1.3.0")
implementation(libs.junit)
implementation(libs.testRunner)
implementation(libs.truth)
diff --git a/compose/material3/material3-adaptive-navigation-suite/samples/build.gradle b/compose/material3/material3-adaptive-navigation-suite/samples/build.gradle
index d65e6a8..57e571d 100644
--- a/compose/material3/material3-adaptive-navigation-suite/samples/build.gradle
+++ b/compose/material3/material3-adaptive-navigation-suite/samples/build.gradle
@@ -44,7 +44,7 @@
implementation(project(":compose:material3:material3-adaptive-navigation-suite"))
implementation("androidx.compose.ui:ui-util:1.6.0-rc01")
implementation("androidx.compose.ui:ui-tooling-preview:1.4.1")
- implementation(project(":window:window-core"))
+ implementation("androidx.window:window-core:1.3.0")
debugImplementation("androidx.compose.ui:ui-tooling:1.4.1")
}
