Merge pull request #56 from square/wardell/compose-dev15-update

Update Jetpack Compose to dev15

Author: zach-klippenstein

.buildscript/configure-compose.gradle

@@ -14,23 +14,12 @@
  * limitations under the License.
  */
 
-/*
-In addition applying this file, as of dev10 modules that use Compose also need to include this
-code snippet to avoid warnings about using compiler version 1.4 (this is because the compiler plugin
-is built against compiler source that is in a liminal state between 1.3 and 1.4, the warnings are
-safe to ignore and this suppresses them):
-
-tasks.withType<KotlinCompile>().configureEach {
- kotlinOptions.apiVersion = "1.3"
-}
-*/
-
 android {
   buildFeatures {
     compose true
   }
   composeOptions {
-    kotlinCompilerVersion "1.3.70-dev-withExperimentalGoogleExtensions-20200424"
+    kotlinCompilerVersion "1.4.0-dev-withExperimentalGoogleExtensions-20200720"
     kotlinCompilerExtensionVersion Versions.compose
   }
 }

README.md

@@ -48,20 +48,12 @@ android {
     compose true
   }
   composeOptions {
-    kotlinCompilerVersion "1.3.70-dev-withExperimentalGoogleExtensions-20200424"
+    kotlinCompilerVersion "1.4.0-dev-withExperimentalGoogleExtensions-20200720"
     kotlinCompilerExtensionVersion "${compose_version}"
   }
 }
 ```
 
-You may also need to set the Kotlin API version to 1.3:
-
-```groovy
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
-  kotlinOptions.apiVersion = "1.3"
-}
-```
-
 To create a `ViewFactory`, call `composedViewFactory`. The lambda passed to `composedViewFactory` is
 a `@Composable` function.
 

build.gradle.kts

@@ -33,8 +33,10 @@ buildscript {
     mavenCentral()
     gradlePluginPortal()
     google()
+    // For Kotlin 1.4.
+    maven("https://dl.bintray.com/kotlin/kotlin-eap")
     // For binary compatibility validator.
-    maven { url = uri("https://kotlin.bintray.com/kotlinx") }
+    maven("https://kotlin.bintray.com/kotlinx")
   }
 }
 
@@ -46,6 +48,8 @@ subprojects {
     google()
     mavenCentral()
     jcenter()
+    // For Kotlin 1.4.
+    maven("https://dl.bintray.com/kotlin/kotlin-eap")
   }
 
   configurations.all {
@@ -84,8 +88,14 @@ subprojects {
       jvmTarget = "1.8"
 
       // Don't panic, all this does is allow us to use the @OptIn meta-annotation.
-      // to define our own experiments.
-      freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
+      // to define our own experiments, and some required args for compose dev15 taken from
+      // https://developer.android.com/jetpack/androidx/releases/compose-runtime
+      freeCompilerArgs += listOf(
+          "-Xopt-in=kotlin.RequiresOptIn",
+          "-Xallow-jvm-ir-dependencies",
+          "-Xskip-prerelease-check"
+      )
+
     }
   }
 

buildSrc/src/main/java/Dependencies.kt

@@ -19,25 +19,26 @@ import java.util.Locale.US
 import kotlin.reflect.full.declaredMembers
 
 object Versions {
-  const val compose = "0.1.0-dev12"
-  const val kotlin = "1.3.71"
+  const val compose = "0.1.0-dev15"
+  const val kotlin = "1.4-M3"
   const val targetSdk = 29
   const val workflow = "0.28.0"
 }
 
 @Suppress("unused")
 object Dependencies {
-  const val android_gradle_plugin = "com.android.tools.build:gradle:4.2.0-alpha01"
+  const val android_gradle_plugin = "com.android.tools.build:gradle:4.2.0-alpha05"
 
   object AndroidX {
     const val appcompat = "androidx.appcompat:appcompat:1.1.0"
   }
 
   object Compose {
-    const val foundation = "androidx.ui:ui-foundation:${Versions.compose}"
-    const val layout = "androidx.ui:ui-layout:${Versions.compose}"
-    const val material = "androidx.ui:ui-material:${Versions.compose}"
-    const val savedstate = "androidx.ui:ui-saved-instance-state:${Versions.compose}"
+    const val foundation = "androidx.compose.foundation:foundation:${Versions.compose}"
+    const val layout = "androidx.compose.foundation:foundation-layout:${Versions.compose}"
+    const val material = "androidx.compose.material:material:${Versions.compose}"
+    const val savedstate =
+      "androidx.compose.runtime:runtime-saved-instance-state:${Versions.compose}"
     const val test = "androidx.ui:ui-test:${Versions.compose}"
     const val tooling = "androidx.ui:ui-tooling:${Versions.compose}"
   }

compose-tooling/build.gradle.kts

@@ -1,4 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 /*
  * Copyright 2020 Square Inc.
@@ -30,9 +29,6 @@ apply(from = rootProject.file(".buildscript/configure-android-defaults.gradle"))
 apply(from = rootProject.file(".buildscript/android-ui-tests.gradle"))
 
 apply(from = rootProject.file(".buildscript/configure-compose.gradle"))
-tasks.withType<KotlinCompile> {
-  kotlinOptions.apiVersion = "1.3"
-}
 
 dependencies {
   api(project(":core-compose"))

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

@@ -23,11 +23,10 @@ import androidx.ui.core.Modifier
 import androidx.ui.foundation.Text
 import androidx.ui.layout.Column
 import androidx.ui.layout.size
-import androidx.ui.semantics.Semantics
 import androidx.ui.test.assertIsDisplayed
 import androidx.ui.test.assertIsNotDisplayed
 import androidx.ui.test.createComposeRule
-import androidx.ui.test.findByText
+import androidx.ui.test.onNodeWithText
 import androidx.ui.tooling.preview.Preview
 import androidx.ui.unit.dp
 import com.squareup.workflow.Workflow
@@ -39,7 +38,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 
 /**
- * Duplicate of [PreviewViewFactoryTest] but for [com.squareup.workflow.compose.ComposeWorkflow].
+ * Duplicate of [PreviewViewFactoryTest] but for [com.squareup.workflow.ui.compose.ComposeWorkflow].
  */
 @RunWith(AndroidJUnit4::class)
 class PreviewComposeWorkflowTest {
@@ -51,18 +50,18 @@ class PreviewComposeWorkflowTest {
       ParentWithOneChildPreview()
     }
 
-    findByText("one").assertIsDisplayed()
-    findByText("two").assertIsDisplayed()
+    onNodeWithText("one").assertIsDisplayed()
+    onNodeWithText("two").assertIsDisplayed()
   }
 
   @Test fun twoChildren() {
     composeRule.setContent {
       ParentWithTwoChildrenPreview()
     }
 
-    findByText("one").assertIsDisplayed()
-    findByText("two").assertIsDisplayed()
-    findByText("three").assertIsDisplayed()
+    onNodeWithText("one").assertIsDisplayed()
+    onNodeWithText("two").assertIsDisplayed()
+    onNodeWithText("three").assertIsDisplayed()
   }
 
   @Test fun modifierIsApplied() {
@@ -71,8 +70,8 @@ class PreviewComposeWorkflowTest {
     }
 
     // The view factory will be rendered with size (0,0), so it should be reported as not displayed.
-    findByText("one").assertIsNotDisplayed()
-    findByText("two").assertIsNotDisplayed()
+    onNodeWithText("one").assertIsNotDisplayed()
+    onNodeWithText("two").assertIsNotDisplayed()
   }
 
   @Test fun placeholderModifierIsApplied() {
@@ -81,25 +80,23 @@ class PreviewComposeWorkflowTest {
     }
 
     // The child will be rendered with size (0,0), so it should be reported as not displayed.
-    findByText("one").assertIsDisplayed()
-    findByText("two").assertIsNotDisplayed()
+    onNodeWithText("one").assertIsDisplayed()
+    onNodeWithText("two").assertIsNotDisplayed()
   }
 
   @Test fun customViewEnvironment() {
     composeRule.setContent {
       ParentConsumesCustomKeyPreview()
     }
 
-    findByText("foo").assertIsDisplayed()
+    onNodeWithText("foo").assertIsDisplayed()
   }
 
   private val ParentWithOneChild =
     Workflow.composed<Pair<String, String>, Nothing> { props, _, environment ->
       Column {
         Text(props.first)
-        Semantics(container = true, mergeAllDescendants = true) {
-          WorkflowRendering(props.second, environment)
-        }
+        WorkflowRendering(props.second, environment)
       }
     }
 
@@ -110,13 +107,9 @@ class PreviewComposeWorkflowTest {
   private val ParentWithTwoChildren =
     Workflow.composed<Triple<String, String, String>, Nothing> { props, _, environment ->
       Column {
-        Semantics(container = true) {
-          WorkflowRendering(rendering = props.first, viewEnvironment = environment)
-        }
+        WorkflowRendering(rendering = props.first, viewEnvironment = environment)
         Text(props.second)
-        Semantics(container = true) {
-          WorkflowRendering(rendering = props.third, viewEnvironment = environment)
-        }
+        WorkflowRendering(rendering = props.third, viewEnvironment = environment)
       }
     }
 

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

@@ -23,11 +23,10 @@ import androidx.ui.core.Modifier
 import androidx.ui.foundation.Text
 import androidx.ui.layout.Column
 import androidx.ui.layout.size
-import androidx.ui.semantics.Semantics
 import androidx.ui.test.assertIsDisplayed
 import androidx.ui.test.assertIsNotDisplayed
 import androidx.ui.test.createComposeRule
-import androidx.ui.test.findByText
+import androidx.ui.test.onNodeWithText
 import androidx.ui.tooling.preview.Preview
 import androidx.ui.unit.dp
 import com.squareup.workflow.ui.ViewEnvironmentKey
@@ -47,28 +46,28 @@ class PreviewViewFactoryTest {
       ParentWithOneChildPreview()
     }
 
-    findByText("one").assertIsDisplayed()
-    findByText("two").assertIsDisplayed()
+    onNodeWithText("one").assertIsDisplayed()
+    onNodeWithText("two").assertIsDisplayed()
   }
 
   @Test fun twoChildren() {
     composeRule.setContent {
       ParentWithTwoChildrenPreview()
     }
 
-    findByText("one").assertIsDisplayed()
-    findByText("two").assertIsDisplayed()
-    findByText("three").assertIsDisplayed()
+    onNodeWithText("one").assertIsDisplayed()
+    onNodeWithText("two").assertIsDisplayed()
+    onNodeWithText("three").assertIsDisplayed()
   }
 
   @Test fun recursive() {
     composeRule.setContent {
       ParentRecursivePreview()
     }
 
-    findByText("one").assertIsDisplayed()
-    findByText("two").assertIsDisplayed()
-    findByText("three").assertIsDisplayed()
+    onNodeWithText("one").assertIsDisplayed()
+    onNodeWithText("two").assertIsDisplayed()
+    onNodeWithText("three").assertIsDisplayed()
   }
 
   @Test fun modifierIsApplied() {
@@ -77,8 +76,8 @@ class PreviewViewFactoryTest {
     }
 
     // The view factory will be rendered with size (0,0), so it should be reported as not displayed.
-    findByText("one").assertIsNotDisplayed()
-    findByText("two").assertIsNotDisplayed()
+    onNodeWithText("one").assertIsNotDisplayed()
+    onNodeWithText("two").assertIsNotDisplayed()
   }
 
   @Test fun placeholderModifierIsApplied() {
@@ -87,25 +86,23 @@ class PreviewViewFactoryTest {
     }
 
     // The child will be rendered with size (0,0), so it should be reported as not displayed.
-    findByText("one").assertIsDisplayed()
-    findByText("two").assertIsNotDisplayed()
+    onNodeWithText("one").assertIsDisplayed()
+    onNodeWithText("two").assertIsNotDisplayed()
   }
 
   @Test fun customViewEnvironment() {
     composeRule.setContent {
       ParentConsumesCustomKeyPreview()
     }
 
-    findByText("foo").assertIsDisplayed()
+    onNodeWithText("foo").assertIsDisplayed()
   }
 
   private val ParentWithOneChild =
     composedViewFactory<Pair<String, String>> { rendering, environment ->
       Column {
         Text(rendering.first)
-        Semantics(container = true, mergeAllDescendants = true) {
-          WorkflowRendering(rendering.second, environment)
-        }
+        WorkflowRendering(rendering.second, environment)
       }
     }
 
@@ -116,13 +113,9 @@ class PreviewViewFactoryTest {
   private val ParentWithTwoChildren =
     composedViewFactory<Triple<String, String, String>> { rendering, environment ->
       Column {
-        Semantics(container = true) {
-          WorkflowRendering(rendering.first, environment)
-        }
+        WorkflowRendering(rendering.first, environment)
         Text(rendering.second)
-        Semantics(container = true) {
-          WorkflowRendering(rendering.third, environment)
-        }
+        WorkflowRendering(rendering.third, environment)
       }
     }
 
@@ -139,9 +132,7 @@ class PreviewViewFactoryTest {
     Column {
       Text(rendering.text)
       rendering.child?.let { child ->
-        Semantics(container = true) {
-          WorkflowRendering(rendering = child, viewEnvironment = environment)
-        }
+        WorkflowRendering(rendering = child, viewEnvironment = environment)
       }
     }
   }

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

@@ -30,7 +30,6 @@ import androidx.ui.graphics.Color
 import androidx.ui.graphics.Paint
 import androidx.ui.graphics.Shadow
 import androidx.ui.graphics.drawscope.DrawScope
-import androidx.ui.graphics.drawscope.Stroke
 import androidx.ui.graphics.drawscope.drawCanvas
 import androidx.ui.graphics.drawscope.rotate
 import androidx.ui.graphics.withSaveLayer
@@ -112,10 +111,9 @@ private fun DrawScope.drawHatch(
   spaceWidth: Dp,
   angle: Float
 ) {
-  val strokeWidthPx = strokeWidth.toPx().value
-  val spaceWidthPx = spaceWidth.toPx().value
+  val strokeWidthPx = strokeWidth.toPx()
+  val spaceWidthPx = spaceWidth.toPx()
   val strokeColor = color.scaleColors(.5f)
-  val stroke = Stroke(width = strokeWidthPx)
 
   rotate(angle) {
     // Draw outside our bounds to fill the space even when rotated.
@@ -130,7 +128,7 @@ private fun DrawScope.drawHatch(
           strokeColor,
           Offset(left, y),
           Offset(right, y),
-          stroke = stroke
+          strokeWidthPx
       )
       y += spaceWidthPx * 2
     }