From 667fff50884763ed02f661b547521422a0040767 Mon Sep 17 00:00:00 2001 From: Jake Wharton Date: Fri, 27 Oct 2023 00:47:28 -0400 Subject: [PATCH] Rename protocol modules to 'guest' and 'host' (#1641) From 'compose' and 'widget', respectively. --- redwood-gradle-plugin/build.gradle | 4 ++-- .../kotlin/app/cash/redwood/gradle/RedwoodGeneratorPlugin.kt | 4 ++-- .../build.gradle | 0 .../kotlin/app/cash/redwood/protocol/compose/PlatformList.kt | 0 .../kotlin/app/cash/redwood/protocol/compose/PlatformMap.kt | 0 .../app/cash/redwood/protocol/compose/ProtocolBridge.kt | 0 .../cash/redwood/protocol/compose/ProtocolMismatchHandler.kt | 0 .../redwood/protocol/compose/ProtocolRedwoodComposition.kt | 0 .../kotlin/app/cash/redwood/protocol/compose/ProtocolState.kt | 0 .../app/cash/redwood/protocol/compose/ProtocolWidget.kt | 0 .../cash/redwood/protocol/compose/ProtocolWidgetChildren.kt | 0 .../cash/redwood/protocol/compose/DurationIsoSerializer.kt | 0 .../redwood/protocol/compose/GeneratedProtocolBridgeTest.kt | 0 .../redwood/protocol/compose/ProtocolMismatchHandlerTest.kt | 0 .../kotlin/app/cash/redwood/protocol/compose/ProtocolTest.kt | 0 .../protocol/compose/RecordingProtocolMismatchHandler.kt | 0 .../kotlin/app/cash/redwood/protocol/compose/PlatformList.kt | 0 .../kotlin/app/cash/redwood/protocol/compose/PlatformMap.kt | 0 .../kotlin/app/cash/redwood/protocol/compose/PlatformList.kt | 0 .../kotlin/app/cash/redwood/protocol/compose/PlatformMap.kt | 0 .../build.gradle | 0 .../kotlin/app/cash/redwood/protocol/widget/ProtocolBridge.kt | 0 .../cash/redwood/protocol/widget/ProtocolMismatchHandler.kt | 0 .../kotlin/app/cash/redwood/protocol/widget/ProtocolNode.kt | 0 .../app/cash/redwood/protocol/widget/ProtocolNodeFactory.kt | 0 .../app/cash/redwood/protocol/widget/DurationIsoSerializer.kt | 0 .../protocol/widget/EmptyExampleSchemaWidgetFactory.kt | 0 .../protocol/widget/EmptyRedwoodLayoutWidgetFactory.kt | 0 .../protocol/widget/EmptyRedwoodLazyLayoutWidgetFactory.kt | 0 .../app/cash/redwood/protocol/widget/ProtocolBridgeTest.kt | 0 .../redwood/protocol/widget/ProtocolMismatchHandlerTest.kt | 0 .../cash/redwood/protocol/widget/ProtocolNodeFactoryTest.kt | 0 .../app/cash/redwood/protocol/widget/RecordingEventSink.kt | 0 .../protocol/widget/RecordingProtocolMismatchHandler.kt | 0 redwood-testing/build.gradle | 2 +- redwood-treehouse-guest-compose/build.gradle | 2 +- redwood-treehouse-guest/build.gradle | 2 +- redwood-treehouse-host/build.gradle | 2 +- settings.gradle | 4 ++-- test-app/presenter/build.gradle | 2 +- 40 files changed, 11 insertions(+), 11 deletions(-) rename {redwood-protocol-compose => redwood-protocol-guest}/build.gradle (100%) rename {redwood-protocol-compose => redwood-protocol-guest}/src/commonMain/kotlin/app/cash/redwood/protocol/compose/PlatformList.kt (100%) rename {redwood-protocol-compose => redwood-protocol-guest}/src/commonMain/kotlin/app/cash/redwood/protocol/compose/PlatformMap.kt (100%) rename {redwood-protocol-compose => redwood-protocol-guest}/src/commonMain/kotlin/app/cash/redwood/protocol/compose/ProtocolBridge.kt (100%) rename {redwood-protocol-compose => redwood-protocol-guest}/src/commonMain/kotlin/app/cash/redwood/protocol/compose/ProtocolMismatchHandler.kt (100%) rename {redwood-protocol-compose => redwood-protocol-guest}/src/commonMain/kotlin/app/cash/redwood/protocol/compose/ProtocolRedwoodComposition.kt (100%) rename {redwood-protocol-compose => redwood-protocol-guest}/src/commonMain/kotlin/app/cash/redwood/protocol/compose/ProtocolState.kt (100%) rename {redwood-protocol-compose => redwood-protocol-guest}/src/commonMain/kotlin/app/cash/redwood/protocol/compose/ProtocolWidget.kt (100%) rename {redwood-protocol-compose => redwood-protocol-guest}/src/commonMain/kotlin/app/cash/redwood/protocol/compose/ProtocolWidgetChildren.kt (100%) rename {redwood-protocol-compose => redwood-protocol-guest}/src/commonTest/kotlin/app/cash/redwood/protocol/compose/DurationIsoSerializer.kt (100%) rename {redwood-protocol-compose => redwood-protocol-guest}/src/commonTest/kotlin/app/cash/redwood/protocol/compose/GeneratedProtocolBridgeTest.kt (100%) rename {redwood-protocol-compose => redwood-protocol-guest}/src/commonTest/kotlin/app/cash/redwood/protocol/compose/ProtocolMismatchHandlerTest.kt (100%) rename {redwood-protocol-compose => redwood-protocol-guest}/src/commonTest/kotlin/app/cash/redwood/protocol/compose/ProtocolTest.kt (100%) rename {redwood-protocol-compose => redwood-protocol-guest}/src/commonTest/kotlin/app/cash/redwood/protocol/compose/RecordingProtocolMismatchHandler.kt (100%) rename {redwood-protocol-compose => redwood-protocol-guest}/src/jsMain/kotlin/app/cash/redwood/protocol/compose/PlatformList.kt (100%) rename {redwood-protocol-compose => redwood-protocol-guest}/src/jsMain/kotlin/app/cash/redwood/protocol/compose/PlatformMap.kt (100%) rename {redwood-protocol-compose => redwood-protocol-guest}/src/nonJsMain/kotlin/app/cash/redwood/protocol/compose/PlatformList.kt (100%) rename {redwood-protocol-compose => redwood-protocol-guest}/src/nonJsMain/kotlin/app/cash/redwood/protocol/compose/PlatformMap.kt (100%) rename {redwood-protocol-widget => redwood-protocol-host}/build.gradle (100%) rename {redwood-protocol-widget => redwood-protocol-host}/src/commonMain/kotlin/app/cash/redwood/protocol/widget/ProtocolBridge.kt (100%) rename {redwood-protocol-widget => redwood-protocol-host}/src/commonMain/kotlin/app/cash/redwood/protocol/widget/ProtocolMismatchHandler.kt (100%) rename {redwood-protocol-widget => redwood-protocol-host}/src/commonMain/kotlin/app/cash/redwood/protocol/widget/ProtocolNode.kt (100%) rename {redwood-protocol-widget => redwood-protocol-host}/src/commonMain/kotlin/app/cash/redwood/protocol/widget/ProtocolNodeFactory.kt (100%) rename {redwood-protocol-widget => redwood-protocol-host}/src/commonTest/kotlin/app/cash/redwood/protocol/widget/DurationIsoSerializer.kt (100%) rename {redwood-protocol-widget => redwood-protocol-host}/src/commonTest/kotlin/app/cash/redwood/protocol/widget/EmptyExampleSchemaWidgetFactory.kt (100%) rename {redwood-protocol-widget => redwood-protocol-host}/src/commonTest/kotlin/app/cash/redwood/protocol/widget/EmptyRedwoodLayoutWidgetFactory.kt (100%) rename {redwood-protocol-widget => redwood-protocol-host}/src/commonTest/kotlin/app/cash/redwood/protocol/widget/EmptyRedwoodLazyLayoutWidgetFactory.kt (100%) rename {redwood-protocol-widget => redwood-protocol-host}/src/commonTest/kotlin/app/cash/redwood/protocol/widget/ProtocolBridgeTest.kt (100%) rename {redwood-protocol-widget => redwood-protocol-host}/src/commonTest/kotlin/app/cash/redwood/protocol/widget/ProtocolMismatchHandlerTest.kt (100%) rename {redwood-protocol-widget => redwood-protocol-host}/src/commonTest/kotlin/app/cash/redwood/protocol/widget/ProtocolNodeFactoryTest.kt (100%) rename {redwood-protocol-widget => redwood-protocol-host}/src/commonTest/kotlin/app/cash/redwood/protocol/widget/RecordingEventSink.kt (100%) rename {redwood-protocol-widget => redwood-protocol-host}/src/commonTest/kotlin/app/cash/redwood/protocol/widget/RecordingProtocolMismatchHandler.kt (100%) diff --git a/redwood-gradle-plugin/build.gradle b/redwood-gradle-plugin/build.gradle index 99428d5557..da43f35f8a 100644 --- 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 index 20779c4638..d2ffe75839 100644 --- 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 b/redwood-protocol-guest/build.gradle similarity index 100% rename from redwood-protocol-compose/build.gradle rename to redwood-protocol-guest/build.gradle diff --git a/redwood-protocol-compose/src/commonMain/kotlin/app/cash/redwood/protocol/compose/PlatformList.kt b/redwood-protocol-guest/src/commonMain/kotlin/app/cash/redwood/protocol/compose/PlatformList.kt similarity index 100% rename from redwood-protocol-compose/src/commonMain/kotlin/app/cash/redwood/protocol/compose/PlatformList.kt rename to redwood-protocol-guest/src/commonMain/kotlin/app/cash/redwood/protocol/compose/PlatformList.kt diff --git a/redwood-protocol-compose/src/commonMain/kotlin/app/cash/redwood/protocol/compose/PlatformMap.kt b/redwood-protocol-guest/src/commonMain/kotlin/app/cash/redwood/protocol/compose/PlatformMap.kt similarity index 100% rename from redwood-protocol-compose/src/commonMain/kotlin/app/cash/redwood/protocol/compose/PlatformMap.kt rename to redwood-protocol-guest/src/commonMain/kotlin/app/cash/redwood/protocol/compose/PlatformMap.kt diff --git a/redwood-protocol-compose/src/commonMain/kotlin/app/cash/redwood/protocol/compose/ProtocolBridge.kt b/redwood-protocol-guest/src/commonMain/kotlin/app/cash/redwood/protocol/compose/ProtocolBridge.kt similarity index 100% rename from redwood-protocol-compose/src/commonMain/kotlin/app/cash/redwood/protocol/compose/ProtocolBridge.kt rename to redwood-protocol-guest/src/commonMain/kotlin/app/cash/redwood/protocol/compose/ProtocolBridge.kt diff --git a/redwood-protocol-compose/src/commonMain/kotlin/app/cash/redwood/protocol/compose/ProtocolMismatchHandler.kt b/redwood-protocol-guest/src/commonMain/kotlin/app/cash/redwood/protocol/compose/ProtocolMismatchHandler.kt similarity index 100% rename from redwood-protocol-compose/src/commonMain/kotlin/app/cash/redwood/protocol/compose/ProtocolMismatchHandler.kt rename to redwood-protocol-guest/src/commonMain/kotlin/app/cash/redwood/protocol/compose/ProtocolMismatchHandler.kt diff --git a/redwood-protocol-compose/src/commonMain/kotlin/app/cash/redwood/protocol/compose/ProtocolRedwoodComposition.kt b/redwood-protocol-guest/src/commonMain/kotlin/app/cash/redwood/protocol/compose/ProtocolRedwoodComposition.kt similarity index 100% rename from redwood-protocol-compose/src/commonMain/kotlin/app/cash/redwood/protocol/compose/ProtocolRedwoodComposition.kt rename to redwood-protocol-guest/src/commonMain/kotlin/app/cash/redwood/protocol/compose/ProtocolRedwoodComposition.kt diff --git a/redwood-protocol-compose/src/commonMain/kotlin/app/cash/redwood/protocol/compose/ProtocolState.kt b/redwood-protocol-guest/src/commonMain/kotlin/app/cash/redwood/protocol/compose/ProtocolState.kt similarity index 100% rename from redwood-protocol-compose/src/commonMain/kotlin/app/cash/redwood/protocol/compose/ProtocolState.kt rename to redwood-protocol-guest/src/commonMain/kotlin/app/cash/redwood/protocol/compose/ProtocolState.kt diff --git a/redwood-protocol-compose/src/commonMain/kotlin/app/cash/redwood/protocol/compose/ProtocolWidget.kt b/redwood-protocol-guest/src/commonMain/kotlin/app/cash/redwood/protocol/compose/ProtocolWidget.kt similarity index 100% rename from redwood-protocol-compose/src/commonMain/kotlin/app/cash/redwood/protocol/compose/ProtocolWidget.kt rename to redwood-protocol-guest/src/commonMain/kotlin/app/cash/redwood/protocol/compose/ProtocolWidget.kt diff --git a/redwood-protocol-compose/src/commonMain/kotlin/app/cash/redwood/protocol/compose/ProtocolWidgetChildren.kt b/redwood-protocol-guest/src/commonMain/kotlin/app/cash/redwood/protocol/compose/ProtocolWidgetChildren.kt similarity index 100% rename from redwood-protocol-compose/src/commonMain/kotlin/app/cash/redwood/protocol/compose/ProtocolWidgetChildren.kt rename to redwood-protocol-guest/src/commonMain/kotlin/app/cash/redwood/protocol/compose/ProtocolWidgetChildren.kt diff --git a/redwood-protocol-compose/src/commonTest/kotlin/app/cash/redwood/protocol/compose/DurationIsoSerializer.kt b/redwood-protocol-guest/src/commonTest/kotlin/app/cash/redwood/protocol/compose/DurationIsoSerializer.kt similarity index 100% rename from redwood-protocol-compose/src/commonTest/kotlin/app/cash/redwood/protocol/compose/DurationIsoSerializer.kt rename to redwood-protocol-guest/src/commonTest/kotlin/app/cash/redwood/protocol/compose/DurationIsoSerializer.kt diff --git a/redwood-protocol-compose/src/commonTest/kotlin/app/cash/redwood/protocol/compose/GeneratedProtocolBridgeTest.kt b/redwood-protocol-guest/src/commonTest/kotlin/app/cash/redwood/protocol/compose/GeneratedProtocolBridgeTest.kt similarity index 100% rename from redwood-protocol-compose/src/commonTest/kotlin/app/cash/redwood/protocol/compose/GeneratedProtocolBridgeTest.kt rename to redwood-protocol-guest/src/commonTest/kotlin/app/cash/redwood/protocol/compose/GeneratedProtocolBridgeTest.kt diff --git a/redwood-protocol-compose/src/commonTest/kotlin/app/cash/redwood/protocol/compose/ProtocolMismatchHandlerTest.kt b/redwood-protocol-guest/src/commonTest/kotlin/app/cash/redwood/protocol/compose/ProtocolMismatchHandlerTest.kt similarity index 100% rename from redwood-protocol-compose/src/commonTest/kotlin/app/cash/redwood/protocol/compose/ProtocolMismatchHandlerTest.kt rename to redwood-protocol-guest/src/commonTest/kotlin/app/cash/redwood/protocol/compose/ProtocolMismatchHandlerTest.kt diff --git a/redwood-protocol-compose/src/commonTest/kotlin/app/cash/redwood/protocol/compose/ProtocolTest.kt b/redwood-protocol-guest/src/commonTest/kotlin/app/cash/redwood/protocol/compose/ProtocolTest.kt similarity index 100% rename from redwood-protocol-compose/src/commonTest/kotlin/app/cash/redwood/protocol/compose/ProtocolTest.kt rename to redwood-protocol-guest/src/commonTest/kotlin/app/cash/redwood/protocol/compose/ProtocolTest.kt diff --git a/redwood-protocol-compose/src/commonTest/kotlin/app/cash/redwood/protocol/compose/RecordingProtocolMismatchHandler.kt b/redwood-protocol-guest/src/commonTest/kotlin/app/cash/redwood/protocol/compose/RecordingProtocolMismatchHandler.kt similarity index 100% rename from redwood-protocol-compose/src/commonTest/kotlin/app/cash/redwood/protocol/compose/RecordingProtocolMismatchHandler.kt rename to redwood-protocol-guest/src/commonTest/kotlin/app/cash/redwood/protocol/compose/RecordingProtocolMismatchHandler.kt diff --git a/redwood-protocol-compose/src/jsMain/kotlin/app/cash/redwood/protocol/compose/PlatformList.kt b/redwood-protocol-guest/src/jsMain/kotlin/app/cash/redwood/protocol/compose/PlatformList.kt similarity index 100% rename from redwood-protocol-compose/src/jsMain/kotlin/app/cash/redwood/protocol/compose/PlatformList.kt rename to redwood-protocol-guest/src/jsMain/kotlin/app/cash/redwood/protocol/compose/PlatformList.kt diff --git a/redwood-protocol-compose/src/jsMain/kotlin/app/cash/redwood/protocol/compose/PlatformMap.kt b/redwood-protocol-guest/src/jsMain/kotlin/app/cash/redwood/protocol/compose/PlatformMap.kt similarity index 100% rename from redwood-protocol-compose/src/jsMain/kotlin/app/cash/redwood/protocol/compose/PlatformMap.kt rename to redwood-protocol-guest/src/jsMain/kotlin/app/cash/redwood/protocol/compose/PlatformMap.kt diff --git a/redwood-protocol-compose/src/nonJsMain/kotlin/app/cash/redwood/protocol/compose/PlatformList.kt b/redwood-protocol-guest/src/nonJsMain/kotlin/app/cash/redwood/protocol/compose/PlatformList.kt similarity index 100% rename from redwood-protocol-compose/src/nonJsMain/kotlin/app/cash/redwood/protocol/compose/PlatformList.kt rename to redwood-protocol-guest/src/nonJsMain/kotlin/app/cash/redwood/protocol/compose/PlatformList.kt diff --git a/redwood-protocol-compose/src/nonJsMain/kotlin/app/cash/redwood/protocol/compose/PlatformMap.kt b/redwood-protocol-guest/src/nonJsMain/kotlin/app/cash/redwood/protocol/compose/PlatformMap.kt similarity index 100% rename from redwood-protocol-compose/src/nonJsMain/kotlin/app/cash/redwood/protocol/compose/PlatformMap.kt rename to redwood-protocol-guest/src/nonJsMain/kotlin/app/cash/redwood/protocol/compose/PlatformMap.kt diff --git a/redwood-protocol-widget/build.gradle b/redwood-protocol-host/build.gradle similarity index 100% rename from redwood-protocol-widget/build.gradle rename to redwood-protocol-host/build.gradle diff --git a/redwood-protocol-widget/src/commonMain/kotlin/app/cash/redwood/protocol/widget/ProtocolBridge.kt b/redwood-protocol-host/src/commonMain/kotlin/app/cash/redwood/protocol/widget/ProtocolBridge.kt similarity index 100% rename from redwood-protocol-widget/src/commonMain/kotlin/app/cash/redwood/protocol/widget/ProtocolBridge.kt rename to redwood-protocol-host/src/commonMain/kotlin/app/cash/redwood/protocol/widget/ProtocolBridge.kt diff --git a/redwood-protocol-widget/src/commonMain/kotlin/app/cash/redwood/protocol/widget/ProtocolMismatchHandler.kt b/redwood-protocol-host/src/commonMain/kotlin/app/cash/redwood/protocol/widget/ProtocolMismatchHandler.kt similarity index 100% rename from redwood-protocol-widget/src/commonMain/kotlin/app/cash/redwood/protocol/widget/ProtocolMismatchHandler.kt rename to redwood-protocol-host/src/commonMain/kotlin/app/cash/redwood/protocol/widget/ProtocolMismatchHandler.kt diff --git a/redwood-protocol-widget/src/commonMain/kotlin/app/cash/redwood/protocol/widget/ProtocolNode.kt b/redwood-protocol-host/src/commonMain/kotlin/app/cash/redwood/protocol/widget/ProtocolNode.kt similarity index 100% rename from redwood-protocol-widget/src/commonMain/kotlin/app/cash/redwood/protocol/widget/ProtocolNode.kt rename to redwood-protocol-host/src/commonMain/kotlin/app/cash/redwood/protocol/widget/ProtocolNode.kt diff --git a/redwood-protocol-widget/src/commonMain/kotlin/app/cash/redwood/protocol/widget/ProtocolNodeFactory.kt b/redwood-protocol-host/src/commonMain/kotlin/app/cash/redwood/protocol/widget/ProtocolNodeFactory.kt similarity index 100% rename from redwood-protocol-widget/src/commonMain/kotlin/app/cash/redwood/protocol/widget/ProtocolNodeFactory.kt rename to redwood-protocol-host/src/commonMain/kotlin/app/cash/redwood/protocol/widget/ProtocolNodeFactory.kt diff --git a/redwood-protocol-widget/src/commonTest/kotlin/app/cash/redwood/protocol/widget/DurationIsoSerializer.kt b/redwood-protocol-host/src/commonTest/kotlin/app/cash/redwood/protocol/widget/DurationIsoSerializer.kt similarity index 100% rename from redwood-protocol-widget/src/commonTest/kotlin/app/cash/redwood/protocol/widget/DurationIsoSerializer.kt rename to redwood-protocol-host/src/commonTest/kotlin/app/cash/redwood/protocol/widget/DurationIsoSerializer.kt diff --git a/redwood-protocol-widget/src/commonTest/kotlin/app/cash/redwood/protocol/widget/EmptyExampleSchemaWidgetFactory.kt b/redwood-protocol-host/src/commonTest/kotlin/app/cash/redwood/protocol/widget/EmptyExampleSchemaWidgetFactory.kt similarity index 100% rename from redwood-protocol-widget/src/commonTest/kotlin/app/cash/redwood/protocol/widget/EmptyExampleSchemaWidgetFactory.kt rename to redwood-protocol-host/src/commonTest/kotlin/app/cash/redwood/protocol/widget/EmptyExampleSchemaWidgetFactory.kt diff --git a/redwood-protocol-widget/src/commonTest/kotlin/app/cash/redwood/protocol/widget/EmptyRedwoodLayoutWidgetFactory.kt b/redwood-protocol-host/src/commonTest/kotlin/app/cash/redwood/protocol/widget/EmptyRedwoodLayoutWidgetFactory.kt similarity index 100% rename from redwood-protocol-widget/src/commonTest/kotlin/app/cash/redwood/protocol/widget/EmptyRedwoodLayoutWidgetFactory.kt rename to redwood-protocol-host/src/commonTest/kotlin/app/cash/redwood/protocol/widget/EmptyRedwoodLayoutWidgetFactory.kt diff --git a/redwood-protocol-widget/src/commonTest/kotlin/app/cash/redwood/protocol/widget/EmptyRedwoodLazyLayoutWidgetFactory.kt b/redwood-protocol-host/src/commonTest/kotlin/app/cash/redwood/protocol/widget/EmptyRedwoodLazyLayoutWidgetFactory.kt similarity index 100% rename from redwood-protocol-widget/src/commonTest/kotlin/app/cash/redwood/protocol/widget/EmptyRedwoodLazyLayoutWidgetFactory.kt rename to redwood-protocol-host/src/commonTest/kotlin/app/cash/redwood/protocol/widget/EmptyRedwoodLazyLayoutWidgetFactory.kt diff --git a/redwood-protocol-widget/src/commonTest/kotlin/app/cash/redwood/protocol/widget/ProtocolBridgeTest.kt b/redwood-protocol-host/src/commonTest/kotlin/app/cash/redwood/protocol/widget/ProtocolBridgeTest.kt similarity index 100% rename from redwood-protocol-widget/src/commonTest/kotlin/app/cash/redwood/protocol/widget/ProtocolBridgeTest.kt rename to redwood-protocol-host/src/commonTest/kotlin/app/cash/redwood/protocol/widget/ProtocolBridgeTest.kt diff --git a/redwood-protocol-widget/src/commonTest/kotlin/app/cash/redwood/protocol/widget/ProtocolMismatchHandlerTest.kt b/redwood-protocol-host/src/commonTest/kotlin/app/cash/redwood/protocol/widget/ProtocolMismatchHandlerTest.kt similarity index 100% rename from redwood-protocol-widget/src/commonTest/kotlin/app/cash/redwood/protocol/widget/ProtocolMismatchHandlerTest.kt rename to redwood-protocol-host/src/commonTest/kotlin/app/cash/redwood/protocol/widget/ProtocolMismatchHandlerTest.kt diff --git a/redwood-protocol-widget/src/commonTest/kotlin/app/cash/redwood/protocol/widget/ProtocolNodeFactoryTest.kt b/redwood-protocol-host/src/commonTest/kotlin/app/cash/redwood/protocol/widget/ProtocolNodeFactoryTest.kt similarity index 100% rename from redwood-protocol-widget/src/commonTest/kotlin/app/cash/redwood/protocol/widget/ProtocolNodeFactoryTest.kt rename to redwood-protocol-host/src/commonTest/kotlin/app/cash/redwood/protocol/widget/ProtocolNodeFactoryTest.kt diff --git a/redwood-protocol-widget/src/commonTest/kotlin/app/cash/redwood/protocol/widget/RecordingEventSink.kt b/redwood-protocol-host/src/commonTest/kotlin/app/cash/redwood/protocol/widget/RecordingEventSink.kt similarity index 100% rename from redwood-protocol-widget/src/commonTest/kotlin/app/cash/redwood/protocol/widget/RecordingEventSink.kt rename to redwood-protocol-host/src/commonTest/kotlin/app/cash/redwood/protocol/widget/RecordingEventSink.kt diff --git a/redwood-protocol-widget/src/commonTest/kotlin/app/cash/redwood/protocol/widget/RecordingProtocolMismatchHandler.kt b/redwood-protocol-host/src/commonTest/kotlin/app/cash/redwood/protocol/widget/RecordingProtocolMismatchHandler.kt similarity index 100% rename from redwood-protocol-widget/src/commonTest/kotlin/app/cash/redwood/protocol/widget/RecordingProtocolMismatchHandler.kt rename to redwood-protocol-host/src/commonTest/kotlin/app/cash/redwood/protocol/widget/RecordingProtocolMismatchHandler.kt diff --git a/redwood-testing/build.gradle b/redwood-testing/build.gradle index 4b84975739..40b7c716a5 100644 --- 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 index 46426ce27d..22973237b6 100644 --- 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 index 725d525992..485b23b0f3 100644 --- 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 index ba9ea6c9ac..a8a6f629e7 100644 --- 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 index cf74c10e7d..11fa646cc8 100644 --- 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 index 6e9e0c90b6..79dfbfc510 100644 --- 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 } } }