Skip to content

Commit c8fdbd7

Browse files
oldergodoldergod
committed
First step removing wire-grpc-server
1 parent 8d1f44d commit c8fdbd7

File tree

55 files changed

+27
-4245
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+27
-4245
lines changed

‎build-support/settings.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ include(":wire-gradle-plugin")
66
project(":wire-gradle-plugin").projectDir = File("../wire-gradle-plugin")
77
include(":wire-grpc-client")
88
project(":wire-grpc-client").projectDir = File("../wire-grpc-client")
9-
include(":wire-grpc-server-generator")
10-
project(":wire-grpc-server-generator").projectDir = File("../wire-grpc-server-generator")
11-
include(":wire-grpc-server")
12-
project(":wire-grpc-server").projectDir = File("../wire-grpc-server")
139
include(":wire-gson-support")
1410
project(":wire-gson-support").projectDir = File("../wire-gson-support")
1511
include(":wire-java-generator")

‎build-support/src/main/kotlin/com/squareup/wire/buildsupport/WireBuildPlugin.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ private val PROJECT_TO_PUBLISH = listOf(
5353
"wire-compiler",
5454
"wire-gradle-plugin",
5555
"wire-grpc-client",
56-
"wire-grpc-server",
57-
"wire-grpc-server-generator",
5856
"wire-gson-support",
5957
"wire-java-generator",
6058
"wire-kotlin-generator",

‎samples/wire-grpc-sample/server-plain/build.gradle.kts

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎samples/wire-grpc-sample/server-plain/src/main/java/com/squareup/wire/whiteboard/WhiteboardCompatImpl.kt

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎samples/wire-grpc-sample/server-plain/src/main/java/com/squareup/wire/whiteboard/WhiteboardImpl.kt

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎samples/wire-grpc-sample/server-plain/src/main/java/com/squareup/wire/whiteboard/WhiteboardServer.kt

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎settings.gradle.kts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ includeBuild("build-support") {
2525
substitute(module("com.squareup.wire:wire-compiler")).using(project(":wire-compiler"))
2626
substitute(module("com.squareup.wire:wire-gradle-plugin")).using(project(":wire-gradle-plugin"))
2727
substitute(module("com.squareup.wire:wire-grpc-client")).using(project(":wire-grpc-client"))
28-
substitute(module("com.squareup.wire:wire-grpc-server")).using(project(":wire-grpc-server"))
29-
substitute(module("com.squareup.wire:wire-grpc-server-generator")).using(project(":wire-grpc-server-generator"))
3028
substitute(module("com.squareup.wire:wire-java-generator")).using(project(":wire-java-generator"))
3129
substitute(module("com.squareup.wire:wire-kotlin-generator")).using(project(":wire-kotlin-generator"))
3230
substitute(module("com.squareup.wire:wire-runtime")).using(project(":wire-runtime"))
@@ -49,8 +47,6 @@ include(":wire-gradle-plugin")
4947
include(":wire-gradle-plugin-playground")
5048
include(":wire-grpc-client")
5149
include(":wire-grpc-mockwebserver")
52-
include(":wire-grpc-server")
53-
include(":wire-grpc-server-generator")
5450
include(":wire-grpc-tests")
5551
include(":wire-gson-support")
5652
include(":wire-java-generator")
@@ -86,4 +82,3 @@ include(":samples:wire-codegen-sample")
8682
include(":samples:wire-grpc-sample:client")
8783
include(":samples:wire-grpc-sample:protos")
8884
include(":samples:wire-grpc-sample:server")
89-
include(":samples:wire-grpc-sample:server-plain")

‎wire-bom/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ dependencies {
1010
api(projects.wireGradlePlugin)
1111
api(projects.wireGrpcClient)
1212
api(projects.wireGrpcClient.group + ":wire-grpc-client-jvm:" + projects.wireGrpcClient.version)
13-
api(projects.wireGrpcServer)
14-
api(projects.wireGrpcServerGenerator)
1513
api(projects.wireGrpcMockwebserver)
1614
api(projects.wireGsonSupport)
1715
api(projects.wireJavaGenerator)

‎wire-compiler/api/wire-compiler.api

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ public final class com/squareup/wire/WireCompiler {
2727
public final fun getKotlinBuildersOnly ()Z
2828
public final fun getKotlinEscapeKeywords ()Z
2929
public final fun getKotlinExclusive ()Z
30-
public final fun getKotlinGrpcServerCompatible ()Z
3130
public final fun getKotlinNameSuffix ()Ljava/lang/String;
3231
public final fun getKotlinOut ()Ljava/lang/String;
3332
public final fun getKotlinRpcCallStyle ()Lcom/squareup/wire/kotlin/RpcCallStyle;
@@ -111,16 +110,15 @@ public final class com/squareup/wire/schema/JavaTarget : com/squareup/wire/schem
111110
}
112111

113112
public final class com/squareup/wire/schema/KotlinTarget : com/squareup/wire/schema/Target {
114-
public fun <init> (Ljava/util/List;Ljava/util/List;ZLjava/lang/String;ZZZZLcom/squareup/wire/kotlin/RpcCallStyle;Lcom/squareup/wire/kotlin/RpcRole;ZIZLjava/lang/String;ZZ)V
115-
public synthetic fun <init> (Ljava/util/List;Ljava/util/List;ZLjava/lang/String;ZZZZLcom/squareup/wire/kotlin/RpcCallStyle;Lcom/squareup/wire/kotlin/RpcRole;ZIZLjava/lang/String;ZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
113+
public fun <init> (Ljava/util/List;Ljava/util/List;ZLjava/lang/String;ZZZZLcom/squareup/wire/kotlin/RpcCallStyle;Lcom/squareup/wire/kotlin/RpcRole;ZILjava/lang/String;ZZ)V
114+
public synthetic fun <init> (Ljava/util/List;Ljava/util/List;ZLjava/lang/String;ZZZZLcom/squareup/wire/kotlin/RpcCallStyle;Lcom/squareup/wire/kotlin/RpcRole;ZILjava/lang/String;ZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
116115
public final fun component1 ()Ljava/util/List;
117116
public final fun component10 ()Lcom/squareup/wire/kotlin/RpcRole;
118117
public final fun component11 ()Z
119118
public final fun component12 ()I
120-
public final fun component13 ()Z
121-
public final fun component14 ()Ljava/lang/String;
119+
public final fun component13 ()Ljava/lang/String;
120+
public final fun component14 ()Z
122121
public final fun component15 ()Z
123-
public final fun component16 ()Z
124122
public final fun component2 ()Ljava/util/List;
125123
public final fun component3 ()Z
126124
public final fun component4 ()Ljava/lang/String;
@@ -129,8 +127,8 @@ public final class com/squareup/wire/schema/KotlinTarget : com/squareup/wire/sch
129127
public final fun component7 ()Z
130128
public final fun component8 ()Z
131129
public final fun component9 ()Lcom/squareup/wire/kotlin/RpcCallStyle;
132-
public final fun copy (Ljava/util/List;Ljava/util/List;ZLjava/lang/String;ZZZZLcom/squareup/wire/kotlin/RpcCallStyle;Lcom/squareup/wire/kotlin/RpcRole;ZIZLjava/lang/String;ZZ)Lcom/squareup/wire/schema/KotlinTarget;
133-
public static synthetic fun copy$default (Lcom/squareup/wire/schema/KotlinTarget;Ljava/util/List;Ljava/util/List;ZLjava/lang/String;ZZZZLcom/squareup/wire/kotlin/RpcCallStyle;Lcom/squareup/wire/kotlin/RpcRole;ZIZLjava/lang/String;ZZILjava/lang/Object;)Lcom/squareup/wire/schema/KotlinTarget;
130+
public final fun copy (Ljava/util/List;Ljava/util/List;ZLjava/lang/String;ZZZZLcom/squareup/wire/kotlin/RpcCallStyle;Lcom/squareup/wire/kotlin/RpcRole;ZILjava/lang/String;ZZ)Lcom/squareup/wire/schema/KotlinTarget;
131+
public static synthetic fun copy$default (Lcom/squareup/wire/schema/KotlinTarget;Ljava/util/List;Ljava/util/List;ZLjava/lang/String;ZZZZLcom/squareup/wire/kotlin/RpcCallStyle;Lcom/squareup/wire/kotlin/RpcRole;ZILjava/lang/String;ZZILjava/lang/Object;)Lcom/squareup/wire/schema/KotlinTarget;
134132
public fun copyTarget (Ljava/util/List;Ljava/util/List;ZLjava/lang/String;)Lcom/squareup/wire/schema/Target;
135133
public fun equals (Ljava/lang/Object;)Z
136134
public final fun getAndroid ()Z
@@ -141,7 +139,6 @@ public final class com/squareup/wire/schema/KotlinTarget : com/squareup/wire/sch
141139
public final fun getEscapeKotlinKeywords ()Z
142140
public fun getExcludes ()Ljava/util/List;
143141
public fun getExclusive ()Z
144-
public final fun getGrpcServerCompatible ()Z
145142
public fun getIncludes ()Ljava/util/List;
146143
public final fun getJavaInterop ()Z
147144
public final fun getNameSuffix ()Ljava/lang/String;

‎wire-compiler/src/main/java/com/squareup/wire/WireCompiler.kt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ class WireCompiler internal constructor(
125125
val kotlinRpcCallStyle: RpcCallStyle,
126126
val kotlinRpcRole: RpcRole,
127127
val kotlinSingleMethodServices: Boolean,
128-
val kotlinGrpcServerCompatible: Boolean,
129128
val kotlinNameSuffix: String?,
130129
val kotlinBuildersOnly: Boolean,
131130
val kotlinEscapeKeywords: Boolean,
@@ -156,7 +155,6 @@ class WireCompiler internal constructor(
156155
rpcRole = kotlinRpcRole,
157156
singleMethodServices = kotlinSingleMethodServices,
158157
boxOneOfsMinSize = kotlinBoxOneOfsMinSize,
159-
grpcServerCompatible = kotlinGrpcServerCompatible,
160158
nameSuffix = kotlinNameSuffix,
161159
buildersOnly = kotlinBuildersOnly,
162160
escapeKotlinKeywords = kotlinEscapeKeywords,
@@ -317,7 +315,6 @@ class WireCompiler internal constructor(
317315
var kotlinRpcCallStyle = RpcCallStyle.SUSPENDING
318316
var kotlinRpcRole = RpcRole.CLIENT
319317
var kotlinSingleMethodServices = false
320-
var kotlinGrpcServerCompatible = false
321318
var kotlinNameSuffix: String? = null
322319
var kotlinBuildersOnly = false
323320
var kotlinEscapeKeywords = false
@@ -404,7 +401,12 @@ class WireCompiler internal constructor(
404401

405402
arg == NO_KOTLIN_EXCLUSIVE -> kotlinExclusive = false
406403
arg == KOTLIN_SINGLE_METHOD_SERVICES -> kotlinSingleMethodServices = true
407-
arg == KOTLIN_GRPC_SERVER_COMPATIBLE -> kotlinGrpcServerCompatible = true
404+
arg == KOTLIN_GRPC_SERVER_COMPATIBLE -> {
405+
throw IllegalArgumentException(
406+
"kotlin_grpc_server_compatible is not long valid.\n" +
407+
"Please migrate following the steps defined in https://square.github.io/wire/wire_grpc/#wire-grpc-server",
408+
)
409+
}
408410
arg == KOTLIN_BUILDERS_ONLY -> kotlinBuildersOnly = true
409411
arg == KOTLIN_ESCAPE_KEYWORDS -> kotlinEscapeKeywords = true
410412
arg == ANDROID -> emitAndroid = true
@@ -459,7 +461,6 @@ class WireCompiler internal constructor(
459461
kotlinRpcCallStyle = kotlinRpcCallStyle,
460462
kotlinRpcRole = kotlinRpcRole,
461463
kotlinSingleMethodServices = kotlinSingleMethodServices,
462-
kotlinGrpcServerCompatible = kotlinGrpcServerCompatible,
463464
kotlinNameSuffix = kotlinNameSuffix,
464465
kotlinBuildersOnly = kotlinBuildersOnly,
465466
kotlinEscapeKeywords = kotlinEscapeKeywords,

0 commit comments

Comments
 (0)