Skip to content

Commit a4dcd4d

Browse files
plobsingplobsing
authored
Add [email protected] Less patching is necessary than v1.62.2 since Bzlmod support was integrated upstream (grpc/grpc-java#11046).
1 parent a826ca1 commit a4dcd4d

File tree

5 files changed

+239
-1
lines changed

5 files changed

+239
-1
lines changed

‎modules/grpc-java/1.64.0/MODULE.bazel

Lines changed: 206 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,206 @@
1+
module(
2+
name = "grpc-java",
3+
compatibility_level = 0,
4+
repo_name = "io_grpc_grpc_java",
5+
version = "1.64.0",
6+
)
7+
8+
# GRPC_DEPS_START
9+
IO_GRPC_GRPC_JAVA_ARTIFACTS = [
10+
"com.google.android:annotations:4.1.1.4",
11+
"com.google.api.grpc:proto-google-common-protos:2.29.0",
12+
"com.google.auth:google-auth-library-credentials:1.22.0",
13+
"com.google.auth:google-auth-library-oauth2-http:1.22.0",
14+
"com.google.auto.value:auto-value-annotations:1.10.4",
15+
"com.google.auto.value:auto-value:1.10.4",
16+
"com.google.code.findbugs:jsr305:3.0.2",
17+
"com.google.code.gson:gson:2.10.1",
18+
"com.google.errorprone:error_prone_annotations:2.23.0",
19+
"com.google.guava:failureaccess:1.0.1",
20+
"com.google.guava:guava:32.1.3-android",
21+
"com.google.re2j:re2j:1.7",
22+
"com.google.truth:truth:1.1.5",
23+
"com.squareup.okhttp:okhttp:2.7.5",
24+
"com.squareup.okio:okio:2.10.0", # 3.0+ needs swapping to -jvm; need work to avoid flag-day
25+
"io.netty:netty-buffer:4.1.100.Final",
26+
"io.netty:netty-codec-http2:4.1.100.Final",
27+
"io.netty:netty-codec-http:4.1.100.Final",
28+
"io.netty:netty-codec-socks:4.1.100.Final",
29+
"io.netty:netty-codec:4.1.100.Final",
30+
"io.netty:netty-common:4.1.100.Final",
31+
"io.netty:netty-handler-proxy:4.1.100.Final",
32+
"io.netty:netty-handler:4.1.100.Final",
33+
"io.netty:netty-resolver:4.1.100.Final",
34+
"io.netty:netty-tcnative-boringssl-static:2.0.61.Final",
35+
"io.netty:netty-tcnative-classes:2.0.61.Final",
36+
"io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.100.Final",
37+
"io.netty:netty-transport-native-unix-common:4.1.100.Final",
38+
"io.netty:netty-transport:4.1.100.Final",
39+
"io.opencensus:opencensus-api:0.31.0",
40+
"io.opencensus:opencensus-contrib-grpc-metrics:0.31.0",
41+
"io.perfmark:perfmark-api:0.26.0",
42+
"junit:junit:4.13.2",
43+
"org.apache.tomcat:annotations-api:6.0.53",
44+
"org.codehaus.mojo:animal-sniffer-annotations:1.23",
45+
]
46+
# GRPC_DEPS_END
47+
48+
bazel_dep(name = "googleapis", repo_name = "com_google_googleapis", version = "0.0.0-20240326-1c8d509c5")
49+
bazel_dep(name = "grpc", repo_name = "com_github_grpc_grpc", version = "1.56.3.bcr.1")
50+
bazel_dep(name = "protobuf", repo_name = "com_google_protobuf", version = "23.1")
51+
bazel_dep(name = "rules_cc", version = "0.0.9")
52+
bazel_dep(name = "rules_java", version = "5.3.5")
53+
bazel_dep(name = "rules_go", repo_name = "io_bazel_rules_go", version = "0.46.0")
54+
bazel_dep(name = "rules_jvm_external", version = "6.0")
55+
bazel_dep(name = "rules_proto", version = "5.3.0-21.7")
56+
57+
non_module_deps = use_extension("//:repositories.bzl", "grpc_java_repositories_extension")
58+
59+
use_repo(
60+
non_module_deps,
61+
"com_github_cncf_xds",
62+
"envoy_api",
63+
"io_grpc_grpc_proto",
64+
)
65+
66+
grpc_repo_deps_ext = use_extension("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_repo_deps_ext")
67+
68+
use_repo(
69+
grpc_repo_deps_ext,
70+
"com_envoyproxy_protoc_gen_validate",
71+
"com_github_cncf_udpa",
72+
"opencensus_proto",
73+
)
74+
75+
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
76+
77+
maven.install(
78+
artifacts = IO_GRPC_GRPC_JAVA_ARTIFACTS,
79+
repositories = [
80+
"https://repo.maven.apache.org/maven2/",
81+
],
82+
strict_visibility = True,
83+
)
84+
85+
use_repo(maven, "maven")
86+
87+
maven.override(
88+
coordinates = "com.google.protobuf:protobuf-java",
89+
target = "@com_google_protobuf//:protobuf_java",
90+
)
91+
92+
maven.override(
93+
coordinates = "com.google.protobuf:protobuf-java-util",
94+
target = "@com_google_protobuf//:protobuf_java_util",
95+
)
96+
97+
maven.override(
98+
coordinates = "com.google.protobuf:protobuf-javalite",
99+
target = "@com_google_protobuf//:protobuf_javalite",
100+
)
101+
102+
maven.override(
103+
coordinates = "io.grpc:grpc-alts",
104+
target = "@io_grpc_grpc_java//alts",
105+
)
106+
107+
maven.override(
108+
coordinates = "io.grpc:grpc-api",
109+
target = "@io_grpc_grpc_java//api",
110+
)
111+
112+
maven.override(
113+
coordinates = "io.grpc:grpc-auth",
114+
target = "@io_grpc_grpc_java//auth",
115+
)
116+
117+
maven.override(
118+
coordinates = "io.grpc:grpc-census",
119+
target = "@io_grpc_grpc_java//census",
120+
)
121+
122+
maven.override(
123+
coordinates = "io.grpc:grpc-context",
124+
target = "@io_grpc_grpc_java//context",
125+
)
126+
127+
maven.override(
128+
coordinates = "io.grpc:grpc-core",
129+
target = "@io_grpc_grpc_java//core:core_maven",
130+
)
131+
132+
maven.override(
133+
coordinates = "io.grpc:grpc-googleapis",
134+
target = "@io_grpc_grpc_java//googleapis",
135+
)
136+
137+
maven.override(
138+
coordinates = "io.grpc:grpc-grpclb",
139+
target = "@io_grpc_grpc_java//grpclb",
140+
)
141+
142+
maven.override(
143+
coordinates = "io.grpc:grpc-inprocess",
144+
target = "@io_grpc_grpc_java//inprocess",
145+
)
146+
147+
maven.override(
148+
coordinates = "io.grpc:grpc-netty",
149+
target = "@io_grpc_grpc_java//netty",
150+
)
151+
152+
maven.override(
153+
coordinates = "io.grpc:grpc-netty-shaded",
154+
target = "@io_grpc_grpc_java//netty:shaded_maven",
155+
)
156+
157+
maven.override(
158+
coordinates = "io.grpc:grpc-okhttp",
159+
target = "@io_grpc_grpc_java//okhttp",
160+
)
161+
162+
maven.override(
163+
coordinates = "io.grpc:grpc-protobuf",
164+
target = "@io_grpc_grpc_java//protobuf",
165+
)
166+
167+
maven.override(
168+
coordinates = "io.grpc:grpc-protobuf-lite",
169+
target = "@io_grpc_grpc_java//protobuf-lite",
170+
)
171+
172+
maven.override(
173+
coordinates = "io.grpc:grpc-rls",
174+
target = "@io_grpc_grpc_java//rls",
175+
)
176+
177+
maven.override(
178+
coordinates = "io.grpc:grpc-services",
179+
target = "@io_grpc_grpc_java//services:services_maven",
180+
)
181+
182+
maven.override(
183+
coordinates = "io.grpc:grpc-stub",
184+
target = "@io_grpc_grpc_java//stub",
185+
)
186+
187+
maven.override(
188+
coordinates = "io.grpc:grpc-testing",
189+
target = "@io_grpc_grpc_java//testing",
190+
)
191+
192+
maven.override(
193+
coordinates = "io.grpc:grpc-xds",
194+
target = "@io_grpc_grpc_java//xds:xds_maven",
195+
)
196+
197+
maven.override(
198+
coordinates = "io.grpc:grpc-util",
199+
target = "@io_grpc_grpc_java//util",
200+
)
201+
202+
switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules")
203+
204+
switched_rules.use_languages(java = True)
205+
206+
use_repo(switched_rules, "com_google_googleapis_imports")

‎modules/grpc-java/1.64.0/patches/module_dot_bazel_version.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git MODULE.bazel MODULE.bazel
2+
index 1d79e362e..b116abed0 100644
3+
--- MODULE.bazel
4+
+++ MODULE.bazel
5+
@@ -2,7 +2,7 @@ module(
6+
name = "grpc-java",
7+
compatibility_level = 0,
8+
repo_name = "io_grpc_grpc_java",
9+
- version = "0",
10+
+ version = "1.64.0",
11+
)
12+
13+
# GRPC_DEPS_START

‎modules/grpc-java/1.64.0/presubmit.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
matrix:
2+
platform: ["debian10", "macos", "ubuntu2004", "windows"]
3+
bazel: ["7.x"]
4+
tasks:
5+
verify_targets:
6+
platform: ${{ platform }}
7+
bazel: ${{ bazel }}
8+
build_targets:
9+
- '@grpc-java//:java_grpc_library__external_repo_test'

‎modules/grpc-java/1.64.0/source.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"integrity": "sha256-hiaqXiASPlVBCDb6k5u3k4RZTv3UW5eeiDZC2szK36E=",
3+
"strip_prefix": "grpc-java-1.64.0",
4+
"url": "https://github.com/grpc/grpc-java/archive/refs/tags/v1.64.0.tar.gz",
5+
"patch_strip": 0,
6+
"patches": {
7+
"module_dot_bazel_version.patch": "sha256-DwMImFR9xKzB52qlWeQ3+2zrh6aOkM6l8HFyZGTQbIA="
8+
}
9+
}

‎modules/grpc-java/metadata.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
"github:grpc/grpc-java"
1111
],
1212
"versions": [
13-
"1.62.2"
13+
"1.62.2",
14+
"1.64.0"
1415
],
1516
"yanked_versions": {}
1617
}

0 commit comments

Comments
 (0)