From 3cc62fcf013fdf0793e0c2c75fd97fe3a45cff20 Mon Sep 17 00:00:00 2001 From: Benoit Quenaudon Date: Fri, 19 Jan 2024 12:06:25 +0000 Subject: [PATCH] Renamed modules without the 'wire-grpc-' prefix' --- README.md | 2 +- build-support/settings.gradle.kts | 5 ----- .../buildsupport/WireGrpcServerBuildPlugin.kt | 4 ++-- samples/wire-grpc-sample/server-plain/build.gradle.kts | 2 +- {wire-grpc-server-generator => server-generator}/README.md | 0 .../api/wire-grpc-server-generator.api | 0 .../build.gradle.kts | 2 +- .../wire/kotlin/grpcserver/BindableAdapterGenerator.kt | 0 .../wire/kotlin/grpcserver/BlockingStubGenerator.kt | 0 .../squareup/wire/kotlin/grpcserver/ClassNameGenerator.kt | 0 .../wire/kotlin/grpcserver/FileDescriptorGenerator.kt | 0 .../squareup/wire/kotlin/grpcserver/ImplBaseGenerator.kt | 0 .../squareup/wire/kotlin/grpcserver/KotlinGrpcGenerator.kt | 0 .../wire/kotlin/grpcserver/MethodDescriptorGenerator.kt | 0 .../com/squareup/wire/kotlin/grpcserver/SchemaHandler.kt | 0 .../wire/kotlin/grpcserver/ServiceDescriptorGenerator.kt | 0 .../com/squareup/wire/kotlin/grpcserver/StubGenerator.kt | 0 .../src/test/golden/BindableAdapter.kt | 0 .../src/test/golden/ImplBase.kt | 0 .../src/test/golden/MethodDescriptor.kt | 0 .../src/test/golden/RouteGuideWireGrpc.kt | 0 .../src/test/golden/ServiceDescriptor.kt | 0 .../src/test/golden/Stub.kt | 0 .../src/test/golden/nonSingleMethodService.kt | 0 .../src/test/golden/singleMethodService.kt | 0 .../src/test/golden/unitService.kt | 0 .../squareup/wire/kotlin/grpcserver/BindableAdapterTest.kt | 0 .../wire/kotlin/grpcserver/FileDescriptorGeneratorTest.kt | 0 .../com/squareup/wire/kotlin/grpcserver/GoldenTestUtils.kt | 0 .../squareup/wire/kotlin/grpcserver/GrpcGeneratorHelpers.kt | 0 .../com/squareup/wire/kotlin/grpcserver/ImplBaseTest.kt | 0 .../wire/kotlin/grpcserver/KotlinGrpcGeneratorTest.kt | 0 .../squareup/wire/kotlin/grpcserver/MethodDescriptorTest.kt | 0 .../wire/kotlin/grpcserver/ServiceDescriptorTest.kt | 0 .../java/com/squareup/wire/kotlin/grpcserver/StubTest.kt | 0 .../test/java/com/squareup/wire/kotlin/grpcserver/Utils.kt | 0 .../src/test/proto/RouteGuideProto.proto | 0 {wire-grpc-server => server}/api/wire-grpc-server.api | 0 {wire-grpc-server => server}/build.gradle.kts | 0 .../java/com/squareup/wire/kotlin/grpcserver/FlowAdapter.kt | 0 .../squareup/wire/kotlin/grpcserver/MessageSinkAdapter.kt | 0 .../squareup/wire/kotlin/grpcserver/MessageSourceAdapter.kt | 0 .../squareup/wire/kotlin/grpcserver/WireBindableService.kt | 0 .../squareup/wire/kotlin/grpcserver/WireMethodMarshaller.kt | 0 settings.gradle.kts | 6 ++---- wire-grpc-server/README.md | 4 ---- 46 files changed, 7 insertions(+), 18 deletions(-) rename {wire-grpc-server-generator => server-generator}/README.md (100%) rename {wire-grpc-server-generator => server-generator}/api/wire-grpc-server-generator.api (100%) rename {wire-grpc-server-generator => server-generator}/build.gradle.kts (92%) rename {wire-grpc-server-generator => server-generator}/src/main/java/com/squareup/wire/kotlin/grpcserver/BindableAdapterGenerator.kt (100%) rename {wire-grpc-server-generator => server-generator}/src/main/java/com/squareup/wire/kotlin/grpcserver/BlockingStubGenerator.kt (100%) rename {wire-grpc-server-generator => server-generator}/src/main/java/com/squareup/wire/kotlin/grpcserver/ClassNameGenerator.kt (100%) rename {wire-grpc-server-generator => server-generator}/src/main/java/com/squareup/wire/kotlin/grpcserver/FileDescriptorGenerator.kt (100%) rename {wire-grpc-server-generator => server-generator}/src/main/java/com/squareup/wire/kotlin/grpcserver/ImplBaseGenerator.kt (100%) rename {wire-grpc-server-generator => server-generator}/src/main/java/com/squareup/wire/kotlin/grpcserver/KotlinGrpcGenerator.kt (100%) rename {wire-grpc-server-generator => server-generator}/src/main/java/com/squareup/wire/kotlin/grpcserver/MethodDescriptorGenerator.kt (100%) rename {wire-grpc-server-generator => server-generator}/src/main/java/com/squareup/wire/kotlin/grpcserver/SchemaHandler.kt (100%) rename {wire-grpc-server-generator => server-generator}/src/main/java/com/squareup/wire/kotlin/grpcserver/ServiceDescriptorGenerator.kt (100%) rename {wire-grpc-server-generator => server-generator}/src/main/java/com/squareup/wire/kotlin/grpcserver/StubGenerator.kt (100%) rename {wire-grpc-server-generator => server-generator}/src/test/golden/BindableAdapter.kt (100%) rename {wire-grpc-server-generator => server-generator}/src/test/golden/ImplBase.kt (100%) rename {wire-grpc-server-generator => server-generator}/src/test/golden/MethodDescriptor.kt (100%) rename {wire-grpc-server-generator => server-generator}/src/test/golden/RouteGuideWireGrpc.kt (100%) rename {wire-grpc-server-generator => server-generator}/src/test/golden/ServiceDescriptor.kt (100%) rename {wire-grpc-server-generator => server-generator}/src/test/golden/Stub.kt (100%) rename {wire-grpc-server-generator => server-generator}/src/test/golden/nonSingleMethodService.kt (100%) rename {wire-grpc-server-generator => server-generator}/src/test/golden/singleMethodService.kt (100%) rename {wire-grpc-server-generator => server-generator}/src/test/golden/unitService.kt (100%) rename {wire-grpc-server-generator => server-generator}/src/test/java/com/squareup/wire/kotlin/grpcserver/BindableAdapterTest.kt (100%) rename {wire-grpc-server-generator => server-generator}/src/test/java/com/squareup/wire/kotlin/grpcserver/FileDescriptorGeneratorTest.kt (100%) rename {wire-grpc-server-generator => server-generator}/src/test/java/com/squareup/wire/kotlin/grpcserver/GoldenTestUtils.kt (100%) rename {wire-grpc-server-generator => server-generator}/src/test/java/com/squareup/wire/kotlin/grpcserver/GrpcGeneratorHelpers.kt (100%) rename {wire-grpc-server-generator => server-generator}/src/test/java/com/squareup/wire/kotlin/grpcserver/ImplBaseTest.kt (100%) rename {wire-grpc-server-generator => server-generator}/src/test/java/com/squareup/wire/kotlin/grpcserver/KotlinGrpcGeneratorTest.kt (100%) rename {wire-grpc-server-generator => server-generator}/src/test/java/com/squareup/wire/kotlin/grpcserver/MethodDescriptorTest.kt (100%) rename {wire-grpc-server-generator => server-generator}/src/test/java/com/squareup/wire/kotlin/grpcserver/ServiceDescriptorTest.kt (100%) rename {wire-grpc-server-generator => server-generator}/src/test/java/com/squareup/wire/kotlin/grpcserver/StubTest.kt (100%) rename {wire-grpc-server-generator => server-generator}/src/test/java/com/squareup/wire/kotlin/grpcserver/Utils.kt (100%) rename {wire-grpc-server-generator => server-generator}/src/test/proto/RouteGuideProto.proto (100%) rename {wire-grpc-server => server}/api/wire-grpc-server.api (100%) rename {wire-grpc-server => server}/build.gradle.kts (100%) rename {wire-grpc-server => server}/src/main/java/com/squareup/wire/kotlin/grpcserver/FlowAdapter.kt (100%) rename {wire-grpc-server => server}/src/main/java/com/squareup/wire/kotlin/grpcserver/MessageSinkAdapter.kt (100%) rename {wire-grpc-server => server}/src/main/java/com/squareup/wire/kotlin/grpcserver/MessageSourceAdapter.kt (100%) rename {wire-grpc-server => server}/src/main/java/com/squareup/wire/kotlin/grpcserver/WireBindableService.kt (100%) rename {wire-grpc-server => server}/src/main/java/com/squareup/wire/kotlin/grpcserver/WireMethodMarshaller.kt (100%) delete mode 100644 wire-grpc-server/README.md diff --git a/README.md b/README.md index 9c99f6c..9a9d179 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,6 @@ Wire gRPC Server ==== Compatibility classes to make wire-generated services work with grpc server. Currently used -alongside `wire-grpc-server-generator`. +alongside `server-generator`. This feature is experimental. diff --git a/build-support/settings.gradle.kts b/build-support/settings.gradle.kts index b5d23dc..8e07514 100644 --- a/build-support/settings.gradle.kts +++ b/build-support/settings.gradle.kts @@ -1,10 +1,5 @@ rootProject.name = "build-support" -include(":wire-grpc-server-generator") -project(":wire-grpc-server-generator").projectDir = File("../wire-grpc-server-generator") -include(":wire-grpc-server") -project(":wire-grpc-server").projectDir = File("../wire-grpc-server") - dependencyResolutionManagement { versionCatalogs { create("libs").from(files("../gradle/libs.versions.toml")) diff --git a/build-support/src/main/kotlin/com/squareup/wiregrpcserver/buildsupport/WireGrpcServerBuildPlugin.kt b/build-support/src/main/kotlin/com/squareup/wiregrpcserver/buildsupport/WireGrpcServerBuildPlugin.kt index d74c5bb..fc3923f 100644 --- a/build-support/src/main/kotlin/com/squareup/wiregrpcserver/buildsupport/WireGrpcServerBuildPlugin.kt +++ b/build-support/src/main/kotlin/com/squareup/wiregrpcserver/buildsupport/WireGrpcServerBuildPlugin.kt @@ -49,8 +49,8 @@ private lateinit var wireVersion: String // I cannot get the wireGrpcServerBuild extension to work in projects included via `includeBuild` within // `build-support`, so doing it here for now :sad: private val PROJECT_TO_PUBLISH = listOf( - "wire-grpc-server", - "wire-grpc-server-generator", + "server", + "server-generator", ) @Suppress("unused") // Invoked reflectively by Gradle. diff --git a/samples/wire-grpc-sample/server-plain/build.gradle.kts b/samples/wire-grpc-sample/server-plain/build.gradle.kts index 88605f2..f366b08 100644 --- a/samples/wire-grpc-sample/server-plain/build.gradle.kts +++ b/samples/wire-grpc-sample/server-plain/build.gradle.kts @@ -22,7 +22,7 @@ wire { dependencies { implementation(projects.samples.wireGrpcSample.protos) - implementation(projects.wireGrpcServer) + implementation(projects.server) implementation(libs.wire.runtime) implementation(libs.grpc.netty) implementation(libs.grpc.stub) diff --git a/wire-grpc-server-generator/README.md b/server-generator/README.md similarity index 100% rename from wire-grpc-server-generator/README.md rename to server-generator/README.md diff --git a/wire-grpc-server-generator/api/wire-grpc-server-generator.api b/server-generator/api/wire-grpc-server-generator.api similarity index 100% rename from wire-grpc-server-generator/api/wire-grpc-server-generator.api rename to server-generator/api/wire-grpc-server-generator.api diff --git a/wire-grpc-server-generator/build.gradle.kts b/server-generator/build.gradle.kts similarity index 92% rename from wire-grpc-server-generator/build.gradle.kts rename to server-generator/build.gradle.kts index e3eee50..ba04cbc 100644 --- a/wire-grpc-server-generator/build.gradle.kts +++ b/server-generator/build.gradle.kts @@ -12,7 +12,7 @@ dependencies { implementation(libs.okio.core) api(libs.kotlinpoet) api(libs.protobuf.java) - implementation(projects.wireGrpcServer) + implementation(projects.server) testImplementation(libs.wire.schemaHandlerTests) testImplementation(libs.kotlin.test.junit) testImplementation(libs.truth) diff --git a/wire-grpc-server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/BindableAdapterGenerator.kt b/server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/BindableAdapterGenerator.kt similarity index 100% rename from wire-grpc-server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/BindableAdapterGenerator.kt rename to server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/BindableAdapterGenerator.kt diff --git a/wire-grpc-server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/BlockingStubGenerator.kt b/server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/BlockingStubGenerator.kt similarity index 100% rename from wire-grpc-server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/BlockingStubGenerator.kt rename to server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/BlockingStubGenerator.kt diff --git a/wire-grpc-server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/ClassNameGenerator.kt b/server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/ClassNameGenerator.kt similarity index 100% rename from wire-grpc-server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/ClassNameGenerator.kt rename to server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/ClassNameGenerator.kt diff --git a/wire-grpc-server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/FileDescriptorGenerator.kt b/server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/FileDescriptorGenerator.kt similarity index 100% rename from wire-grpc-server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/FileDescriptorGenerator.kt rename to server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/FileDescriptorGenerator.kt diff --git a/wire-grpc-server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/ImplBaseGenerator.kt b/server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/ImplBaseGenerator.kt similarity index 100% rename from wire-grpc-server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/ImplBaseGenerator.kt rename to server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/ImplBaseGenerator.kt diff --git a/wire-grpc-server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/KotlinGrpcGenerator.kt b/server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/KotlinGrpcGenerator.kt similarity index 100% rename from wire-grpc-server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/KotlinGrpcGenerator.kt rename to server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/KotlinGrpcGenerator.kt diff --git a/wire-grpc-server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/MethodDescriptorGenerator.kt b/server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/MethodDescriptorGenerator.kt similarity index 100% rename from wire-grpc-server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/MethodDescriptorGenerator.kt rename to server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/MethodDescriptorGenerator.kt diff --git a/wire-grpc-server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/SchemaHandler.kt b/server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/SchemaHandler.kt similarity index 100% rename from wire-grpc-server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/SchemaHandler.kt rename to server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/SchemaHandler.kt diff --git a/wire-grpc-server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/ServiceDescriptorGenerator.kt b/server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/ServiceDescriptorGenerator.kt similarity index 100% rename from wire-grpc-server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/ServiceDescriptorGenerator.kt rename to server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/ServiceDescriptorGenerator.kt diff --git a/wire-grpc-server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/StubGenerator.kt b/server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/StubGenerator.kt similarity index 100% rename from wire-grpc-server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/StubGenerator.kt rename to server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/StubGenerator.kt diff --git a/wire-grpc-server-generator/src/test/golden/BindableAdapter.kt b/server-generator/src/test/golden/BindableAdapter.kt similarity index 100% rename from wire-grpc-server-generator/src/test/golden/BindableAdapter.kt rename to server-generator/src/test/golden/BindableAdapter.kt diff --git a/wire-grpc-server-generator/src/test/golden/ImplBase.kt b/server-generator/src/test/golden/ImplBase.kt similarity index 100% rename from wire-grpc-server-generator/src/test/golden/ImplBase.kt rename to server-generator/src/test/golden/ImplBase.kt diff --git a/wire-grpc-server-generator/src/test/golden/MethodDescriptor.kt b/server-generator/src/test/golden/MethodDescriptor.kt similarity index 100% rename from wire-grpc-server-generator/src/test/golden/MethodDescriptor.kt rename to server-generator/src/test/golden/MethodDescriptor.kt diff --git a/wire-grpc-server-generator/src/test/golden/RouteGuideWireGrpc.kt b/server-generator/src/test/golden/RouteGuideWireGrpc.kt similarity index 100% rename from wire-grpc-server-generator/src/test/golden/RouteGuideWireGrpc.kt rename to server-generator/src/test/golden/RouteGuideWireGrpc.kt diff --git a/wire-grpc-server-generator/src/test/golden/ServiceDescriptor.kt b/server-generator/src/test/golden/ServiceDescriptor.kt similarity index 100% rename from wire-grpc-server-generator/src/test/golden/ServiceDescriptor.kt rename to server-generator/src/test/golden/ServiceDescriptor.kt diff --git a/wire-grpc-server-generator/src/test/golden/Stub.kt b/server-generator/src/test/golden/Stub.kt similarity index 100% rename from wire-grpc-server-generator/src/test/golden/Stub.kt rename to server-generator/src/test/golden/Stub.kt diff --git a/wire-grpc-server-generator/src/test/golden/nonSingleMethodService.kt b/server-generator/src/test/golden/nonSingleMethodService.kt similarity index 100% rename from wire-grpc-server-generator/src/test/golden/nonSingleMethodService.kt rename to server-generator/src/test/golden/nonSingleMethodService.kt diff --git a/wire-grpc-server-generator/src/test/golden/singleMethodService.kt b/server-generator/src/test/golden/singleMethodService.kt similarity index 100% rename from wire-grpc-server-generator/src/test/golden/singleMethodService.kt rename to server-generator/src/test/golden/singleMethodService.kt diff --git a/wire-grpc-server-generator/src/test/golden/unitService.kt b/server-generator/src/test/golden/unitService.kt similarity index 100% rename from wire-grpc-server-generator/src/test/golden/unitService.kt rename to server-generator/src/test/golden/unitService.kt diff --git a/wire-grpc-server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/BindableAdapterTest.kt b/server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/BindableAdapterTest.kt similarity index 100% rename from wire-grpc-server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/BindableAdapterTest.kt rename to server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/BindableAdapterTest.kt diff --git a/wire-grpc-server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/FileDescriptorGeneratorTest.kt b/server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/FileDescriptorGeneratorTest.kt similarity index 100% rename from wire-grpc-server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/FileDescriptorGeneratorTest.kt rename to server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/FileDescriptorGeneratorTest.kt diff --git a/wire-grpc-server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/GoldenTestUtils.kt b/server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/GoldenTestUtils.kt similarity index 100% rename from wire-grpc-server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/GoldenTestUtils.kt rename to server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/GoldenTestUtils.kt diff --git a/wire-grpc-server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/GrpcGeneratorHelpers.kt b/server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/GrpcGeneratorHelpers.kt similarity index 100% rename from wire-grpc-server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/GrpcGeneratorHelpers.kt rename to server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/GrpcGeneratorHelpers.kt diff --git a/wire-grpc-server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/ImplBaseTest.kt b/server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/ImplBaseTest.kt similarity index 100% rename from wire-grpc-server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/ImplBaseTest.kt rename to server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/ImplBaseTest.kt diff --git a/wire-grpc-server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/KotlinGrpcGeneratorTest.kt b/server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/KotlinGrpcGeneratorTest.kt similarity index 100% rename from wire-grpc-server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/KotlinGrpcGeneratorTest.kt rename to server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/KotlinGrpcGeneratorTest.kt diff --git a/wire-grpc-server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/MethodDescriptorTest.kt b/server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/MethodDescriptorTest.kt similarity index 100% rename from wire-grpc-server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/MethodDescriptorTest.kt rename to server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/MethodDescriptorTest.kt diff --git a/wire-grpc-server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/ServiceDescriptorTest.kt b/server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/ServiceDescriptorTest.kt similarity index 100% rename from wire-grpc-server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/ServiceDescriptorTest.kt rename to server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/ServiceDescriptorTest.kt diff --git a/wire-grpc-server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/StubTest.kt b/server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/StubTest.kt similarity index 100% rename from wire-grpc-server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/StubTest.kt rename to server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/StubTest.kt diff --git a/wire-grpc-server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/Utils.kt b/server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/Utils.kt similarity index 100% rename from wire-grpc-server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/Utils.kt rename to server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/Utils.kt diff --git a/wire-grpc-server-generator/src/test/proto/RouteGuideProto.proto b/server-generator/src/test/proto/RouteGuideProto.proto similarity index 100% rename from wire-grpc-server-generator/src/test/proto/RouteGuideProto.proto rename to server-generator/src/test/proto/RouteGuideProto.proto diff --git a/wire-grpc-server/api/wire-grpc-server.api b/server/api/wire-grpc-server.api similarity index 100% rename from wire-grpc-server/api/wire-grpc-server.api rename to server/api/wire-grpc-server.api diff --git a/wire-grpc-server/build.gradle.kts b/server/build.gradle.kts similarity index 100% rename from wire-grpc-server/build.gradle.kts rename to server/build.gradle.kts diff --git a/wire-grpc-server/src/main/java/com/squareup/wire/kotlin/grpcserver/FlowAdapter.kt b/server/src/main/java/com/squareup/wire/kotlin/grpcserver/FlowAdapter.kt similarity index 100% rename from wire-grpc-server/src/main/java/com/squareup/wire/kotlin/grpcserver/FlowAdapter.kt rename to server/src/main/java/com/squareup/wire/kotlin/grpcserver/FlowAdapter.kt diff --git a/wire-grpc-server/src/main/java/com/squareup/wire/kotlin/grpcserver/MessageSinkAdapter.kt b/server/src/main/java/com/squareup/wire/kotlin/grpcserver/MessageSinkAdapter.kt similarity index 100% rename from wire-grpc-server/src/main/java/com/squareup/wire/kotlin/grpcserver/MessageSinkAdapter.kt rename to server/src/main/java/com/squareup/wire/kotlin/grpcserver/MessageSinkAdapter.kt diff --git a/wire-grpc-server/src/main/java/com/squareup/wire/kotlin/grpcserver/MessageSourceAdapter.kt b/server/src/main/java/com/squareup/wire/kotlin/grpcserver/MessageSourceAdapter.kt similarity index 100% rename from wire-grpc-server/src/main/java/com/squareup/wire/kotlin/grpcserver/MessageSourceAdapter.kt rename to server/src/main/java/com/squareup/wire/kotlin/grpcserver/MessageSourceAdapter.kt diff --git a/wire-grpc-server/src/main/java/com/squareup/wire/kotlin/grpcserver/WireBindableService.kt b/server/src/main/java/com/squareup/wire/kotlin/grpcserver/WireBindableService.kt similarity index 100% rename from wire-grpc-server/src/main/java/com/squareup/wire/kotlin/grpcserver/WireBindableService.kt rename to server/src/main/java/com/squareup/wire/kotlin/grpcserver/WireBindableService.kt diff --git a/wire-grpc-server/src/main/java/com/squareup/wire/kotlin/grpcserver/WireMethodMarshaller.kt b/server/src/main/java/com/squareup/wire/kotlin/grpcserver/WireMethodMarshaller.kt similarity index 100% rename from wire-grpc-server/src/main/java/com/squareup/wire/kotlin/grpcserver/WireMethodMarshaller.kt rename to server/src/main/java/com/squareup/wire/kotlin/grpcserver/WireMethodMarshaller.kt diff --git a/settings.gradle.kts b/settings.gradle.kts index dca6a40..e4e9563 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -24,14 +24,12 @@ dependencyResolutionManagement { includeBuild("build-support") { dependencySubstitution { substitute(module("com.squareup.wiregrpcserver.build:gradle-plugin")).using(project(":")) - substitute(module("com.squareup.wire:wire-grpc-server")).using(project(":wire-grpc-server")) - substitute(module("com.squareup.wire:wire-grpc-server-generator")).using(project(":wire-grpc-server-generator")) } } enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") -include(":wire-grpc-server") -include(":wire-grpc-server-generator") +include(":server") +include(":server-generator") include(":samples:wire-grpc-sample:protos") include(":samples:wire-grpc-sample:server-plain") diff --git a/wire-grpc-server/README.md b/wire-grpc-server/README.md deleted file mode 100644 index 1293f9d..0000000 --- a/wire-grpc-server/README.md +++ /dev/null @@ -1,4 +0,0 @@ -Compatibility classes to make wire-generated services work with grpc server. Currently used -alongside `wire-grpc-server-generator`. - -This feature is experimental.