Skip to content

Commit 5439434

Browse files
fashingefoxepstein
fashing
and
efoxepstein
authored
Add Bazel support (#97)
* Add bazel config to build grpc-java targets for hello world example. * Add bazel files to build the generator. * Add ugly kt_jvm_grpc_library rule. * Tidy up kt_jvm_grpc_library. * Clean up example build rules * Add workspace name to local dependencies * Fix visibility for compiler and stubs rules * Use a better name for the srcjar * Add repositories.bzl and remove java_grpc_library * Clean up repositories.bzl and WORKSPACE * Export core stub code in kt_jvm_grpc_library * Move stub deps to depend on the flavor * Improve Bazel library naming and documentation * Add Bazel build rules for the Hello World example client and server. * Add Bazel rules to build the stub tests. * Add Bazel files to build protoc tests for the generator. * Add bazel files to build tests for the generator. * Add bazel files to build route guide client and server demo. * Remove Google-internal references * Fix typo in documentation * Add lite support and use java_proto_library as dep. (#6) * Add lite support and use java_proto_library as dep. * Update kt_jvm_grpc.bzl Remove the flavor check around kt_deps.extend() since it is the same for both flavors. The only significant difference is that this causes invalid flavors to fail later in java_grpc_library instead, which seems appropriate since it does depend on flavor. Co-authored-by: Mark Fashing <[email protected]> Co-authored-by: Eli Fox-Epstein <[email protected]>
1 parent 8f3c638 commit 5439434

File tree

21 files changed

+954
-21
lines changed

21 files changed

+954
-21
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ build
44
.idea
55
local.properties
66
*.iml
7+
/bazel-*

‎BUILD.bazel

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Deliberately empty

‎WORKSPACE

+56-21
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,71 @@
11
workspace(name = "com_github_grpc_grpc_kotlin")
22

33
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
4+
45
http_archive(
5-
name = "build_bazel_rules_android",
6-
urls = ["https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip"],
7-
sha256 = "cd06d15dd8bb59926e4d65f9003bfc20f9da4b2519985c27e190cddc8b7a7806",
8-
strip_prefix = "rules_android-0.1.1",
6+
name = "rules_jvm_external",
7+
sha256 = "62133c125bf4109dfd9d2af64830208356ce4ef8b165a6ef15bbff7460b35c3a",
8+
strip_prefix = "rules_jvm_external-3.0",
9+
url = "https://github.com/bazelbuild/rules_jvm_external/archive/3.0.zip",
910
)
1011

11-
rules_kotlin_version = "b40d920c5a5e044c541513f0d5e9260d0a4579c0"
12-
http_archive(
13-
name = "io_bazel_rules_kotlin",
14-
urls = ["https://github.com/bazelbuild/rules_kotlin/archive/%s.zip" % rules_kotlin_version],
15-
sha256 = "3dadd0ad7272be6b1ed1274f62cadd4a1293c89990bcd7b4af32637a70ada63e",
16-
type = "zip",
17-
strip_prefix = "rules_kotlin-%s" % rules_kotlin_version
12+
load("@rules_jvm_external//:defs.bzl", "maven_install")
13+
14+
# Repositories
15+
load(
16+
"//:repositories.bzl",
17+
"IO_GRPC_GRPC_KOTLIN_ARTIFACTS",
18+
"IO_GRPC_GRPC_KOTLIN_OVERRIDE_TARGETS",
19+
"grpc_kt_repositories",
20+
"io_grpc_grpc_java",
1821
)
1922

20-
load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kotlin_repositories", "kt_register_toolchains")
21-
kotlin_repositories()
22-
kt_register_toolchains()
23+
io_grpc_grpc_java()
2324

24-
http_archive(
25-
name = "io_grpc_grpc_java",
26-
sha256 = "11f2930cf31c964406e8a7e530272a263fbc39c5f8d21410b2b927b656f4d9be",
27-
strip_prefix = "grpc-java-1.26.0",
28-
url = "https://github.com/grpc/grpc-java/archive/v1.26.0.zip",
25+
load(
26+
"@io_grpc_grpc_java//:repositories.bzl",
27+
"IO_GRPC_GRPC_JAVA_ARTIFACTS",
28+
"IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS",
29+
"grpc_java_repositories",
30+
)
31+
32+
# Maven
33+
maven_install(
34+
artifacts = [
35+
"com.google.jimfs:jimfs:1.1",
36+
"com.google.truth.extensions:truth-proto-extension:1.0.1",
37+
] + IO_GRPC_GRPC_KOTLIN_ARTIFACTS + IO_GRPC_GRPC_JAVA_ARTIFACTS,
38+
generate_compat_repositories = True,
39+
override_targets = dict(
40+
IO_GRPC_GRPC_KOTLIN_OVERRIDE_TARGETS.items() +
41+
IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS.items(),
42+
),
43+
repositories = [
44+
"https://repo.maven.apache.org/maven2/",
45+
],
2946
)
3047

31-
load("@io_grpc_grpc_java//:repositories.bzl", "grpc_java_repositories")
48+
load("@maven//:compat.bzl", "compat_repositories")
49+
50+
compat_repositories()
51+
52+
# gRPC
53+
grpc_kt_repositories()
3254

3355
grpc_java_repositories()
3456

57+
# Protocol Buffers
3558
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
36-
protobuf_deps()
59+
60+
protobuf_deps()
61+
62+
# Kotlin
63+
load(
64+
"@io_bazel_rules_kotlin//kotlin:kotlin.bzl",
65+
"kotlin_repositories",
66+
"kt_register_toolchains",
67+
)
68+
69+
kotlin_repositories()
70+
71+
kt_register_toolchains()

‎compiler/src/main/java/io/grpc/kotlin/generator/BUILD.bazel

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_library")
2+
3+
licenses(["notice"])
4+
5+
package(
6+
default_visibility = ["//visibility:public"],
7+
)
8+
9+
kt_jvm_library(
10+
name = "generator",
11+
srcs = glob(["*.kt"]),
12+
deps = [
13+
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc",
14+
"//stub/src/main/java/io/grpc/kotlin:context",
15+
"//stub/src/main/java/io/grpc/kotlin:stub",
16+
"@com_google_protobuf//:protobuf_java",
17+
"@io_grpc_grpc_java//core",
18+
"@maven//:com_google_guava_guava",
19+
"@maven//:com_squareup_kotlinpoet",
20+
"@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_core",
21+
],
22+
)
23+
24+
java_binary(
25+
name = "GeneratorRunner",
26+
main_class = "io.grpc.kotlin.generator.GeneratorRunner",
27+
runtime_deps = [":generator"],
28+
)

‎compiler/src/main/java/io/grpc/kotlin/generator/protoc/BUILD.bazel

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_library")
2+
3+
licenses(["notice"])
4+
5+
package(
6+
default_visibility = ["//:__subpackages__"],
7+
)
8+
9+
kt_jvm_library(
10+
name = "protoc",
11+
srcs = glob(["*.kt"]),
12+
deps = [
13+
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc/util/graph",
14+
"@com_google_protobuf//:protobuf_java",
15+
"@maven//:com_google_guava_guava",
16+
"@maven//:com_squareup_kotlinpoet",
17+
],
18+
)

‎compiler/src/main/java/io/grpc/kotlin/generator/protoc/testing/BUILD.bazel

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_library")
2+
3+
licenses(["notice"])
4+
5+
package(
6+
default_visibility = ["//:__subpackages__"],
7+
)
8+
9+
kt_jvm_library(
10+
name = "testing",
11+
srcs = glob(["*.kt"]),
12+
deps = [
13+
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc",
14+
"@maven//:com_google_truth_truth",
15+
"@maven//:com_squareup_kotlinpoet",
16+
],
17+
)

‎compiler/src/main/java/io/grpc/kotlin/generator/protoc/util/graph/BUILD.bazel

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_library")
2+
3+
licenses(["notice"])
4+
5+
package(
6+
default_visibility = ["//:__subpackages__"],
7+
)
8+
9+
kt_jvm_library(
10+
name = "graph",
11+
srcs = ["TopologicalSortGraph.kt"],
12+
deps = [
13+
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc/util/sort",
14+
"@maven//:com_google_guava_guava",
15+
],
16+
)

‎compiler/src/main/java/io/grpc/kotlin/generator/protoc/util/sort/BUILD.bazel

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_library")
2+
3+
licenses(["notice"])
4+
5+
package(
6+
default_visibility = ["//:__subpackages__"],
7+
)
8+
9+
kt_jvm_library(
10+
name = "sort",
11+
srcs = [
12+
"PartialOrdering.kt",
13+
"TopologicalSort.kt",
14+
],
15+
)

‎compiler/src/test/java/io/grpc/kotlin/generator/protoc/BUILD.bazel

+143
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,143 @@
1+
load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_test")
2+
3+
licenses(["notice"])
4+
5+
package(default_visibility = ["//compiler/src/test:__subpackages__"])
6+
7+
kt_jvm_test(
8+
name = "ClassSimpleNameTest",
9+
srcs = ["ClassSimpleNameTest.kt"],
10+
test_class = "io.grpc.kotlin.generator.protoc.ClassSimpleNameTest",
11+
deps = [
12+
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc",
13+
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc/testing",
14+
"@maven//:com_google_truth_truth",
15+
],
16+
)
17+
18+
kt_jvm_test(
19+
name = "ConstantNameTest",
20+
srcs = ["ConstantNameTest.kt"],
21+
test_class = "io.grpc.kotlin.generator.protoc.ConstantNameTest",
22+
deps = [
23+
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc",
24+
"@maven//:com_google_truth_truth",
25+
],
26+
)
27+
28+
kt_jvm_test(
29+
name = "DeclarationsTest",
30+
srcs = ["DeclarationsTest.kt"],
31+
test_class = "io.grpc.kotlin.generator.protoc.DeclarationsTest",
32+
deps = [
33+
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc",
34+
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc/testing",
35+
"@maven//:com_google_truth_truth",
36+
],
37+
)
38+
39+
kt_jvm_test(
40+
name = "DescriptorUtilTest",
41+
srcs = ["DescriptorUtilTest.kt"],
42+
test_class = "io.grpc.kotlin.generator.protoc.DescriptorUtilTest",
43+
deps = [
44+
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc",
45+
"//compiler/src/test/proto/testing:example3_java_proto",
46+
"//compiler/src/test/proto/testing:has_explicit_outer_class_name_java_proto",
47+
"//compiler/src/test/proto/testing:has_nested_class_name_conflict_java_proto",
48+
"//compiler/src/test/proto/testing:has_outer_class_name_conflict_java_proto",
49+
"//compiler/src/test/proto/testing:proto-file-with-hyphen_java_proto",
50+
"@maven//:com_google_truth_truth",
51+
],
52+
)
53+
54+
kt_jvm_test(
55+
name = "GeneratorConfigTest",
56+
srcs = ["GeneratorConfigTest.kt"],
57+
test_class = "io.grpc.kotlin.generator.protoc.GeneratorConfigTest",
58+
deps = [
59+
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc",
60+
"//compiler/src/test/proto/testing:example3_java_proto",
61+
"//compiler/src/test/proto/testing:has_explicit_outer_class_name_java_proto",
62+
"//compiler/src/test/proto/testing:has_outer_class_name_conflict_java_proto",
63+
"//compiler/src/test/proto/testing:implicit_java_package_java_proto",
64+
"//compiler/src/test/proto/testing:service_name_conflicts_with_file_java_proto",
65+
"@maven//:com_google_truth_truth",
66+
],
67+
)
68+
69+
kt_jvm_test(
70+
name = "JavaPackagePolicyTest",
71+
srcs = ["JavaPackagePolicyTest.kt"],
72+
test_class = "io.grpc.kotlin.generator.protoc.JavaPackagePolicyTest",
73+
deps = [
74+
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc",
75+
"//compiler/src/test/proto/testing:example3_java_proto",
76+
"//compiler/src/test/proto/testing:implicit_java_package_java_proto",
77+
"@maven//:com_google_truth_truth",
78+
],
79+
)
80+
81+
kt_jvm_test(
82+
name = "MemberSimpleNameTest",
83+
srcs = ["MemberSimpleNameTest.kt"],
84+
test_class = "io.grpc.kotlin.generator.protoc.MemberSimpleNameTest",
85+
deps = [
86+
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc",
87+
"@maven//:com_google_truth_truth",
88+
],
89+
)
90+
91+
kt_jvm_test(
92+
name = "ProtoEnumValueNameTest",
93+
srcs = ["ProtoEnumValueNameTest.kt"],
94+
test_class = "io.grpc.kotlin.generator.protoc.ProtoEnumValueNameTest",
95+
deps = [
96+
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc",
97+
"//compiler/src/test/proto/testing:example3_java_proto",
98+
"@maven//:com_google_truth_truth",
99+
],
100+
)
101+
102+
kt_jvm_test(
103+
name = "ProtoFieldNameTest",
104+
srcs = ["ProtoFieldNameTest.kt"],
105+
test_class = "io.grpc.kotlin.generator.protoc.ProtoFieldNameTest",
106+
deps = [
107+
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc",
108+
"//compiler/src/test/proto/testing:example3_java_proto",
109+
"@maven//:com_google_truth_truth",
110+
],
111+
)
112+
113+
kt_jvm_test(
114+
name = "ProtoFileNameTest",
115+
srcs = ["ProtoFileNameTest.kt"],
116+
test_class = "io.grpc.kotlin.generator.protoc.ProtoFileNameTest",
117+
deps = [
118+
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc",
119+
"//compiler/src/test/proto/testing:example3_java_proto",
120+
"@maven//:com_google_truth_truth",
121+
],
122+
)
123+
124+
kt_jvm_test(
125+
name = "ProtoTypeSimpleNameTest",
126+
srcs = ["ProtoTypeSimpleNameTest.kt"],
127+
test_class = "io.grpc.kotlin.generator.protoc.ProtoTypeSimpleNameTest",
128+
deps = [
129+
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc",
130+
"//compiler/src/test/proto/testing:example3_java_proto",
131+
"@maven//:com_google_truth_truth",
132+
],
133+
)
134+
135+
kt_jvm_test(
136+
name = "ScopeTest",
137+
srcs = ["ScopeTest.kt"],
138+
test_class = "io.grpc.kotlin.generator.protoc.ScopeTest",
139+
deps = [
140+
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc",
141+
"@maven//:com_google_truth_truth",
142+
],
143+
)

‎compiler/src/test/java/io/grpc/kotlin/generator/protoc/testing/BUILD.bazel

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_test")
2+
3+
licenses(["notice"])
4+
5+
package(default_visibility = ["//compiler/src/test:__subpackages__"])
6+
7+
kt_jvm_test(
8+
name = "DeclarationsSubjectTest",
9+
srcs = ["DeclarationsSubjectTest.kt"],
10+
test_class = "io.grpc.kotlin.generator.protoc.testing.DeclarationsSubjectTest",
11+
deps = [
12+
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc/testing",
13+
"@maven//:com_google_truth_truth",
14+
"@maven//:com_squareup_kotlinpoet",
15+
"@maven//:junit_junit",
16+
],
17+
)
18+
19+
kt_jvm_test(
20+
name = "FileSpecSubjectTest",
21+
srcs = ["FileSpecSubjectTest.kt"],
22+
test_class = "io.grpc.kotlin.generator.protoc.testing.FileSpecSubjectTest",
23+
deps = [
24+
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc/testing",
25+
],
26+
)
27+
28+
kt_jvm_test(
29+
name = "FunSpecSubjectTest",
30+
srcs = ["FunSpecSubjectTest.kt"],
31+
test_class = "io.grpc.kotlin.generator.protoc.testing.FunSpecSubjectTest",
32+
deps = [
33+
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc/testing",
34+
],
35+
)
36+
37+
kt_jvm_test(
38+
name = "TypeSpecSubjectTest",
39+
srcs = ["TypeSpecSubjectTest.kt"],
40+
test_class = "io.grpc.kotlin.generator.protoc.testing.TypeSpecSubjectTest",
41+
deps = [
42+
"//compiler/src/main/java/io/grpc/kotlin/generator/protoc/testing",
43+
],
44+
)

0 commit comments

Comments
 (0)