Skip to content

Commit 6798cf5

Browse files
zach-klippensteinzach-klippenstein
authored
Merge pull request #80 from square/zachklipp/upgrade-compose
Upgrade Compose to alpha07.
2 parents 79441ac + a883cff commit 6798cf5

File tree

21 files changed

+88
-81
lines changed

21 files changed

+88
-81
lines changed

‎.buildscript/configure-android-defaults.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ android {
1818
// See https://github.com/Kotlin/kotlinx.coroutines/issues/1064#issuecomment-479412940
1919
packagingOptions {
2020
exclude 'META-INF/*.kotlin_module'
21+
exclude 'META-INF/AL2.0'
22+
exclude 'META-INF/LGPL2.1'
2123
}
2224

2325
lintOptions {

‎buildSrc/src/main/java/Dependencies.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import java.util.Locale.US
1919
import kotlin.reflect.full.declaredMembers
2020

2121
object Versions {
22-
const val compose = "1.0.0-alpha06"
22+
const val compose = "1.0.0-alpha07"
2323
const val kotlin = "1.4.10"
2424

2525
// This *is* actually used.

‎compose-tooling/src/androidTest/java/com/squareup/workflow/ui/compose/tooling/PreviewComposeWorkflowTest.kt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717

1818
package com.squareup.workflow.ui.compose.tooling
1919

20-
import androidx.compose.foundation.Text
2120
import androidx.compose.foundation.layout.Column
2221
import androidx.compose.foundation.layout.size
22+
import androidx.compose.foundation.text.BasicText
2323
import androidx.compose.runtime.Composable
2424
import androidx.compose.ui.Modifier
25+
import androidx.compose.ui.test.assertIsDisplayed
26+
import androidx.compose.ui.test.assertIsNotDisplayed
27+
import androidx.compose.ui.test.onNodeWithText
2528
import androidx.compose.ui.unit.dp
2629
import androidx.test.ext.junit.runners.AndroidJUnit4
27-
import androidx.ui.test.assertIsDisplayed
28-
import androidx.ui.test.assertIsNotDisplayed
2930
import androidx.ui.test.createComposeRule
30-
import androidx.ui.test.onNodeWithText
3131
import androidx.ui.tooling.preview.Preview
3232
import com.squareup.workflow.Workflow
3333
import com.squareup.workflow.ui.ViewEnvironmentKey
@@ -95,7 +95,7 @@ class PreviewComposeWorkflowTest {
9595
private val ParentWithOneChild =
9696
Workflow.composed<Pair<String, String>, Nothing> { props, _, environment ->
9797
Column {
98-
Text(props.first)
98+
BasicText(props.first)
9999
WorkflowRendering(props.second, environment)
100100
}
101101
}
@@ -108,7 +108,7 @@ class PreviewComposeWorkflowTest {
108108
Workflow.composed<Triple<String, String, String>, Nothing> { props, _, environment ->
109109
Column {
110110
WorkflowRendering(rendering = props.first, viewEnvironment = environment)
111-
Text(props.second)
111+
BasicText(props.second)
112112
WorkflowRendering(rendering = props.third, viewEnvironment = environment)
113113
}
114114
}
@@ -136,7 +136,7 @@ class PreviewComposeWorkflowTest {
136136
}
137137

138138
private val ParentConsumesCustomKey = Workflow.composed<Unit, Nothing> { _, _, environment ->
139-
Text(environment[TestEnvironmentKey])
139+
BasicText(environment[TestEnvironmentKey])
140140
}
141141

142142
@Preview @Composable private fun ParentConsumesCustomKeyPreview() {

‎compose-tooling/src/androidTest/java/com/squareup/workflow/ui/compose/tooling/PreviewViewFactoryTest.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717

1818
package com.squareup.workflow.ui.compose.tooling
1919

20-
import androidx.compose.foundation.Text
2120
import androidx.compose.foundation.layout.Column
2221
import androidx.compose.foundation.layout.size
22+
import androidx.compose.foundation.text.BasicText
2323
import androidx.compose.runtime.Composable
2424
import androidx.compose.ui.Modifier
25+
import androidx.compose.ui.test.assertIsDisplayed
26+
import androidx.compose.ui.test.assertIsNotDisplayed
27+
import androidx.compose.ui.test.onNodeWithText
2528
import androidx.compose.ui.unit.dp
2629
import androidx.test.ext.junit.runners.AndroidJUnit4
27-
import androidx.ui.test.assertIsDisplayed
28-
import androidx.ui.test.assertIsNotDisplayed
2930
import androidx.ui.test.createComposeRule
30-
import androidx.ui.test.onNodeWithText
3131
import androidx.ui.tooling.preview.Preview
3232
import com.squareup.workflow.ui.ViewEnvironmentKey
3333
import com.squareup.workflow.ui.compose.WorkflowRendering
@@ -101,7 +101,7 @@ class PreviewViewFactoryTest {
101101
private val ParentWithOneChild =
102102
composedViewFactory<Pair<String, String>> { rendering, environment ->
103103
Column {
104-
Text(rendering.first)
104+
BasicText(rendering.first)
105105
WorkflowRendering(rendering.second, environment)
106106
}
107107
}
@@ -114,7 +114,7 @@ class PreviewViewFactoryTest {
114114
composedViewFactory<Triple<String, String, String>> { rendering, environment ->
115115
Column {
116116
WorkflowRendering(rendering.first, environment)
117-
Text(rendering.second)
117+
BasicText(rendering.second)
118118
WorkflowRendering(rendering.third, environment)
119119
}
120120
}
@@ -130,7 +130,7 @@ class PreviewViewFactoryTest {
130130

131131
private val ParentRecursive = composedViewFactory<RecursiveRendering> { rendering, environment ->
132132
Column {
133-
Text(rendering.text)
133+
BasicText(rendering.text)
134134
rendering.child?.let { child ->
135135
WorkflowRendering(rendering = child, viewEnvironment = environment)
136136
}
@@ -168,7 +168,7 @@ class PreviewViewFactoryTest {
168168
}
169169

170170
private val ParentConsumesCustomKey = composedViewFactory<Unit> { _, environment ->
171-
Text(environment[TestEnvironmentKey])
171+
BasicText(environment[TestEnvironmentKey])
172172
}
173173

174174
@Preview @Composable private fun ParentConsumesCustomKeyPreview() {

‎compose-tooling/src/main/java/com/squareup/workflow/ui/compose/tooling/PlaceholderViewFactory.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717

1818
package com.squareup.workflow.ui.compose.tooling
1919

20-
import androidx.compose.foundation.Text
2120
import androidx.compose.foundation.background
2221
import androidx.compose.foundation.drawBorder
2322
import androidx.compose.foundation.layout.Box
2423
import androidx.compose.foundation.layout.fillMaxSize
24+
import androidx.compose.foundation.text.BasicText
2525
import androidx.compose.runtime.Composable
2626
import androidx.compose.ui.Modifier
2727
import androidx.compose.ui.draw.clipToBounds
@@ -49,7 +49,7 @@ import com.squareup.workflow.ui.compose.composedViewFactory
4949
*/
5050
internal fun placeholderViewFactory(modifier: Modifier): ViewFactory<Any> =
5151
composedViewFactory { rendering, _ ->
52-
Text(
52+
BasicText(
5353
modifier = modifier
5454
.clipToBounds()
5555
.drawBehind {

‎core-compose/api/core-compose.api‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
public final class com/squareup/workflow/ui/compose/ComposeRendering {
2+
public static final field $stable I
23
public static final field Companion Lcom/squareup/workflow/ui/compose/ComposeRendering$Companion;
34
public fun <init> (Lkotlin/jvm/functions/Function3;)V
45
}
@@ -15,6 +16,7 @@ public final class com/squareup/workflow/ui/compose/ComposeViewFactory : com/squ
1516
}
1617

1718
public abstract class com/squareup/workflow/ui/compose/ComposeWorkflow : com/squareup/workflow/Workflow {
19+
public static final field $stable I
1820
public fun <init> ()V
1921
public fun asStatefulWorkflow ()Lcom/squareup/workflow/StatefulWorkflow;
2022
public abstract fun render (Ljava/lang/Object;Lcom/squareup/workflow/Sink;Lcom/squareup/workflow/ui/ViewEnvironment;Landroidx/compose/runtime/Composer;I)V

‎core-compose/src/androidTest/java/com/squareup/workflow/ui/compose/ComposeViewFactoryTest.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ package com.squareup.workflow.ui.compose
1717

1818
import android.content.Context
1919
import android.widget.FrameLayout
20-
import androidx.compose.foundation.Text
2120
import androidx.compose.foundation.layout.Column
21+
import androidx.compose.foundation.text.BasicText
2222
import androidx.compose.runtime.mutableStateOf
23+
import androidx.compose.ui.test.onNodeWithText
2324
import androidx.compose.ui.viewinterop.AndroidView
2425
import androidx.test.ext.junit.runners.AndroidJUnit4
2526
import androidx.ui.test.createComposeRule
26-
import androidx.ui.test.onNodeWithText
2727
import com.squareup.workflow.ui.ViewEnvironment
2828
import com.squareup.workflow.ui.ViewRegistry
2929
import com.squareup.workflow.ui.WorkflowViewStub
@@ -41,7 +41,7 @@ class ComposeViewFactoryTest {
4141
val viewEnvironment = ViewEnvironment(ViewRegistry(TestFactory))
4242
.withCompositionRoot { content ->
4343
Column {
44-
Text(wrapperText.value)
44+
BasicText(wrapperText.value)
4545
content()
4646
}
4747
}
@@ -75,7 +75,7 @@ class ComposeViewFactoryTest {
7575

7676
private companion object {
7777
val TestFactory = composedViewFactory<TestRendering> { rendering, _ ->
78-
Text(rendering.text)
78+
BasicText(rendering.text)
7979
}
8080
}
8181
}

‎core-compose/src/androidTest/java/com/squareup/workflow/ui/compose/CompositionRootTest.kt‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
*/
1616
package com.squareup.workflow.ui.compose
1717

18-
import androidx.compose.foundation.Text
1918
import androidx.compose.foundation.layout.Column
19+
import androidx.compose.foundation.text.BasicText
2020
import androidx.compose.runtime.mutableStateOf
21+
import androidx.compose.ui.test.assertIsDisplayed
22+
import androidx.compose.ui.test.onNodeWithText
2123
import androidx.test.ext.junit.runners.AndroidJUnit4
22-
import androidx.ui.test.assertIsDisplayed
2324
import androidx.ui.test.createComposeRule
24-
import androidx.ui.test.onNodeWithText
2525
import com.google.common.truth.Truth.assertThat
2626
import org.junit.Rule
2727
import org.junit.Test
@@ -36,14 +36,14 @@ class CompositionRootTest {
3636
@Test fun wrapWithRootIfNecessary_wrapsWhenNecessary() {
3737
val root: CompositionRoot = { content ->
3838
Column {
39-
Text("one")
39+
BasicText("one")
4040
content()
4141
}
4242
}
4343

4444
composeRule.setContent {
4545
wrapWithRootIfNecessary(root) {
46-
Text("two")
46+
BasicText("two")
4747
}
4848
}
4949

@@ -56,16 +56,16 @@ class CompositionRootTest {
5656
@Test fun wrapWithRootIfNecessary_onlyWrapsOnce() {
5757
val root: CompositionRoot = { content ->
5858
Column {
59-
Text("one")
59+
BasicText("one")
6060
content()
6161
}
6262
}
6363

6464
composeRule.setContent {
6565
wrapWithRootIfNecessary(root) {
66-
Text("two")
66+
BasicText("two")
6767
wrapWithRootIfNecessary(root) {
68-
Text("three")
68+
BasicText("three")
6969
}
7070
}
7171
}
@@ -79,14 +79,14 @@ class CompositionRootTest {
7979
val wrapperText = mutableStateOf("one")
8080
val root: CompositionRoot = { content ->
8181
Column {
82-
Text(wrapperText.value)
82+
BasicText(wrapperText.value)
8383
content()
8484
}
8585
}
8686

8787
composeRule.setContent {
8888
wrapWithRootIfNecessary(root) {
89-
Text("two")
89+
BasicText("two")
9090
}
9191
}
9292

@@ -100,21 +100,21 @@ class CompositionRootTest {
100100
@Test fun wrapWithRootIfNecessary_rewrapsWhenDifferentRoot() {
101101
val root1: CompositionRoot = { content ->
102102
Column {
103-
Text("one")
103+
BasicText("one")
104104
content()
105105
}
106106
}
107107
val root2: CompositionRoot = { content ->
108108
Column {
109-
Text("ENO")
109+
BasicText("ENO")
110110
content()
111111
}
112112
}
113113
val viewEnvironment = mutableStateOf(root1)
114114

115115
composeRule.setContent {
116116
wrapWithRootIfNecessary(viewEnvironment.value) {
117-
Text("two")
117+
BasicText("two")
118118
}
119119
}
120120

@@ -128,15 +128,15 @@ class CompositionRootTest {
128128
@Test fun safeComposeViewFactoryRoot_wraps_content() {
129129
val wrapped: CompositionRoot = { content ->
130130
Column {
131-
Text("Parent")
131+
BasicText("Parent")
132132
content()
133133
}
134134
}
135135
val safeRoot = safeCompositionRoot(wrapped)
136136

137137
composeRule.setContent {
138138
safeRoot {
139-
Text("Child")
139+
BasicText("Child")
140140
}
141141
}
142142

@@ -170,7 +170,7 @@ class CompositionRootTest {
170170
val error = assertFailsWith<IllegalStateException> {
171171
composeRule.setContent {
172172
safeRoot {
173-
Text("Hello")
173+
BasicText("Hello")
174174
}
175175
}
176176
}

‎core-compose/src/androidTest/java/com/squareup/workflow/ui/compose/ViewEnvironmentsTest.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
*/
1616
package com.squareup.workflow.ui.compose
1717

18-
import androidx.compose.foundation.Text
18+
import androidx.compose.foundation.text.BasicText
1919
import androidx.compose.runtime.mutableStateOf
20+
import androidx.compose.ui.test.assertIsDisplayed
21+
import androidx.compose.ui.test.onNodeWithText
2022
import androidx.test.ext.junit.runners.AndroidJUnit4
21-
import androidx.ui.test.assertIsDisplayed
2223
import androidx.ui.test.createComposeRule
23-
import androidx.ui.test.onNodeWithText
2424
import com.squareup.workflow.ui.ViewEnvironment
2525
import com.squareup.workflow.ui.ViewRegistry
2626
import org.junit.Rule
@@ -34,10 +34,10 @@ class ViewEnvironmentsTest {
3434

3535
@Test fun workflowRendering_recomposes_whenFactoryChanged() {
3636
val registry1 = ViewRegistry(composedViewFactory<String> { rendering, _ ->
37-
Text(rendering)
37+
BasicText(rendering)
3838
})
3939
val registry2 = ViewRegistry(composedViewFactory<String> { rendering, _ ->
40-
Text(rendering.reversed())
40+
BasicText(rendering.reversed())
4141
})
4242
val registry = mutableStateOf(registry1)
4343

‎core-compose/src/androidTest/java/com/squareup/workflow/ui/compose/WorkflowContainerTest.kt‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717

1818
package com.squareup.workflow.ui.compose
1919

20-
import androidx.compose.foundation.Text
20+
import androidx.compose.foundation.text.BasicText
21+
import androidx.compose.ui.test.assertIsDisplayed
22+
import androidx.compose.ui.test.onNodeWithText
2123
import androidx.test.ext.junit.runners.AndroidJUnit4
22-
import androidx.ui.test.assertIsDisplayed
2324
import androidx.ui.test.createComposeRule
24-
import androidx.ui.test.onNodeWithText
2525
import com.squareup.workflow.Workflow
2626
import com.squareup.workflow.stateless
2727
import com.squareup.workflow.ui.ViewEnvironment
@@ -37,7 +37,9 @@ class WorkflowContainerTest {
3737

3838
@Test fun rendersFromViewRegistry() {
3939
val workflow = Workflow.stateless<Unit, Nothing, String> { "hello" }
40-
val registry = ViewRegistry(composedViewFactory<String> { rendering, _ -> Text(rendering) })
40+
val registry = ViewRegistry(composedViewFactory<String> { rendering, _ ->
41+
BasicText(rendering)
42+
})
4143

4244
composeRule.setContent {
4345
WorkflowContainer(workflow, ViewEnvironment(registry))
@@ -48,7 +50,7 @@ class WorkflowContainerTest {
4850

4951
@Test fun automaticallyAddsComposeRenderingFactory() {
5052
val workflow = Workflow.composed<Unit, Nothing> { _, _, _ ->
51-
Text("it worked")
53+
BasicText("it worked")
5254
}
5355
val registry = ViewRegistry()
5456

0 commit comments

Comments
 (0)