Deprecates foundation.Text in favour of material.Text
Also migrates existing usages
For a basic, unopinionated text API that does not consume values from a
theme, see androidx.compose.foundation.BasicText
Bug: b/171884421
Test: TextTest
Relnote: "foundation.Text has been deprecated and replaced with material.Text. For a basic, unopinionated text API that does not consume values from a theme, see androidx.compose.foundation.BasicText."
Change-Id: If64cbdd89497f171edfd1b4de907123f73279e8d
diff --git a/compose/compiler/README.md b/compose/compiler/README.md
index c2f2dc9..83c8eb5 100644
--- a/compose/compiler/README.md
+++ b/compose/compiler/README.md
@@ -5,8 +5,8 @@
A Compose application is comprised of `@Composable` functions, which are functions that transform application data into a UI hierarchy. When the underlying data changes, the Composable functions can be re-invoked to generate an updated UI hierarchy.
```
+import androidx.compose.material.*
import androidx.compose.runtime.*
-import androidx.compose.foundation.*
@Composable
fun Greeting(name: String) {
diff --git a/compose/compiler/compiler-hosted/integration-tests/build.gradle b/compose/compiler/compiler-hosted/integration-tests/build.gradle
index db7c039..92d20e4 100644
--- a/compose/compiler/compiler-hosted/integration-tests/build.gradle
+++ b/compose/compiler/compiler-hosted/integration-tests/build.gradle
@@ -38,6 +38,7 @@
testImplementation(KOTLIN_STDLIB)
testImplementation(project(":compose:androidview:androidview"))
testImplementation(project(":compose:compiler:compiler-hosted"))
+ testImplementation(project(":compose:material:material"))
testImplementation(project(":compose:runtime:runtime"))
testImplementation(project(":compose:ui:ui"))
testImplementation("androidx.core:core-ktx:1.1.0")
diff --git a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/ComposerParamSignatureTests.kt b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/ComposerParamSignatureTests.kt
index 2e44c5d..91009e4 100644
--- a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/ComposerParamSignatureTests.kt
+++ b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/ComposerParamSignatureTests.kt
@@ -1432,8 +1432,8 @@
@Test
fun testComposableColorFunInterfaceExample(): Unit = checkApi(
"""
+ import androidx.compose.material.Text
import androidx.compose.ui.graphics.Color
- import androidx.compose.foundation.Text
@Composable fun condition(): Boolean = true
diff --git a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/FunctionBodySkippingTransformTests.kt b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/FunctionBodySkippingTransformTests.kt
index 583e398..bda604e 100644
--- a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/FunctionBodySkippingTransformTests.kt
+++ b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/FunctionBodySkippingTransformTests.kt
@@ -215,8 +215,8 @@
}
""",
"""
+ import androidx.compose.material.Text
import androidx.compose.ui.graphics.Color
- import androidx.compose.foundation.Text
@Composable
fun Button(colors: ButtonColors) {
