Rename protocol modules to 'guest' and 'host' (#1641)

From 'compose' and 'widget', respectively.
cashapp · Oct 27, 2023 · 667fff5 · 667fff5
1 parent 83ef069
commit 667fff5
Show file tree

Hide file tree

Showing 40 changed files with 11 additions and 11 deletions.
diff --git a/redwood-gradle-plugin/build.gradle b/redwood-gradle-plugin/build.gradle
@@ -105,8 +105,8 @@ test {
   dependsOn(':redwood-compose:publishAllPublicationsToLocalMavenRepository')
   dependsOn(':redwood-gradle-plugin:publishAllPublicationsToLocalMavenRepository')
   dependsOn(':redwood-protocol:publishAllPublicationsToLocalMavenRepository')
-  dependsOn(':redwood-protocol-compose:publishAllPublicationsToLocalMavenRepository')
-  dependsOn(':redwood-protocol-widget:publishAllPublicationsToLocalMavenRepository')
+  dependsOn(':redwood-protocol-guest:publishAllPublicationsToLocalMavenRepository')
+  dependsOn(':redwood-protocol-host:publishAllPublicationsToLocalMavenRepository')
   dependsOn(':redwood-runtime:publishAllPublicationsToLocalMavenRepository')
   dependsOn(':redwood-schema:publishAllPublicationsToLocalMavenRepository')
   dependsOn(':redwood-tooling-codegen:publishAllPublicationsToLocalMavenRepository')

diff --git a/redwood-gradle-plugin/src/main/kotlin/app/cash/redwood/gradle/RedwoodGeneratorPlugin.kt b/redwood-gradle-plugin/src/main/kotlin/app/cash/redwood/gradle/RedwoodGeneratorPlugin.kt
@@ -53,11 +53,11 @@ public abstract class RedwoodGeneratorPlugin(
     internal val dependencyArtifactId: String,
   ) {
     Compose("--compose", "redwood-compose"),
-    ComposeProtocol("--compose-protocol", "redwood-protocol-compose"),
+    ComposeProtocol("--compose-protocol", "redwood-protocol-guest"),
     Modifiers("--modifier", "redwood-runtime"),
     Testing("--testing", "redwood-testing"),
     Widget("--widget", "redwood-widget"),
-    WidgetProtocol("--widget-protocol", "redwood-protocol-widget"),
+    WidgetProtocol("--widget-protocol", "redwood-protocol-host"),
   }
 
   override fun apply(project: Project) {

diff --git a/redwood-protocol-compose/build.gradle → redwood-protocol-guest/build.gradle b/redwood-protocol-compose/build.gradle → redwood-protocol-guest/build.gradle
diff --git a/.../redwood/protocol/compose/PlatformList.kt → .../redwood/protocol/compose/PlatformList.kt b/.../redwood/protocol/compose/PlatformList.kt → .../redwood/protocol/compose/PlatformList.kt
diff --git a/...h/redwood/protocol/compose/PlatformMap.kt → ...h/redwood/protocol/compose/PlatformMap.kt b/...h/redwood/protocol/compose/PlatformMap.kt → ...h/redwood/protocol/compose/PlatformMap.kt
diff --git a/...edwood/protocol/compose/ProtocolBridge.kt → ...edwood/protocol/compose/ProtocolBridge.kt b/...edwood/protocol/compose/ProtocolBridge.kt → ...edwood/protocol/compose/ProtocolBridge.kt
diff --git a/...otocol/compose/ProtocolMismatchHandler.kt → ...otocol/compose/ProtocolMismatchHandler.kt b/...otocol/compose/ProtocolMismatchHandler.kt → ...otocol/compose/ProtocolMismatchHandler.kt
diff --git a/...col/compose/ProtocolRedwoodComposition.kt → ...col/compose/ProtocolRedwoodComposition.kt b/...col/compose/ProtocolRedwoodComposition.kt → ...col/compose/ProtocolRedwoodComposition.kt
diff --git a/...redwood/protocol/compose/ProtocolState.kt → ...redwood/protocol/compose/ProtocolState.kt b/...redwood/protocol/compose/ProtocolState.kt → ...redwood/protocol/compose/ProtocolState.kt
diff --git a/...edwood/protocol/compose/ProtocolWidget.kt → ...edwood/protocol/compose/ProtocolWidget.kt b/...edwood/protocol/compose/ProtocolWidget.kt → ...edwood/protocol/compose/ProtocolWidget.kt
diff --git a/...rotocol/compose/ProtocolWidgetChildren.kt → ...rotocol/compose/ProtocolWidgetChildren.kt b/...rotocol/compose/ProtocolWidgetChildren.kt → ...rotocol/compose/ProtocolWidgetChildren.kt
diff --git a/...protocol/compose/DurationIsoSerializer.kt → ...protocol/compose/DurationIsoSerializer.kt b/...protocol/compose/DurationIsoSerializer.kt → ...protocol/compose/DurationIsoSerializer.kt
diff --git a/...ol/compose/GeneratedProtocolBridgeTest.kt → ...ol/compose/GeneratedProtocolBridgeTest.kt b/...ol/compose/GeneratedProtocolBridgeTest.kt → ...ol/compose/GeneratedProtocolBridgeTest.kt
diff --git a/...ol/compose/ProtocolMismatchHandlerTest.kt → ...ol/compose/ProtocolMismatchHandlerTest.kt b/...ol/compose/ProtocolMismatchHandlerTest.kt → ...ol/compose/ProtocolMismatchHandlerTest.kt
diff --git a/.../redwood/protocol/compose/ProtocolTest.kt → .../redwood/protocol/compose/ProtocolTest.kt b/.../redwood/protocol/compose/ProtocolTest.kt → .../redwood/protocol/compose/ProtocolTest.kt
diff --git a/...mpose/RecordingProtocolMismatchHandler.kt → ...mpose/RecordingProtocolMismatchHandler.kt b/...mpose/RecordingProtocolMismatchHandler.kt → ...mpose/RecordingProtocolMismatchHandler.kt
diff --git a/.../redwood/protocol/compose/PlatformList.kt → .../redwood/protocol/compose/PlatformList.kt b/.../redwood/protocol/compose/PlatformList.kt → .../redwood/protocol/compose/PlatformList.kt
diff --git a/...h/redwood/protocol/compose/PlatformMap.kt → ...h/redwood/protocol/compose/PlatformMap.kt b/...h/redwood/protocol/compose/PlatformMap.kt → ...h/redwood/protocol/compose/PlatformMap.kt
diff --git a/.../redwood/protocol/compose/PlatformList.kt → .../redwood/protocol/compose/PlatformList.kt b/.../redwood/protocol/compose/PlatformList.kt → .../redwood/protocol/compose/PlatformList.kt
diff --git a/...h/redwood/protocol/compose/PlatformMap.kt → ...h/redwood/protocol/compose/PlatformMap.kt b/...h/redwood/protocol/compose/PlatformMap.kt → ...h/redwood/protocol/compose/PlatformMap.kt
diff --git a/redwood-protocol-widget/build.gradle → redwood-protocol-host/build.gradle b/redwood-protocol-widget/build.gradle → redwood-protocol-host/build.gradle
diff --git a/...redwood/protocol/widget/ProtocolBridge.kt → ...redwood/protocol/widget/ProtocolBridge.kt b/...redwood/protocol/widget/ProtocolBridge.kt → ...redwood/protocol/widget/ProtocolBridge.kt
diff --git a/...rotocol/widget/ProtocolMismatchHandler.kt → ...rotocol/widget/ProtocolMismatchHandler.kt b/...rotocol/widget/ProtocolMismatchHandler.kt → ...rotocol/widget/ProtocolMismatchHandler.kt
diff --git a/...h/redwood/protocol/widget/ProtocolNode.kt → ...h/redwood/protocol/widget/ProtocolNode.kt b/...h/redwood/protocol/widget/ProtocolNode.kt → ...h/redwood/protocol/widget/ProtocolNode.kt
diff --git a/...od/protocol/widget/ProtocolNodeFactory.kt → ...od/protocol/widget/ProtocolNodeFactory.kt b/...od/protocol/widget/ProtocolNodeFactory.kt → ...od/protocol/widget/ProtocolNodeFactory.kt
diff --git a/.../protocol/widget/DurationIsoSerializer.kt → .../protocol/widget/DurationIsoSerializer.kt b/.../protocol/widget/DurationIsoSerializer.kt → .../protocol/widget/DurationIsoSerializer.kt
diff --git a/...widget/EmptyExampleSchemaWidgetFactory.kt → ...widget/EmptyExampleSchemaWidgetFactory.kt b/...widget/EmptyExampleSchemaWidgetFactory.kt → ...widget/EmptyExampleSchemaWidgetFactory.kt
diff --git a/...widget/EmptyRedwoodLayoutWidgetFactory.kt → ...widget/EmptyRedwoodLayoutWidgetFactory.kt b/...widget/EmptyRedwoodLayoutWidgetFactory.kt → ...widget/EmptyRedwoodLayoutWidgetFactory.kt
diff --git a/...et/EmptyRedwoodLazyLayoutWidgetFactory.kt → ...et/EmptyRedwoodLazyLayoutWidgetFactory.kt b/...et/EmptyRedwoodLazyLayoutWidgetFactory.kt → ...et/EmptyRedwoodLazyLayoutWidgetFactory.kt
diff --git a/...ood/protocol/widget/ProtocolBridgeTest.kt → ...ood/protocol/widget/ProtocolBridgeTest.kt b/...ood/protocol/widget/ProtocolBridgeTest.kt → ...ood/protocol/widget/ProtocolBridgeTest.kt
diff --git a/...col/widget/ProtocolMismatchHandlerTest.kt → ...col/widget/ProtocolMismatchHandlerTest.kt b/...col/widget/ProtocolMismatchHandlerTest.kt → ...col/widget/ProtocolMismatchHandlerTest.kt
diff --git a/...rotocol/widget/ProtocolNodeFactoryTest.kt → ...rotocol/widget/ProtocolNodeFactoryTest.kt b/...rotocol/widget/ProtocolNodeFactoryTest.kt → ...rotocol/widget/ProtocolNodeFactoryTest.kt
diff --git a/...ood/protocol/widget/RecordingEventSink.kt → ...ood/protocol/widget/RecordingEventSink.kt b/...ood/protocol/widget/RecordingEventSink.kt → ...ood/protocol/widget/RecordingEventSink.kt
diff --git a/...idget/RecordingProtocolMismatchHandler.kt → ...idget/RecordingProtocolMismatchHandler.kt b/...idget/RecordingProtocolMismatchHandler.kt → ...idget/RecordingProtocolMismatchHandler.kt
diff --git a/redwood-testing/build.gradle b/redwood-testing/build.gradle
@@ -17,7 +17,7 @@ kotlin {
       dependencies {
         api libs.jetbrains.compose.runtime
         api libs.kotlinx.coroutines.core
-        api projects.redwoodProtocolCompose
+        api projects.redwoodProtocolGuest
       }
     }
     commonTest {

diff --git a/redwood-treehouse-guest-compose/build.gradle b/redwood-treehouse-guest-compose/build.gradle
@@ -13,7 +13,7 @@ kotlin {
   sourceSets {
     commonMain {
       dependencies {
-        api projects.redwoodProtocolCompose
+        api projects.redwoodProtocolGuest
         api libs.jetbrains.compose.runtime
       }
     }

diff --git a/redwood-treehouse-guest/build.gradle b/redwood-treehouse-guest/build.gradle
@@ -20,7 +20,7 @@ kotlin {
         api libs.okio
         api libs.zipline
         api projects.redwoodProtocol
-        api projects.redwoodProtocolCompose
+        api projects.redwoodProtocolGuest
         api projects.redwoodTreehouse
         api projects.redwoodTreehouseGuestCompose
       }

diff --git a/redwood-treehouse-host/build.gradle b/redwood-treehouse-host/build.gradle
@@ -21,7 +21,7 @@ kotlin {
         api libs.zipline
         api libs.zipline.loader
         api projects.redwoodProtocol
-        api projects.redwoodProtocolWidget
+        api projects.redwoodProtocolHost
         api projects.redwoodTreehouse
       }
     }

diff --git a/settings.gradle b/settings.gradle
@@ -66,8 +66,8 @@ include ':redwood-lazylayout-uiview'
 include ':redwood-lazylayout-view'
 include ':redwood-lazylayout-widget'
 include ':redwood-protocol'
-include ':redwood-protocol-compose'
-include ':redwood-protocol-widget'
+include ':redwood-protocol-guest'
+include ':redwood-protocol-host'
 include ':redwood-runtime'
 include ':redwood-schema'
 include ':redwood-testing'

diff --git a/test-app/presenter/build.gradle b/test-app/presenter/build.gradle
@@ -18,9 +18,9 @@ kotlin {
       dependencies {
         implementation projects.testApp.schema.compose
         implementation projects.redwoodLazylayoutCompose
-        implementation projects.redwoodProtocolCompose
         implementation libs.paging.compose.common
         implementation libs.kotlinx.coroutines.core
+        implementation libs.kotlinx.serialization.json
       }
     }
   }