Renamed modules without the 'wire-grpc-' prefix'

square · Jan 19, 2024 · 3cc62fc · 3cc62fc
1 parent a7fe71e
commit 3cc62fc
Show file tree

Hide file tree

Showing 46 changed files with 7 additions and 18 deletions.
diff --git 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
@@ -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/...ort/src/main/kotlin/com/squareup/wiregrpcserver/buildsupport/WireGrpcServerBuildPlugin.kt b/...ort/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
@@ -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 → server-generator/README.md b/wire-grpc-server-generator/README.md → server-generator/README.md
diff --git a/...erator/api/wire-grpc-server-generator.api → ...erator/api/wire-grpc-server-generator.api b/...erator/api/wire-grpc-server-generator.api → ...erator/api/wire-grpc-server-generator.api
diff --git a/wire-grpc-server-generator/build.gradle.kts → server-generator/build.gradle.kts b/wire-grpc-server-generator/build.gradle.kts → 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/...in/grpcserver/BindableAdapterGenerator.kt → ...in/grpcserver/BindableAdapterGenerator.kt b/...in/grpcserver/BindableAdapterGenerator.kt → ...in/grpcserver/BindableAdapterGenerator.kt
diff --git a/...otlin/grpcserver/BlockingStubGenerator.kt → ...otlin/grpcserver/BlockingStubGenerator.kt b/...otlin/grpcserver/BlockingStubGenerator.kt → ...otlin/grpcserver/BlockingStubGenerator.kt
diff --git a/...e/kotlin/grpcserver/ClassNameGenerator.kt → ...e/kotlin/grpcserver/ClassNameGenerator.kt b/...e/kotlin/grpcserver/ClassNameGenerator.kt → ...e/kotlin/grpcserver/ClassNameGenerator.kt
diff --git a/...lin/grpcserver/FileDescriptorGenerator.kt → ...lin/grpcserver/FileDescriptorGenerator.kt b/...lin/grpcserver/FileDescriptorGenerator.kt → ...lin/grpcserver/FileDescriptorGenerator.kt
diff --git a/...re/kotlin/grpcserver/ImplBaseGenerator.kt → ...re/kotlin/grpcserver/ImplBaseGenerator.kt b/...re/kotlin/grpcserver/ImplBaseGenerator.kt → ...re/kotlin/grpcserver/ImplBaseGenerator.kt
diff --git a/.../kotlin/grpcserver/KotlinGrpcGenerator.kt → .../kotlin/grpcserver/KotlinGrpcGenerator.kt b/.../kotlin/grpcserver/KotlinGrpcGenerator.kt → .../kotlin/grpcserver/KotlinGrpcGenerator.kt
diff --git a/...n/grpcserver/MethodDescriptorGenerator.kt → ...n/grpcserver/MethodDescriptorGenerator.kt b/...n/grpcserver/MethodDescriptorGenerator.kt → ...n/grpcserver/MethodDescriptorGenerator.kt
diff --git a/...p/wire/kotlin/grpcserver/SchemaHandler.kt → ...p/wire/kotlin/grpcserver/SchemaHandler.kt b/...p/wire/kotlin/grpcserver/SchemaHandler.kt → ...p/wire/kotlin/grpcserver/SchemaHandler.kt
diff --git a/.../grpcserver/ServiceDescriptorGenerator.kt → .../grpcserver/ServiceDescriptorGenerator.kt b/.../grpcserver/ServiceDescriptorGenerator.kt → .../grpcserver/ServiceDescriptorGenerator.kt
diff --git a/...p/wire/kotlin/grpcserver/StubGenerator.kt → ...p/wire/kotlin/grpcserver/StubGenerator.kt b/...p/wire/kotlin/grpcserver/StubGenerator.kt → ...p/wire/kotlin/grpcserver/StubGenerator.kt
diff --git a/...erator/src/test/golden/BindableAdapter.kt → ...erator/src/test/golden/BindableAdapter.kt b/...erator/src/test/golden/BindableAdapter.kt → ...erator/src/test/golden/BindableAdapter.kt
diff --git a/...ver-generator/src/test/golden/ImplBase.kt → server-generator/src/test/golden/ImplBase.kt b/...ver-generator/src/test/golden/ImplBase.kt → server-generator/src/test/golden/ImplBase.kt
diff --git a/...rator/src/test/golden/MethodDescriptor.kt → ...rator/src/test/golden/MethodDescriptor.kt b/...rator/src/test/golden/MethodDescriptor.kt → ...rator/src/test/golden/MethodDescriptor.kt
diff --git a/...tor/src/test/golden/RouteGuideWireGrpc.kt → ...tor/src/test/golden/RouteGuideWireGrpc.kt b/...tor/src/test/golden/RouteGuideWireGrpc.kt → ...tor/src/test/golden/RouteGuideWireGrpc.kt
diff --git a/...ator/src/test/golden/ServiceDescriptor.kt → ...ator/src/test/golden/ServiceDescriptor.kt b/...ator/src/test/golden/ServiceDescriptor.kt → ...ator/src/test/golden/ServiceDescriptor.kt
diff --git a/...-server-generator/src/test/golden/Stub.kt → server-generator/src/test/golden/Stub.kt b/...-server-generator/src/test/golden/Stub.kt → server-generator/src/test/golden/Stub.kt
diff --git a/...src/test/golden/nonSingleMethodService.kt → ...src/test/golden/nonSingleMethodService.kt b/...src/test/golden/nonSingleMethodService.kt → ...src/test/golden/nonSingleMethodService.kt
diff --git a/...or/src/test/golden/singleMethodService.kt → ...or/src/test/golden/singleMethodService.kt b/...or/src/test/golden/singleMethodService.kt → ...or/src/test/golden/singleMethodService.kt
diff --git a/...-generator/src/test/golden/unitService.kt → ...-generator/src/test/golden/unitService.kt b/...-generator/src/test/golden/unitService.kt → ...-generator/src/test/golden/unitService.kt
diff --git a/.../kotlin/grpcserver/BindableAdapterTest.kt → .../kotlin/grpcserver/BindableAdapterTest.kt b/.../kotlin/grpcserver/BindableAdapterTest.kt → .../kotlin/grpcserver/BindableAdapterTest.kt
diff --git a/...grpcserver/FileDescriptorGeneratorTest.kt → ...grpcserver/FileDescriptorGeneratorTest.kt b/...grpcserver/FileDescriptorGeneratorTest.kt → ...grpcserver/FileDescriptorGeneratorTest.kt
diff --git a/...wire/kotlin/grpcserver/GoldenTestUtils.kt → ...wire/kotlin/grpcserver/GoldenTestUtils.kt b/...wire/kotlin/grpcserver/GoldenTestUtils.kt → ...wire/kotlin/grpcserver/GoldenTestUtils.kt
diff --git a/...kotlin/grpcserver/GrpcGeneratorHelpers.kt → ...kotlin/grpcserver/GrpcGeneratorHelpers.kt b/...kotlin/grpcserver/GrpcGeneratorHelpers.kt → ...kotlin/grpcserver/GrpcGeneratorHelpers.kt
diff --git a/...up/wire/kotlin/grpcserver/ImplBaseTest.kt → ...up/wire/kotlin/grpcserver/ImplBaseTest.kt b/...up/wire/kotlin/grpcserver/ImplBaseTest.kt → ...up/wire/kotlin/grpcserver/ImplBaseTest.kt
diff --git a/...lin/grpcserver/KotlinGrpcGeneratorTest.kt → ...lin/grpcserver/KotlinGrpcGeneratorTest.kt b/...lin/grpcserver/KotlinGrpcGeneratorTest.kt → ...lin/grpcserver/KotlinGrpcGeneratorTest.kt
diff --git a/...kotlin/grpcserver/MethodDescriptorTest.kt → ...kotlin/grpcserver/MethodDescriptorTest.kt b/...kotlin/grpcserver/MethodDescriptorTest.kt → ...kotlin/grpcserver/MethodDescriptorTest.kt
diff --git a/...otlin/grpcserver/ServiceDescriptorTest.kt → ...otlin/grpcserver/ServiceDescriptorTest.kt b/...otlin/grpcserver/ServiceDescriptorTest.kt → ...otlin/grpcserver/ServiceDescriptorTest.kt
diff --git a/...uareup/wire/kotlin/grpcserver/StubTest.kt → ...uareup/wire/kotlin/grpcserver/StubTest.kt b/...uareup/wire/kotlin/grpcserver/StubTest.kt → ...uareup/wire/kotlin/grpcserver/StubTest.kt
diff --git a/.../squareup/wire/kotlin/grpcserver/Utils.kt → .../squareup/wire/kotlin/grpcserver/Utils.kt b/.../squareup/wire/kotlin/grpcserver/Utils.kt → .../squareup/wire/kotlin/grpcserver/Utils.kt
diff --git a/...ator/src/test/proto/RouteGuideProto.proto → ...ator/src/test/proto/RouteGuideProto.proto b/...ator/src/test/proto/RouteGuideProto.proto → ...ator/src/test/proto/RouteGuideProto.proto
diff --git a/wire-grpc-server/api/wire-grpc-server.api → server/api/wire-grpc-server.api b/wire-grpc-server/api/wire-grpc-server.api → server/api/wire-grpc-server.api
diff --git a/wire-grpc-server/build.gradle.kts → server/build.gradle.kts b/wire-grpc-server/build.gradle.kts → server/build.gradle.kts
diff --git a/...eup/wire/kotlin/grpcserver/FlowAdapter.kt → ...eup/wire/kotlin/grpcserver/FlowAdapter.kt b/...eup/wire/kotlin/grpcserver/FlowAdapter.kt → ...eup/wire/kotlin/grpcserver/FlowAdapter.kt
diff --git a/...e/kotlin/grpcserver/MessageSinkAdapter.kt → ...e/kotlin/grpcserver/MessageSinkAdapter.kt b/...e/kotlin/grpcserver/MessageSinkAdapter.kt → ...e/kotlin/grpcserver/MessageSinkAdapter.kt
diff --git a/...kotlin/grpcserver/MessageSourceAdapter.kt → ...kotlin/grpcserver/MessageSourceAdapter.kt b/...kotlin/grpcserver/MessageSourceAdapter.kt → ...kotlin/grpcserver/MessageSourceAdapter.kt
diff --git a/.../kotlin/grpcserver/WireBindableService.kt → .../kotlin/grpcserver/WireBindableService.kt b/.../kotlin/grpcserver/WireBindableService.kt → .../kotlin/grpcserver/WireBindableService.kt
diff --git a/...kotlin/grpcserver/WireMethodMarshaller.kt → ...kotlin/grpcserver/WireMethodMarshaller.kt b/...kotlin/grpcserver/WireMethodMarshaller.kt → ...kotlin/grpcserver/WireMethodMarshaller.kt
diff --git 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