Changing dependencies to rely on workflow-ui:common instead of workfl…

…ow-ui:common-core * Fix some lint issues
square · Jun 28, 2024 · b668657 · b668657
1 parent 0fb1c90
commit b668657
Show file tree

Hide file tree

Showing 23 changed files with 27 additions and 29 deletions.
diff --git a/artifacts.json b/artifacts.json
@@ -243,7 +243,7 @@
     "publicationName": "maven"
   },
   {
-    "gradlePath": ":workflow-ui:core-common",
+    "gradlePath": ":workflow-ui:core",
     "group": "com.squareup.workflow1",
     "artifactId": "workflow-ui-core-common-jvm",
     "description": "Workflow UI Core",
@@ -260,4 +260,4 @@
     "javaVersion": 8,
     "publicationName": "maven"
   }
-]
+]
diff --git a/benchmarks/performance-poetry/complex-poetry/build.gradle.kts b/benchmarks/performance-poetry/complex-poetry/build.gradle.kts
@@ -64,7 +64,7 @@ dependencies {
   api(project(":workflow-core"))
   api(project(":workflow-runtime"))
   api(project(":workflow-ui:core-android"))
-  api(project(":workflow-ui:core-common"))
+  api(project(":workflow-ui:core"))
 
   debugImplementation(libs.squareup.leakcanary.android)
 

diff --git a/build-logic/src/main/java/com/squareup/workflow1/buildsrc/AndroidSampleAppPlugin.kt b/build-logic/src/main/java/com/squareup/workflow1/buildsrc/AndroidSampleAppPlugin.kt
@@ -2,7 +2,7 @@ package com.squareup.workflow1.buildsrc
 
 import com.android.build.gradle.TestedExtension
 import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
-import com.rickbusarow.kgx.dependency
+import com.rickbusarow.kgx.library
 import com.rickbusarow.kgx.libsCatalog
 import com.squareup.workflow1.buildsrc.internal.implementation
 import com.squareup.workflow1.buildsrc.internal.invoke
@@ -31,8 +31,8 @@ class AndroidSampleAppPlugin : Plugin<Project> {
       implementation(target.project(":workflow-runtime"))
       implementation(target.project(":workflow-config:config-android"))
 
-      implementation(target.libsCatalog.dependency("androidx-appcompat"))
-      implementation(target.libsCatalog.dependency("timber"))
+      implementation(target.libsCatalog.library("androidx-appcompat"))
+      implementation(target.libsCatalog.library("timber"))
     }
   }
 }
diff --git a/samples/compose-samples/README.md b/samples/compose-samples/README.md
@@ -3,12 +3,11 @@
 This module is named "compose-samples" because the binary validation tool seems to refuse to look
 at the `:workflow-ui:compose` module if this one is also named `compose`.
 
+## iOS
 
-# iOS
 1. To run the iOS target you need to be on a Mac and have Xcode installed.
-2. Then install the Kotlin Multiplatform plugin for your intellij IDE
-3. Finally go to run configurations and add a new iOS Application configuration and select the iOS
-project file in ./iosApp
+1. Then install the Kotlin Multiplatform plugin for your intellij IDE
+1. Finally go to run configurations and add a new iOS Application configuration and select the iOS project file in ./iosApp
 
 [To enable iOS debugging](https://appkickstarter.com/blog/debug-an-ios-kotlin-multiplatform-app-from-android-studio/) open Settings -> Advanced Settings -> Enable experimental Multiplatform IDE features
 

diff --git a/samples/compose-samples/build.gradle.kts b/samples/compose-samples/build.gradle.kts
@@ -73,7 +73,6 @@ kotlin {
       implementation(project(":workflow-config:config-android"))
       implementation(project(":workflow-ui:compose-tooling"))
       implementation(project(":workflow-ui:core-android"))
-      implementation(project(":workflow-ui:core-common"))
     }
 
     val iosX64Main by getting

diff --git a/samples/containers/android/build.gradle.kts b/samples/containers/android/build.gradle.kts
@@ -27,7 +27,7 @@ dependencies {
 
   api(project(":samples:containers:common"))
   api(project(":workflow-ui:core-android"))
-  api(project(":workflow-ui:core-common"))
+  api(project(":workflow-ui:core"))
 
   implementation(libs.androidx.appcompat)
   implementation(libs.androidx.core)

diff --git a/samples/containers/common/build.gradle.kts b/samples/containers/common/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  api(project(":workflow-ui:core-common"))
+  api(project(":workflow-ui:core"))
 
   implementation(libs.kotlin.jdk6)
 

diff --git a/samples/containers/hello-back-button/build.gradle.kts b/samples/containers/hello-back-button/build.gradle.kts
@@ -20,5 +20,5 @@ dependencies {
 
   implementation(project(":samples:containers:android"))
   implementation(project(":workflow-ui:core-android"))
-  implementation(project(":workflow-ui:core-common"))
+  implementation(project(":workflow-ui:core"))
 }
diff --git a/samples/containers/poetry/build.gradle.kts b/samples/containers/poetry/build.gradle.kts
@@ -15,7 +15,7 @@ dependencies {
   api(project(":samples:containers:common"))
   api(project(":workflow-core"))
   api(project(":workflow-ui:core-android"))
-  api(project(":workflow-ui:core-common"))
+  api(project(":workflow-ui:core"))
 
   implementation(libs.androidx.appcompat)
   implementation(libs.androidx.recyclerview)

diff --git a/samples/dungeon/app/build.gradle.kts b/samples/dungeon/app/build.gradle.kts
@@ -49,7 +49,7 @@ dependencies {
   implementation(project(":samples:dungeon:timemachine-shakeable"))
   implementation(project(":workflow-tracing"))
   implementation(project(":workflow-ui:core-android"))
-  implementation(project(":workflow-ui:core-common"))
+  implementation(project(":workflow-ui:core"))
 
   testImplementation(libs.junit)
   testImplementation(libs.truth)

diff --git a/samples/dungeon/common/build.gradle.kts b/samples/dungeon/common/build.gradle.kts
@@ -7,7 +7,7 @@ dependencies {
   api(libs.squareup.okio)
 
   api(project(":workflow-core"))
-  api(project(":workflow-ui:core-common"))
+  api(project(":workflow-ui:core"))
 
   implementation(libs.kotlin.jdk8)
   implementation(libs.kotlinx.coroutines.core)

diff --git a/samples/dungeon/timemachine-shakeable/build.gradle.kts b/samples/dungeon/timemachine-shakeable/build.gradle.kts
@@ -14,7 +14,7 @@ dependencies {
   api(project(":samples:dungeon:timemachine"))
   api(project(":workflow-core"))
   api(project(":workflow-ui:core-android"))
-  api(project(":workflow-ui:core-common"))
+  api(project(":workflow-ui:core"))
 
   implementation(libs.androidx.appcompat)
   implementation(libs.androidx.constraintlayout)

diff --git a/samples/hello-workflow-fragment/build.gradle.kts b/samples/hello-workflow-fragment/build.gradle.kts
@@ -20,5 +20,5 @@ dependencies {
   implementation(libs.androidx.lifecycle.viewmodel.savedstate)
 
   implementation(project(":workflow-ui:core-android"))
-  implementation(project(":workflow-ui:core-common"))
+  implementation(project(":workflow-ui:core"))
 }
diff --git a/samples/hello-workflow/build.gradle.kts b/samples/hello-workflow/build.gradle.kts
@@ -21,5 +21,5 @@ dependencies {
   implementation(libs.androidx.viewbinding)
 
   implementation(project(":workflow-ui:core-android"))
-  implementation(project(":workflow-ui:core-common"))
+  implementation(project(":workflow-ui:core"))
 }
diff --git a/samples/nested-overlays/build.gradle.kts b/samples/nested-overlays/build.gradle.kts
@@ -21,5 +21,5 @@ dependencies {
   implementation(libs.androidx.viewbinding)
 
   implementation(project(":workflow-ui:core-android"))
-  implementation(project(":workflow-ui:core-common"))
+  implementation(project(":workflow-ui:core"))
 }
diff --git a/samples/stub-visibility/build.gradle.kts b/samples/stub-visibility/build.gradle.kts
@@ -21,5 +21,5 @@ dependencies {
   implementation(libs.androidx.viewbinding)
 
   implementation(project(":workflow-ui:core-android"))
-  implementation(project(":workflow-ui:core-common"))
+  implementation(project(":workflow-ui:core"))
 }
diff --git a/samples/tictactoe/app/build.gradle.kts b/samples/tictactoe/app/build.gradle.kts
@@ -41,5 +41,5 @@ dependencies {
   implementation(project(":samples:tictactoe:common"))
   implementation(project(":workflow-tracing"))
   implementation(project(":workflow-ui:core-android"))
-  implementation(project(":workflow-ui:core-common"))
+  implementation(project(":workflow-ui:core"))
 }
diff --git a/samples/tictactoe/common/build.gradle.kts b/samples/tictactoe/common/build.gradle.kts
@@ -7,7 +7,7 @@ dependencies {
   api(libs.squareup.okio)
 
   api(project(":workflow-core"))
-  api(project(":workflow-ui:core-common"))
+  api(project(":workflow-ui:core"))
 
   implementation(libs.kotlin.jdk6)
   implementation(libs.kotlinx.coroutines.core)

diff --git a/samples/todo-android/app/build.gradle.kts b/samples/todo-android/app/build.gradle.kts
@@ -31,7 +31,7 @@ dependencies {
   implementation(project(":workflow-core"))
   implementation(project(":workflow-tracing"))
   implementation(project(":workflow-ui:core-android"))
-  implementation(project(":workflow-ui:core-common"))
+  implementation(project(":workflow-ui:core"))
 
   testImplementation(libs.junit)
   testImplementation(libs.truth)

diff --git a/workflow-ui/compose-tooling/build.gradle.kts b/workflow-ui/compose-tooling/build.gradle.kts
@@ -46,5 +46,5 @@ dependencies {
 
   implementation(project(":workflow-ui:compose"))
   implementation(project(":workflow-ui:core-android"))
-  implementation(project(":workflow-ui:core-common"))
+  implementation(project(":workflow-ui:core"))
 }
diff --git a/workflow-ui/core-android/build.gradle.kts b/workflow-ui/core-android/build.gradle.kts
@@ -20,7 +20,7 @@ dependencies {
 
   // Needs to be API for the WorkflowInterceptor argument to WorkflowRunner.Config.
   api(project(":workflow-runtime"))
-  api(project(":workflow-ui:core-common"))
+  api(project(":workflow-ui:core"))
 
   compileOnly(libs.androidx.viewbinding)
 

diff --git a/workflow-ui/internal-testing-android/build.gradle.kts b/workflow-ui/internal-testing-android/build.gradle.kts
@@ -27,7 +27,7 @@ dependencies {
   api(libs.truth)
 
   api(project(":workflow-ui:core-android"))
-  api(project(":workflow-ui:core-common"))
+  api(project(":workflow-ui:core"))
 
   implementation(libs.androidx.lifecycle.common)
   implementation(libs.squareup.leakcanary.instrumentation)

diff --git a/workflow-ui/radiography/build.gradle.kts b/workflow-ui/radiography/build.gradle.kts
@@ -17,5 +17,5 @@ dependencies {
   implementation(libs.squareup.radiography)
 
   implementation(project(":workflow-ui:core-android"))
-  implementation(project(":workflow-ui:core-common"))
+  implementation(project(":workflow-ui:core"))
 }