Merge pull request #1147 from square/zachklipp/extract-compose

Extracted Compose support into square/workflow-kotlin-compose.
square · May 11, 2020 · 33ad3e1 · 33ad3e1
2 parents 18c78b4 + 9215846
commit 33ad3e1
Show file tree

Hide file tree

Showing 18 changed files with 0 additions and 645 deletions.
diff --git a/kotlin/.buildscript/configure-compose.gradle b/kotlin/.buildscript/configure-compose.gradle
diff --git a/kotlin/build.gradle.kts b/kotlin/build.gradle.kts
@@ -115,7 +115,6 @@ tasks.register<DokkaTask>("siteDokka") {
       "backstack-common",
       "core-android",
       "core-common",
-      "core-compose",
       "legacy-workflow-core",
       "legacy-workflow-rx2",
       "legacy-workflow-test",

diff --git a/kotlin/buildSrc/src/main/java/Dependencies.kt b/kotlin/buildSrc/src/main/java/Dependencies.kt
@@ -4,7 +4,6 @@ import java.util.Locale.US
 import kotlin.reflect.full.declaredMembers
 
 object Versions {
-  const val compose = "0.1.0-dev10"
   const val coroutines = "1.3.4"
   const val kotlin = "1.3.71"
   const val targetSdk = 29
@@ -38,14 +37,6 @@ object Dependencies {
     const val viewbinding = "androidx.databinding:viewbinding:3.6.2"
   }
 
-  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 test = "androidx.ui:ui-test:${Versions.compose}"
-    const val tooling = "androidx.ui:ui-tooling:${Versions.compose}"
-  }
-
   const val cycler = "com.squareup.cycler:cycler:0.1.3"
 
   // Required for Dungeon Crawler sample.

diff --git a/kotlin/samples/hello-compose-binding/build.gradle.kts b/kotlin/samples/hello-compose-binding/build.gradle.kts
diff --git a/...-binding/src/androidTest/java/com/squareup/sample/hellocomposebinding/HelloBindingTest.kt b/...-binding/src/androidTest/java/com/squareup/sample/hellocomposebinding/HelloBindingTest.kt
diff --git a/kotlin/samples/hello-compose-binding/src/main/AndroidManifest.xml b/kotlin/samples/hello-compose-binding/src/main/AndroidManifest.xml
diff --git a/...llo-compose-binding/src/main/java/com/squareup/sample/hellocomposebinding/HelloBinding.kt b/...llo-compose-binding/src/main/java/com/squareup/sample/hellocomposebinding/HelloBinding.kt
diff --git a/...ose-binding/src/main/java/com/squareup/sample/hellocomposebinding/HelloBindingActivity.kt b/...ose-binding/src/main/java/com/squareup/sample/hellocomposebinding/HelloBindingActivity.kt
diff --git a/...lo-compose-binding/src/main/java/com/squareup/sample/hellocomposebinding/HelloWorkflow.kt b/...lo-compose-binding/src/main/java/com/squareup/sample/hellocomposebinding/HelloWorkflow.kt
diff --git a/kotlin/samples/hello-compose-binding/src/main/res/values/strings.xml b/kotlin/samples/hello-compose-binding/src/main/res/values/strings.xml