Skip to content

Commit 0f5f07f

Browse files
sanjaypujaresanjaypujare
authored
core, inprocess, util: move inprocess and util code into their own new artifacts grpc-inprocess and grpc-util (grpc#10362)
* core, inprocess, util: move inprocess and util code into their own new artifacts grpc-inprocess and grpc-util
1 parent ac35ab6 commit 0f5f07f

70 files changed

Lines changed: 124 additions & 47 deletions

File tree

Some content is hidden

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

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ subprojects {
271271
requireUpperBoundDepsMatch(configurations.runtimeClasspath, project)
272272
}
273273
}
274-
tasks.named('compileJava').configure {
274+
tasks.named('assemble').configure {
275275
dependsOn checkUpperBoundDeps
276276
}
277277
}

‎core/BUILD.bazel‎

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,8 @@ java_library(
66

77
java_library(
88
name = "inprocess",
9-
srcs = glob([
10-
"src/main/java/io/grpc/inprocess/*.java",
11-
]),
129
visibility = ["//visibility:public"],
13-
deps = [
14-
":internal",
15-
"//api",
16-
"//context",
17-
"@com_google_code_findbugs_jsr305//jar",
18-
"@com_google_errorprone_error_prone_annotations//jar",
19-
"@com_google_guava_guava//jar",
20-
"@com_google_j2objc_j2objc_annotations//jar",
21-
],
10+
exports = ["//inprocess"],
2211
)
2312

2413
java_library(
@@ -47,21 +36,8 @@ java_library(
4736

4837
java_library(
4938
name = "util",
50-
srcs = glob([
51-
"src/main/java/io/grpc/util/*.java",
52-
]),
53-
resources = glob([
54-
"src/bazel-util/resources/**",
55-
]),
5639
visibility = ["//visibility:public"],
57-
deps = [
58-
":internal",
59-
"//api",
60-
"@com_google_code_findbugs_jsr305//jar",
61-
"@com_google_guava_guava//jar",
62-
"@com_google_j2objc_j2objc_annotations//jar",
63-
"@org_codehaus_mojo_animal_sniffer_annotations//jar",
64-
],
40+
exports = ["//util"],
6541
)
6642

6743
# Mirrors the dependencies included in the artifact on Maven Central for usage
@@ -71,9 +47,8 @@ java_library(
7147
name = "core_maven",
7248
visibility = ["//visibility:public"],
7349
exports = [
74-
":inprocess",
7550
":internal",
76-
":util",
7751
"//api",
52+
"//inprocess",
7853
],
7954
)

‎core/build.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ description = 'gRPC: Core'
2323
dependencies {
2424
api project(':grpc-api')
2525
// force dependent jars to depend on latest grpc-context
26-
runtimeOnly project(":grpc-context")
26+
runtimeOnly project(":grpc-context"),
27+
project(":grpc-util") // need grpc-util to pull in round robin
2728
implementation libraries.gson,
2829
libraries.android.annotations,
2930
libraries.animalsniffer.annotations,

‎core/src/main/resources/META-INF/services/io.grpc.LoadBalancerProvider‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
11
io.grpc.internal.PickFirstLoadBalancerProvider
2-
io.grpc.util.SecretRoundRobinLoadBalancerProvider$Provider
3-
io.grpc.util.OutlierDetectionLoadBalancerProvider

‎grpclb/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ java_library(
1414
"//api",
1515
"//context",
1616
"//core:internal",
17-
"//core:util",
17+
"//util",
1818
"//stub",
1919
"@com_google_code_findbugs_jsr305//jar",
2020
"@com_google_guava_guava//jar",

‎grpclb/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ dependencies {
1919
runtimeOnly libraries.errorprone.annotations
2020
compileOnly libraries.javax.annotation
2121
testImplementation libraries.truth,
22+
project(':grpc-inprocess'),
2223
testFixtures(project(':grpc-core'))
2324

2425
signature libraries.signature.java

‎inprocess/BUILD.bazel‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
java_library(
2+
name = "inprocess",
3+
srcs = glob([
4+
"src/main/java/io/grpc/inprocess/*.java",
5+
]),
6+
visibility = ["//visibility:public"],
7+
deps = [
8+
"//core:internal",
9+
"//api",
10+
"//context",
11+
"@com_google_code_findbugs_jsr305//jar",
12+
"@com_google_errorprone_error_prone_annotations//jar",
13+
"@com_google_guava_guava//jar",
14+
"@com_google_j2objc_j2objc_annotations//jar",
15+
],
16+
)

‎inprocess/build.gradle‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
plugins {
2+
id "java-library"
3+
id "maven-publish"
4+
5+
id "ru.vyarus.animalsniffer"
6+
}
7+
8+
description = 'gRPC: Inprocess'
9+
10+
dependencies {
11+
api project(':grpc-core')
12+
13+
implementation libraries.guava
14+
testImplementation project(':grpc-testing'),
15+
testFixtures(project(':grpc-core'))
16+
testImplementation libraries.guava.testlib
17+
18+
signature libraries.signature.java
19+
signature libraries.signature.android
20+
}
21+
22+
tasks.named("javadoc").configure {
23+
exclude 'io/grpc/inprocess/Internal*'
24+
}

core/src/main/java/io/grpc/inprocess/AnonymousInProcessSocketAddress.java renamed to inprocess/src/main/java/io/grpc/inprocess/AnonymousInProcessSocketAddress.java

File renamed without changes.

core/src/main/java/io/grpc/inprocess/InProcessChannelBuilder.java renamed to inprocess/src/main/java/io/grpc/inprocess/InProcessChannelBuilder.java

File renamed without changes.

0 commit comments

Comments
 (0)