Skip to content

Commit 49786af

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents 3350be4 + 0e8ae30 commit 49786af

30 files changed

Lines changed: 4701 additions & 191 deletions

File tree

‎MODULE.bazel‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,20 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
2525
"dev.cel:common:0.13.1",
2626
"com.squareup.okhttp:okhttp:2.7.5",
2727
"com.squareup.okio:okio:2.10.0", # 3.0+ needs swapping to -jvm; need work to avoid flag-day
28-
"io.netty:netty-buffer:4.2.16.Final",
29-
"io.netty:netty-codec-base:4.2.16.Final",
30-
"io.netty:netty-codec-http2:4.2.16.Final",
31-
"io.netty:netty-codec-http:4.2.16.Final",
32-
"io.netty:netty-codec-socks:4.2.16.Final",
33-
"io.netty:netty-common:4.2.16.Final",
34-
"io.netty:netty-handler-proxy:4.2.16.Final",
35-
"io.netty:netty-handler:4.2.16.Final",
36-
"io.netty:netty-resolver:4.2.16.Final",
28+
"io.netty:netty-buffer:4.2.17.Final",
29+
"io.netty:netty-codec-base:4.2.17.Final",
30+
"io.netty:netty-codec-http2:4.2.17.Final",
31+
"io.netty:netty-codec-http:4.2.17.Final",
32+
"io.netty:netty-codec-socks:4.2.17.Final",
33+
"io.netty:netty-common:4.2.17.Final",
34+
"io.netty:netty-handler-proxy:4.2.17.Final",
35+
"io.netty:netty-handler:4.2.17.Final",
36+
"io.netty:netty-resolver:4.2.17.Final",
3737
"io.netty:netty-tcnative-boringssl-static:2.0.81.Final",
3838
"io.netty:netty-tcnative-classes:2.0.81.Final",
39-
"io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.2.16.Final",
40-
"io.netty:netty-transport-native-unix-common:4.2.16.Final",
41-
"io.netty:netty-transport:4.2.16.Final",
39+
"io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.2.17.Final",
40+
"io.netty:netty-transport-native-unix-common:4.2.17.Final",
41+
"io.netty:netty-transport:4.2.17.Final",
4242
"io.opencensus:opencensus-api:0.31.0",
4343
"io.opencensus:opencensus-contrib-grpc-metrics:0.31.0",
4444
"io.perfmark:perfmark-api:0.27.0",

‎README.md‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ For a guided tour, take a look at the [quick start
4444
guide](https://grpc.io/docs/languages/java/quickstart) or the more explanatory [gRPC
4545
basics](https://grpc.io/docs/languages/java/basics).
4646

47-
The [examples](https://github.com/grpc/grpc-java/tree/v1.83.1/examples) and the
48-
[Android example](https://github.com/grpc/grpc-java/tree/v1.83.1/examples/android)
47+
The [examples](https://github.com/grpc/grpc-java/tree/v1.84.0/examples) and the
48+
[Android example](https://github.com/grpc/grpc-java/tree/v1.84.0/examples/android)
4949
are standalone projects that showcase the usage of gRPC.
5050

5151
Download
@@ -56,42 +56,42 @@ Download [the JARs][]. Or for Maven with non-Android, add to your `pom.xml`:
5656
<dependency>
5757
<groupId>io.grpc</groupId>
5858
<artifactId>grpc-netty-shaded</artifactId>
59-
<version>1.83.1</version>
59+
<version>1.84.0</version>
6060
<scope>runtime</scope>
6161
</dependency>
6262
<dependency>
6363
<groupId>io.grpc</groupId>
6464
<artifactId>grpc-protobuf</artifactId>
65-
<version>1.83.1</version>
65+
<version>1.84.0</version>
6666
</dependency>
6767
<dependency>
6868
<groupId>io.grpc</groupId>
6969
<artifactId>grpc-stub</artifactId>
70-
<version>1.83.1</version>
70+
<version>1.84.0</version>
7171
</dependency>
7272
```
7373

7474
Or for Gradle with non-Android, add to your dependencies:
7575
```gradle
76-
runtimeOnly 'io.grpc:grpc-netty-shaded:1.83.1'
77-
implementation 'io.grpc:grpc-protobuf:1.83.1'
78-
implementation 'io.grpc:grpc-stub:1.83.1'
76+
runtimeOnly 'io.grpc:grpc-netty-shaded:1.84.0'
77+
implementation 'io.grpc:grpc-protobuf:1.84.0'
78+
implementation 'io.grpc:grpc-stub:1.84.0'
7979
```
8080

8181
For Android client, use `grpc-okhttp` instead of `grpc-netty-shaded` and
8282
`grpc-protobuf-lite` instead of `grpc-protobuf`:
8383
```gradle
84-
implementation 'io.grpc:grpc-okhttp:1.83.1'
85-
implementation 'io.grpc:grpc-protobuf-lite:1.83.1'
86-
implementation 'io.grpc:grpc-stub:1.83.1'
84+
implementation 'io.grpc:grpc-okhttp:1.84.0'
85+
implementation 'io.grpc:grpc-protobuf-lite:1.84.0'
86+
implementation 'io.grpc:grpc-stub:1.84.0'
8787
```
8888

8989
For [Bazel](https://bazel.build), you can either
9090
[use Maven](https://github.com/bazelbuild/rules_jvm_external)
9191
(with the GAVs from above), or use `@io_grpc_grpc_java//api` et al (see below).
9292

9393
[the JARs]:
94-
https://search.maven.org/search?q=g:io.grpc%20AND%20v:1.83.1
94+
https://search.maven.org/search?q=g:io.grpc%20AND%20v:1.84.0
9595

9696
Development snapshots are available in [Sonatypes's snapshot
9797
repository](https://central.sonatype.com/repository/maven-snapshots/).
@@ -123,7 +123,7 @@ For protobuf-based codegen integrated with the Maven build system, you can use
123123
<configuration>
124124
<protocArtifact>com.google.protobuf:protoc:3.25.8:exe:${os.detected.classifier}</protocArtifact>
125125
<pluginId>grpc-java</pluginId>
126-
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.83.1:exe:${os.detected.classifier}</pluginArtifact>
126+
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.84.0:exe:${os.detected.classifier}</pluginArtifact>
127127
</configuration>
128128
<executions>
129129
<execution>
@@ -153,7 +153,7 @@ protobuf {
153153
}
154154
plugins {
155155
grpc {
156-
artifact = 'io.grpc:protoc-gen-grpc-java:1.83.1'
156+
artifact = 'io.grpc:protoc-gen-grpc-java:1.84.0'
157157
}
158158
}
159159
generateProtoTasks {
@@ -186,7 +186,7 @@ protobuf {
186186
}
187187
plugins {
188188
grpc {
189-
artifact = 'io.grpc:protoc-gen-grpc-java:1.83.1'
189+
artifact = 'io.grpc:protoc-gen-grpc-java:1.84.0'
190190
}
191191
}
192192
generateProtoTasks {

‎SECURITY.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,8 @@ grpc-netty version | netty-handler version | netty-tcnative-boringssl-static ver
403403
1.81.x | 4.1.132.Final | 2.0.75.Final
404404
1.82.x | 4.1.133.Final | 2.0.75.Final
405405
1.83.x | 4.2.15.Final | 2.0.75.Final
406-
1.84.x- | 4.2.16.Final | 2.0.81.Final
406+
1.84.x | 4.2.16.Final | 2.0.81.Final
407+
1.85.x- | 4.2.17.Final | 2.0.81.Final
407408

408409
_(grpc-netty-shaded avoids issues with keeping these versions in sync.)_
409410

‎autosharding/build.gradle‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
plugins {
2+
id "java-library"
3+
id "maven-publish"
4+
id "com.google.protobuf"
5+
id "jacoco"
6+
id "ru.vyarus.animalsniffer"
7+
}
8+
9+
description = "gRPC: Autosharding Loadbalancing plugin"
10+
11+
tasks.named("jar").configure {
12+
manifest {
13+
attributes('Automatic-Module-Name': 'io.grpc.autosharding')
14+
}
15+
}
16+
17+
sourceSets {
18+
main {
19+
proto {
20+
srcDir 'third_party/autosharding/src/main/proto'
21+
}
22+
}
23+
}
24+
25+
dependencies {
26+
implementation project(':grpc-util'),
27+
project(':grpc-core'),
28+
project(':grpc-protobuf'),
29+
project(':grpc-stub'),
30+
libraries.auto.value.annotations,
31+
libraries.guava
32+
annotationProcessor libraries.auto.value
33+
testImplementation libraries.truth,
34+
project(':grpc-grpclb'),
35+
project(':grpc-inprocess'),
36+
project(':grpc-testing'),
37+
project(':grpc-testing-proto'),
38+
testFixtures(project(':grpc-api')),
39+
testFixtures(project(':grpc-core'))
40+
signature (libraries.signature.java) {
41+
artifact {
42+
extension = "signature"
43+
}
44+
}
45+
}
46+
47+
tasks.named("compileJava").configure {
48+
it.options.compilerArgs += [
49+
"-Xlint:-processing",
50+
]
51+
appendToProperty(
52+
it.options.errorprone.excludedPaths,
53+
".*/build/generated/sources/annotationProcessor/java/.*",
54+
"|")
55+
}
56+
57+
tasks.named("javadoc").configure {
58+
failOnError = false
59+
exclude 'io/grpc/autosharding/v1/**'
60+
exclude 'io/grpc/autosharding/*Provider.java'
61+
exclude 'io/grpc/autosharding/internal/**'
62+
exclude 'io/grpc/autosharding/Internal*'
63+
}
64+
65+
tasks.named("jacocoTestReport").configure {
66+
classDirectories.from = sourceSets.main.output.collect {
67+
fileTree(dir: it, exclude: ['**/io/grpc/autosharding/v1/**'])
68+
}
69+
}
70+
71+
configureProtoCompilation()

0 commit comments

Comments
 (0)