From fc61936a45c547ad362d26dca48062aebb2d53e2 Mon Sep 17 00:00:00 2001 From: Zhongming Qu Date: Wed, 19 Dec 2018 01:17:38 +0800 Subject: [PATCH] style: run the purify-text linter on all files This commit was created by running: pre-commit run purify-text --all --- .bazelrc | 2 +- BUILD.bazel | 3 +- Makefile | 4 +- Makefile.examples | 308 +++++++++--------- README.md | 15 +- WORKSPACE | 10 +- android/BUILD.bazel | 1 - android/README.md | 3 +- android/android_grpc_library.bzl | 1 - android/android_proto_library.bzl | 1 - android/deps.bzl | 8 +- .../example/android_grpc_compile/WORKSPACE | 1 - .../example/android_grpc_library/WORKSPACE | 1 - .../example/android_proto_compile/WORKSPACE | 1 - .../example/android_proto_library/WORKSPACE | 3 +- android/example/routeguide/BUILD.bazel | 4 +- .../routeguide/src/main/res/values/colors.xml | 1 - .../routeguide/src/main/res/values/styles.xml | 1 - closure/BUILD.bazel | 7 +- closure/README.md | 1 - closure/buildozer_http_archive.bzl | 5 +- closure/closure_proto_library.bzl | 1 - closure/deps.bzl | 4 +- .../example/closure_proto_compile/WORKSPACE | 1 - .../example/closure_proto_library/WORKSPACE | 1 - closure/example/routeguide/BUILD.bazel | 1 - closure/example/routeguide/client/BUILD.bazel | 1 - closure/example/routeguide/client/client.js | 12 +- .../example/routeguide/client/client_test.js | 1 - compile.bzl | 77 +++-- cpp/BUILD.bazel | 1 - cpp/README.md | 1 - cpp/cpp_grpc_library.bzl | 1 - cpp/cpp_proto_library.bzl | 1 - cpp/deps.bzl | 6 +- cpp/example/cpp_grpc_compile/WORKSPACE | 1 - cpp/example/cpp_grpc_library/WORKSPACE | 1 - cpp/example/cpp_proto_compile/WORKSPACE | 1 - cpp/example/cpp_proto_library/WORKSPACE | 1 - cpp/example/routeguide/client.cc | 2 +- cpp/example/routeguide/feature_test.cc | 2 +- cpp/example/routeguide/server.cc | 2 +- csharp/BUILD.bazel | 1 - csharp/README.md | 11 +- csharp/csharp_grpc_library.bzl | 7 +- csharp/csharp_proto_library.bzl | 5 +- csharp/deps.bzl | 4 +- csharp/example/csharp_grpc_compile/WORKSPACE | 1 - csharp/example/csharp_grpc_library/WORKSPACE | 2 - csharp/example/csharp_proto_compile/WORKSPACE | 1 - csharp/example/csharp_proto_library/WORKSPACE | 2 - csharp/example/routeguide/BUILD.bazel | 4 +- csharp/example/routeguide/Client.cs | 12 +- csharp/example/routeguide/Reflect.cs | 8 +- csharp/example/routeguide/Server.cs | 4 +- csharp/nuget/grpc.bzl | 4 +- csharp/nuget/nuget.bzl | 6 +- csharp/nuget/packages.bzl | 2 +- csharp/nuget/protobuf.bzl | 2 +- csharp/nuget/regenerate_packages.sh | 4 +- dart/BUILD.bazel | 7 +- dart/README.md | 1 - dart/dart_grpc_library.bzl | 1 - dart/dart_proto_library.bzl | 1 - dart/dart_protoc_plugin.dart | 2 +- dart/dart_pub_deps.bzl | 6 +- dart/deps.bzl | 3 +- dart/example/dart_grpc_compile/WORKSPACE | 2 - dart/example/dart_grpc_library/WORKSPACE | 2 - dart/example/dart_proto_compile/WORKSPACE | 2 - dart/example/dart_proto_library/WORKSPACE | 2 - dart/example/routeguide/Makefile | 2 +- dart/example/routeguide/client.dart | 2 +- dart/example/routeguide/client_bin.dart | 2 +- dart/example/routeguide/common.dart | 4 +- dart/example/routeguide/server.dart | 2 +- dart/example/routeguide/server_bin.dart | 2 +- deps.bzl | 78 ++--- example/proto/BUILD.bazel | 1 - example/proto/empty.proto | 1 - example/proto/greeter.proto | 2 +- example/proto/person.proto | 1 - example/proto/place.proto | 1 - example/proto/routeguide.proto | 2 +- example/proto/routeguide_features.json | 2 +- github.com/gogo/protobuf/BUILD.bazel | 1 - github.com/gogo/protobuf/README.md | 1 - github.com/gogo/protobuf/deps.bzl | 2 +- .../example/gogo_grpc_compile/WORKSPACE | 1 - .../example/gogo_grpc_library/WORKSPACE | 1 - .../example/gogo_proto_compile/WORKSPACE | 1 - .../example/gogo_proto_library/WORKSPACE | 1 - .../example/gogofast_grpc_compile/WORKSPACE | 1 - .../example/gogofast_grpc_library/WORKSPACE | 1 - .../example/gogofast_proto_compile/WORKSPACE | 1 - .../example/gogofast_proto_library/WORKSPACE | 1 - .../example/gogofaster_grpc_compile/WORKSPACE | 1 - .../example/gogofaster_grpc_library/WORKSPACE | 1 - .../gogofaster_proto_compile/WORKSPACE | 1 - .../gogofaster_proto_library/WORKSPACE | 1 - .../gogo/protobuf/gogo_grpc_compile.bzl | 1 - .../gogo/protobuf/gogo_grpc_library.bzl | 1 - .../gogo/protobuf/gogo_proto_compile.bzl | 1 - .../gogo/protobuf/gogo_proto_library.bzl | 1 - .../gogo/protobuf/gogofast_grpc_compile.bzl | 1 - .../gogo/protobuf/gogofast_grpc_library.bzl | 1 - .../gogo/protobuf/gogofast_proto_compile.bzl | 1 - .../gogo/protobuf/gogofast_proto_library.bzl | 1 - .../gogo/protobuf/gogofaster_grpc_compile.bzl | 1 - .../gogo/protobuf/gogofaster_grpc_library.bzl | 1 - .../protobuf/gogofaster_proto_compile.bzl | 1 - .../protobuf/gogofaster_proto_library.bzl | 1 - .../grpc-ecosystem/grpc-gateway/BUILD.bazel | 1 - .../grpc-ecosystem/grpc-gateway/README.md | 1 - .../grpc-ecosystem/grpc-gateway/deps.bzl | 2 +- .../grpc-gateway/example/api/BUILD.bazel | 2 - .../grpc-gateway/example/api/api.proto | 2 +- .../example/gateway_grpc_compile/WORKSPACE | 1 - .../example/gateway_grpc_library/WORKSPACE | 1 - .../example/gateway_swagger_compile/WORKSPACE | 1 - .../grpc-gateway/example/server/BUILD.bazel | 2 - .../grpc-gateway/gateway_grpc_library.bzl | 1 - github.com/grpc/grpc-web/BUILD.bazel | 4 +- github.com/grpc/grpc-web/README.md | 3 +- .../grpc/grpc-web/closure_grpc_library.bzl | 4 +- github.com/grpc/grpc-web/deps.bzl | 7 +- .../example/closure_grpc_compile/WORKSPACE | 1 - .../example/closure_grpc_library/WORKSPACE | 1 - .../commonjs_dts_grpc_compile/WORKSPACE | 1 - .../example/commonjs_grpc_compile/WORKSPACE | 1 - .../example/routeguide/closure/client.js | 6 +- .../example/routeguide/closure/client_test.js | 3 +- .../example/ts_grpc_compile/WORKSPACE | 1 - .../improbable-eng/ts-protoc-gen/BUILD.bazel | 2 +- .../improbable-eng/ts-protoc-gen/README.md | 1 - .../improbable-eng/ts-protoc-gen/deps.bzl | 5 +- .../example/routeguide/BUILD.bazel | 1 - .../example/routeguide/client.py | 2 +- .../example/routeguide/resources.py | 2 +- .../example/routeguide/server.py | 2 +- .../example/ts_proto_compile/WORKSPACE | 1 - .../improbable-eng/ts-protoc-gen/library.bzl | 6 +- .../improbable-eng/ts-protoc-gen/pkg_tar.bzl | 1 - github.com/stackb/grpc.js/README.md | 3 +- .../stackb/grpc.js/closure_grpc_library.bzl | 3 +- github.com/stackb/grpc.js/deps.bzl | 6 +- .../example/closure_grpc_compile/WORKSPACE | 1 - .../example/closure_grpc_library/WORKSPACE | 1 - .../example/routeguide/client/client.js | 8 +- .../example/routeguide/client/client_test.js | 3 +- go/BUILD.bazel | 1 - go/README.md | 1 - go/deps.bzl | 6 +- go/example/go_grpc_compile/WORKSPACE | 1 - go/example/go_grpc_library/WORKSPACE | 1 - go/example/go_proto_compile/WORKSPACE | 1 - go/example/go_proto_library/WORKSPACE | 1 - go/go_grpc_compile.bzl | 1 - go/go_grpc_library.bzl | 1 - go/go_proto_compile.bzl | 1 - go/go_proto_library.bzl | 1 - go/utils.bzl | 3 +- java/README.md | 1 - java/deps.bzl | 6 +- java/example/java_grpc_compile/WORKSPACE | 1 - java/example/java_grpc_library/WORKSPACE | 1 - java/example/java_proto_compile/WORKSPACE | 1 - java/example/java_proto_library/WORKSPACE | 1 - java/example/routeguide/BUILD.bazel | 2 +- .../examples/routeguide/RouteGuideClient.java | 2 +- .../examples/routeguide/RouteGuideServer.java | 2 +- .../examples/routeguide/RouteGuideUtil.java | 2 +- java/example/routeguide/route_guide_db.json | 2 +- java/java_grpc_library.bzl | 1 - java/java_proto_library.bzl | 1 - node/BUILD.bazel | 1 - node/README.md | 1 - node/deps.bzl | 4 +- node/example/node_grpc_compile/WORKSPACE | 1 - node/example/node_grpc_library/WORKSPACE | 3 - node/example/node_proto_compile/WORKSPACE | 1 - node/example/node_proto_library/WORKSPACE | 2 - node/example/routeguide/client.js | 6 +- node/example/routeguide/server.js | 2 +- node/node_grpc_library.bzl | 1 - node/node_proto_library.bzl | 1 - objc/BUILD.bazel | 1 - objc/README.md | 1 - objc/deps.bzl | 6 +- objc/example/objc_grpc_compile/WORKSPACE | 1 - objc/example/objc_proto_compile/WORKSPACE | 1 - php/BUILD.bazel | 1 - php/README.md | 1 - php/deps.bzl | 4 +- php/example/php_grpc_compile/WORKSPACE | 1 - php/example/php_proto_compile/WORKSPACE | 1 - plugin.bzl | 1 - python/BUILD.bazel | 1 - python/README.md | 1 - python/deps.bzl | 4 +- python/example/python_grpc_compile/WORKSPACE | 1 - python/example/python_grpc_library/WORKSPACE | 1 - python/example/python_proto_compile/WORKSPACE | 1 - python/example/python_proto_library/WORKSPACE | 2 - python/example/routeguide/client.py | 2 +- python/example/routeguide/resources.py | 2 +- python/example/routeguide/server.py | 2 +- python/grpc_library.bzl | 2 +- python/python_grpc_library.bzl | 1 - python/python_proto_library.bzl | 1 - python/requirements.txt | 2 +- python/requirements/grpc.txt | 2 +- python/requirements/protobuf.txt | 2 +- ruby/BUILD.bazel | 1 - ruby/README.md | 7 +- ruby/deps.bzl | 3 +- ruby/example/routeguide/BUILD.bazel | 4 +- ruby/example/routeguide/client.rb | 2 +- ruby/example/routeguide/server.rb | 2 +- ruby/example/ruby_grpc_compile/WORKSPACE | 1 - ruby/example/ruby_grpc_library/WORKSPACE | 2 - ruby/example/ruby_proto_compile/WORKSPACE | 1 - ruby/example/ruby_proto_library/WORKSPACE | 2 - ruby/ruby_grpc_library.bzl | 3 +- ruby/ruby_proto_library.bzl | 5 +- rust/BUILD.bazel | 1 - rust/README.md | 1 - rust/cargo/Cargo.toml | 2 +- rust/cargo/crates.bzl | 1 - rust/cargo/regenerate_crates.sh | 2 +- rust/cargo/remote/bitflags-1.0.4.BUILD | 1 - rust/cargo/remote/byteorder-1.2.6.BUILD | 1 - rust/cargo/remote/cloudabi-0.0.3.BUILD | 1 - rust/cargo/remote/crossbeam-utils-0.5.0.BUILD | 1 - rust/cargo/remote/fuchsia-zircon-0.3.3.BUILD | 1 - rust/cargo/remote/grpc-compiler-0.4.0.BUILD | 1 - rust/cargo/remote/iovec-0.1.2.BUILD | 1 - rust/cargo/remote/kernel32-sys-0.2.2.BUILD | 1 - rust/cargo/remote/lazycell-1.2.0.BUILD | 1 - rust/cargo/remote/libc-0.2.43.BUILD | 1 - rust/cargo/remote/lock_api-0.1.3.BUILD | 1 - rust/cargo/remote/log-0.3.9.BUILD | 1 - rust/cargo/remote/log-0.4.5.BUILD | 1 - rust/cargo/remote/memoffset-0.2.1.BUILD | 1 - rust/cargo/remote/miow-0.2.1.BUILD | 1 - rust/cargo/remote/net2-0.2.33.BUILD | 1 - rust/cargo/remote/nodrop-0.1.12.BUILD | 1 - rust/cargo/remote/num_cpus-1.8.0.BUILD | 1 - rust/cargo/remote/owning_ref-0.3.3.BUILD | 1 - rust/cargo/remote/parking_lot-0.6.4.BUILD | 1 - .../cargo/remote/parking_lot_core-0.3.1.BUILD | 1 - rust/cargo/remote/protobuf-1.6.0.BUILD | 1 - .../cargo/remote/protobuf-codegen-1.6.0.BUILD | 1 - rust/cargo/remote/rand-0.5.5.BUILD | 1 - rust/cargo/remote/rand_core-0.2.1.BUILD | 1 - rust/cargo/remote/rustc_version-0.2.3.BUILD | 1 - rust/cargo/remote/safemem-0.3.0.BUILD | 1 - rust/cargo/remote/scoped-tls-0.1.2.BUILD | 1 - rust/cargo/remote/scopeguard-0.3.3.BUILD | 1 - rust/cargo/remote/semver-parser-0.7.0.BUILD | 1 - rust/cargo/remote/slab-0.3.0.BUILD | 1 - rust/cargo/remote/smallvec-0.6.5.BUILD | 1 - .../remote/stable_deref_trait-1.1.1.BUILD | 1 - rust/cargo/remote/tls-api-0.1.20.BUILD | 1 - rust/cargo/remote/tls-api-stub-0.1.20.BUILD | 1 - rust/cargo/remote/tokio-codec-0.1.0.BUILD | 1 - .../remote/tokio-current-thread-0.1.1.BUILD | 1 - rust/cargo/remote/tokio-executor-0.1.4.BUILD | 1 - rust/cargo/remote/tokio-fs-0.1.3.BUILD | 1 - rust/cargo/remote/tokio-io-0.1.8.BUILD | 1 - rust/cargo/remote/tokio-reactor-0.1.5.BUILD | 1 - rust/cargo/remote/tokio-tcp-0.1.1.BUILD | 1 - .../cargo/remote/tokio-threadpool-0.1.6.BUILD | 1 - rust/cargo/remote/tokio-timer-0.1.2.BUILD | 1 - rust/cargo/remote/tokio-timer-0.2.6.BUILD | 1 - rust/cargo/remote/tokio-tls-api-0.1.20.BUILD | 1 - rust/cargo/remote/tokio-uds-0.1.7.BUILD | 1 - rust/cargo/remote/tokio-uds-0.2.1.BUILD | 1 - rust/cargo/remote/unix_socket-0.5.0.BUILD | 1 - rust/cargo/remote/unreachable-1.0.0.BUILD | 1 - rust/cargo/remote/version_check-0.1.5.BUILD | 1 - rust/cargo/remote/void-1.0.2.BUILD | 1 - rust/cargo/remote/winapi-0.2.8.BUILD | 1 - rust/cargo/remote/winapi-0.3.6.BUILD | 1 - rust/cargo/remote/winapi-build-0.1.1.BUILD | 1 - .../winapi-i686-pc-windows-gnu-0.4.0.BUILD | 1 - .../winapi-x86_64-pc-windows-gnu-0.4.0.BUILD | 1 - rust/cargo/remote/ws2_32-sys-0.2.1.BUILD | 1 - rust/deps.bzl | 2 +- rust/example/routeguide/client.rs | 2 +- rust/example/routeguide/server.rs | 8 +- rust/example/rust_grpc_compile/WORKSPACE | 2 - rust/example/rust_grpc_library/WORKSPACE | 2 - rust/example/rust_proto_compile/WORKSPACE | 2 - rust/example/rust_proto_library/WORKSPACE | 2 - rust/rust_grpc_library.bzl | 1 - rust/rust_proto_lib.bzl | 2 +- rust/rust_proto_library.bzl | 1 - scala/BUILD.bazel | 9 +- scala/CompilerPlugin.scala | 4 +- scala/README.md | 1 - scala/deps.bzl | 2 +- scala/example/routeguide/BUILD.bazel | 2 +- .../routeguide/example/AtomicRef.scala | 2 +- .../routeguide/example/RouteGuideClient.scala | 2 +- .../example/RouteGuidePersistence.scala | 2 +- .../example/RouteGuideService.scala | 2 +- scala/example/routeguide/route_guide_db.json | 2 +- scala/example/scala_grpc_compile/WORKSPACE | 2 - scala/example/scala_grpc_library/WORKSPACE | 2 - scala/example/scala_proto_compile/WORKSPACE | 2 - scala/example/scala_proto_library/WORKSPACE | 2 - scala/scala_grpc_library.bzl | 1 - scala/scala_proto_library.bzl | 1 - swift/BUILD.bazel | 1 - swift/README.md | 9 +- swift/deps.bzl | 4 +- swift/docker/Dockerfile | 8 +- swift/example/swift_grpc_compile/WORKSPACE | 5 +- swift/example/swift_grpc_library/WORKSPACE | 5 +- swift/example/swift_proto_compile/WORKSPACE | 5 +- swift/example/swift_proto_library/WORKSPACE | 5 +- swift/repositories.bzl | 4 +- swift/requirements.txt | 2 +- swift/swift_grpc_library.bzl | 1 - swift/swift_proto_library.bzl | 1 - swift/swift_protoc_gen_aspect.bzl | 2 +- tools/exgen/BUILD.bazel | 7 +- tools/exgen/android.go | 2 +- tools/exgen/csharp.go | 10 +- tools/exgen/footer.tpl | 4 +- tools/exgen/github_grpc_grpc_web.go | 2 +- tools/exgen/grpcjs.go | 2 +- tools/exgen/header.tpl | 10 +- tools/exgen/ruby.go | 6 +- tools/exgen/swift.go | 2 +- 336 files changed, 463 insertions(+), 738 deletions(-) diff --git a/.bazelrc b/.bazelrc index e0986cf57..1ef6cfb86 100644 --- a/.bazelrc +++ b/.bazelrc @@ -1 +1 @@ -build --strategy=CoreCompile=standalone \ No newline at end of file +build --strategy=CoreCompile=standalone diff --git a/BUILD.bazel b/BUILD.bazel index fc76afb2f..d543e7986 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -1,6 +1,5 @@ - filegroup( - name = "node_modules", + name = "node_modules", srcs = glob([ "node_modules/**/*.js", "node_modules/**/*.d.ts", diff --git a/Makefile b/Makefile index 310763841..be2058808 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # A collection of targets that build routeguide clients -clients: +clients: bazel build \ //android/example/routeguide:client \ //closure/example/routeguide/client \ @@ -42,4 +42,4 @@ closure_test: bazel test \ //github.com/grpc/grpc-web/example/routeguide/... -all: compile library clients servers tests \ No newline at end of file +all: compile library clients servers tests diff --git a/Makefile.examples b/Makefile.examples index 06d7b1771..c1bb81487 100644 --- a/Makefile.examples +++ b/Makefile.examples @@ -1,539 +1,539 @@ -android_proto_compile: +android_proto_compile: (cd android/example/android_proto_compile && bazel build //...) -clean_android_proto_compile: +clean_android_proto_compile: (cd android/example/android_proto_compile && bazel clean) -android_grpc_compile: +android_grpc_compile: (cd android/example/android_grpc_compile && bazel build //...) -clean_android_grpc_compile: +clean_android_grpc_compile: (cd android/example/android_grpc_compile && bazel clean) -android_proto_library: +android_proto_library: (cd android/example/android_proto_library && bazel build //...) -clean_android_proto_library: +clean_android_proto_library: (cd android/example/android_proto_library && bazel clean) -android_grpc_library: +android_grpc_library: (cd android/example/android_grpc_library && bazel build //...) -clean_android_grpc_library: +clean_android_grpc_library: (cd android/example/android_grpc_library && bazel clean) android: android_proto_compile android_grpc_compile android_proto_library android_grpc_library clean_android: clean_android_proto_compile clean_android_grpc_compile clean_android_proto_library clean_android_grpc_library -closure_proto_compile: +closure_proto_compile: (cd closure/example/closure_proto_compile && bazel build //...) -clean_closure_proto_compile: +clean_closure_proto_compile: (cd closure/example/closure_proto_compile && bazel clean) -closure_proto_library: +closure_proto_library: (cd closure/example/closure_proto_library && bazel build //...) -clean_closure_proto_library: +clean_closure_proto_library: (cd closure/example/closure_proto_library && bazel clean) closure: closure_proto_compile closure_proto_library clean_closure: clean_closure_proto_compile clean_closure_proto_library -cpp_proto_compile: +cpp_proto_compile: (cd cpp/example/cpp_proto_compile && bazel build //...) -clean_cpp_proto_compile: +clean_cpp_proto_compile: (cd cpp/example/cpp_proto_compile && bazel clean) -cpp_grpc_compile: +cpp_grpc_compile: (cd cpp/example/cpp_grpc_compile && bazel build //...) -clean_cpp_grpc_compile: +clean_cpp_grpc_compile: (cd cpp/example/cpp_grpc_compile && bazel clean) -cpp_proto_library: +cpp_proto_library: (cd cpp/example/cpp_proto_library && bazel build //...) -clean_cpp_proto_library: +clean_cpp_proto_library: (cd cpp/example/cpp_proto_library && bazel clean) -cpp_grpc_library: +cpp_grpc_library: (cd cpp/example/cpp_grpc_library && bazel build //...) -clean_cpp_grpc_library: +clean_cpp_grpc_library: (cd cpp/example/cpp_grpc_library && bazel clean) cpp: cpp_proto_compile cpp_grpc_compile cpp_proto_library cpp_grpc_library clean_cpp: clean_cpp_proto_compile clean_cpp_grpc_compile clean_cpp_proto_library clean_cpp_grpc_library -csharp_proto_compile: +csharp_proto_compile: (cd csharp/example/csharp_proto_compile && bazel build //...) -clean_csharp_proto_compile: +clean_csharp_proto_compile: (cd csharp/example/csharp_proto_compile && bazel clean) -csharp_grpc_compile: +csharp_grpc_compile: (cd csharp/example/csharp_grpc_compile && bazel build //...) -clean_csharp_grpc_compile: +clean_csharp_grpc_compile: (cd csharp/example/csharp_grpc_compile && bazel clean) -csharp_proto_library: +csharp_proto_library: (cd csharp/example/csharp_proto_library && bazel build //...) -clean_csharp_proto_library: +clean_csharp_proto_library: (cd csharp/example/csharp_proto_library && bazel clean) -csharp_grpc_library: +csharp_grpc_library: (cd csharp/example/csharp_grpc_library && bazel build //...) -clean_csharp_grpc_library: +clean_csharp_grpc_library: (cd csharp/example/csharp_grpc_library && bazel clean) csharp: csharp_proto_compile csharp_grpc_compile csharp_proto_library csharp_grpc_library clean_csharp: clean_csharp_proto_compile clean_csharp_grpc_compile clean_csharp_proto_library clean_csharp_grpc_library -dart_proto_compile: +dart_proto_compile: (cd dart/example/dart_proto_compile && bazel build //...) -clean_dart_proto_compile: +clean_dart_proto_compile: (cd dart/example/dart_proto_compile && bazel clean) -dart_grpc_compile: +dart_grpc_compile: (cd dart/example/dart_grpc_compile && bazel build //...) -clean_dart_grpc_compile: +clean_dart_grpc_compile: (cd dart/example/dart_grpc_compile && bazel clean) -dart_proto_library: +dart_proto_library: (cd dart/example/dart_proto_library && bazel build //...) -clean_dart_proto_library: +clean_dart_proto_library: (cd dart/example/dart_proto_library && bazel clean) -dart_grpc_library: +dart_grpc_library: (cd dart/example/dart_grpc_library && bazel build //...) -clean_dart_grpc_library: +clean_dart_grpc_library: (cd dart/example/dart_grpc_library && bazel clean) dart: dart_proto_compile dart_grpc_compile dart_proto_library dart_grpc_library clean_dart: clean_dart_proto_compile clean_dart_grpc_compile clean_dart_proto_library clean_dart_grpc_library -go_proto_compile: +go_proto_compile: (cd go/example/go_proto_compile && bazel build //...) -clean_go_proto_compile: +clean_go_proto_compile: (cd go/example/go_proto_compile && bazel clean) -go_grpc_compile: +go_grpc_compile: (cd go/example/go_grpc_compile && bazel build //...) -clean_go_grpc_compile: +clean_go_grpc_compile: (cd go/example/go_grpc_compile && bazel clean) -go_proto_library: +go_proto_library: (cd go/example/go_proto_library && bazel build //...) -clean_go_proto_library: +clean_go_proto_library: (cd go/example/go_proto_library && bazel clean) -go_grpc_library: +go_grpc_library: (cd go/example/go_grpc_library && bazel build //...) -clean_go_grpc_library: +clean_go_grpc_library: (cd go/example/go_grpc_library && bazel clean) go: go_proto_compile go_grpc_compile go_proto_library go_grpc_library clean_go: clean_go_proto_compile clean_go_grpc_compile clean_go_proto_library clean_go_grpc_library -java_proto_compile: +java_proto_compile: (cd java/example/java_proto_compile && bazel build //...) -clean_java_proto_compile: +clean_java_proto_compile: (cd java/example/java_proto_compile && bazel clean) -java_grpc_compile: +java_grpc_compile: (cd java/example/java_grpc_compile && bazel build //...) -clean_java_grpc_compile: +clean_java_grpc_compile: (cd java/example/java_grpc_compile && bazel clean) -java_proto_library: +java_proto_library: (cd java/example/java_proto_library && bazel build //...) -clean_java_proto_library: +clean_java_proto_library: (cd java/example/java_proto_library && bazel clean) -java_grpc_library: +java_grpc_library: (cd java/example/java_grpc_library && bazel build //...) -clean_java_grpc_library: +clean_java_grpc_library: (cd java/example/java_grpc_library && bazel clean) java: java_proto_compile java_grpc_compile java_proto_library java_grpc_library clean_java: clean_java_proto_compile clean_java_grpc_compile clean_java_proto_library clean_java_grpc_library -node_proto_compile: +node_proto_compile: (cd node/example/node_proto_compile && bazel build //...) -clean_node_proto_compile: +clean_node_proto_compile: (cd node/example/node_proto_compile && bazel clean) -node_grpc_compile: +node_grpc_compile: (cd node/example/node_grpc_compile && bazel build //...) -clean_node_grpc_compile: +clean_node_grpc_compile: (cd node/example/node_grpc_compile && bazel clean) -node_proto_library: +node_proto_library: (cd node/example/node_proto_library && bazel build //...) -clean_node_proto_library: +clean_node_proto_library: (cd node/example/node_proto_library && bazel clean) -node_grpc_library: +node_grpc_library: (cd node/example/node_grpc_library && bazel build //...) -clean_node_grpc_library: +clean_node_grpc_library: (cd node/example/node_grpc_library && bazel clean) node: node_proto_compile node_grpc_compile node_proto_library node_grpc_library clean_node: clean_node_proto_compile clean_node_grpc_compile clean_node_proto_library clean_node_grpc_library -objc_proto_compile: +objc_proto_compile: (cd objc/example/objc_proto_compile && bazel build //...) -clean_objc_proto_compile: +clean_objc_proto_compile: (cd objc/example/objc_proto_compile && bazel clean) -objc_grpc_compile: +objc_grpc_compile: (cd objc/example/objc_grpc_compile && bazel build //...) -clean_objc_grpc_compile: +clean_objc_grpc_compile: (cd objc/example/objc_grpc_compile && bazel clean) objc: objc_proto_compile objc_grpc_compile clean_objc: clean_objc_proto_compile clean_objc_grpc_compile -php_proto_compile: +php_proto_compile: (cd php/example/php_proto_compile && bazel build //...) -clean_php_proto_compile: +clean_php_proto_compile: (cd php/example/php_proto_compile && bazel clean) -php_grpc_compile: +php_grpc_compile: (cd php/example/php_grpc_compile && bazel build //...) -clean_php_grpc_compile: +clean_php_grpc_compile: (cd php/example/php_grpc_compile && bazel clean) php: php_proto_compile php_grpc_compile clean_php: clean_php_proto_compile clean_php_grpc_compile -python_proto_compile: +python_proto_compile: (cd python/example/python_proto_compile && bazel build //...) -clean_python_proto_compile: +clean_python_proto_compile: (cd python/example/python_proto_compile && bazel clean) -python_grpc_compile: +python_grpc_compile: (cd python/example/python_grpc_compile && bazel build //...) -clean_python_grpc_compile: +clean_python_grpc_compile: (cd python/example/python_grpc_compile && bazel clean) -python_proto_library: +python_proto_library: (cd python/example/python_proto_library && bazel build //...) -clean_python_proto_library: +clean_python_proto_library: (cd python/example/python_proto_library && bazel clean) -python_grpc_library: +python_grpc_library: (cd python/example/python_grpc_library && bazel build //...) -clean_python_grpc_library: +clean_python_grpc_library: (cd python/example/python_grpc_library && bazel clean) python: python_proto_compile python_grpc_compile python_proto_library python_grpc_library clean_python: clean_python_proto_compile clean_python_grpc_compile clean_python_proto_library clean_python_grpc_library -ruby_proto_compile: +ruby_proto_compile: (cd ruby/example/ruby_proto_compile && bazel build //...) -clean_ruby_proto_compile: +clean_ruby_proto_compile: (cd ruby/example/ruby_proto_compile && bazel clean) -ruby_grpc_compile: +ruby_grpc_compile: (cd ruby/example/ruby_grpc_compile && bazel build //...) -clean_ruby_grpc_compile: +clean_ruby_grpc_compile: (cd ruby/example/ruby_grpc_compile && bazel clean) -ruby_proto_library: +ruby_proto_library: (cd ruby/example/ruby_proto_library && bazel build //...) -clean_ruby_proto_library: +clean_ruby_proto_library: (cd ruby/example/ruby_proto_library && bazel clean) -ruby_grpc_library: +ruby_grpc_library: (cd ruby/example/ruby_grpc_library && bazel build //...) -clean_ruby_grpc_library: +clean_ruby_grpc_library: (cd ruby/example/ruby_grpc_library && bazel clean) ruby: ruby_proto_compile ruby_grpc_compile ruby_proto_library ruby_grpc_library clean_ruby: clean_ruby_proto_compile clean_ruby_grpc_compile clean_ruby_proto_library clean_ruby_grpc_library -rust_proto_compile: +rust_proto_compile: (cd rust/example/rust_proto_compile && bazel build //...) -clean_rust_proto_compile: +clean_rust_proto_compile: (cd rust/example/rust_proto_compile && bazel clean) -rust_grpc_compile: +rust_grpc_compile: (cd rust/example/rust_grpc_compile && bazel build //...) -clean_rust_grpc_compile: +clean_rust_grpc_compile: (cd rust/example/rust_grpc_compile && bazel clean) -rust_proto_library: +rust_proto_library: (cd rust/example/rust_proto_library && bazel build //...) -clean_rust_proto_library: +clean_rust_proto_library: (cd rust/example/rust_proto_library && bazel clean) -rust_grpc_library: +rust_grpc_library: (cd rust/example/rust_grpc_library && bazel build //...) -clean_rust_grpc_library: +clean_rust_grpc_library: (cd rust/example/rust_grpc_library && bazel clean) rust: rust_proto_compile rust_grpc_compile rust_proto_library rust_grpc_library clean_rust: clean_rust_proto_compile clean_rust_grpc_compile clean_rust_proto_library clean_rust_grpc_library -scala_proto_compile: +scala_proto_compile: (cd scala/example/scala_proto_compile && bazel build //...) -clean_scala_proto_compile: +clean_scala_proto_compile: (cd scala/example/scala_proto_compile && bazel clean) -scala_grpc_compile: +scala_grpc_compile: (cd scala/example/scala_grpc_compile && bazel build //...) -clean_scala_grpc_compile: +clean_scala_grpc_compile: (cd scala/example/scala_grpc_compile && bazel clean) -scala_proto_library: +scala_proto_library: (cd scala/example/scala_proto_library && bazel build //...) -clean_scala_proto_library: +clean_scala_proto_library: (cd scala/example/scala_proto_library && bazel clean) -scala_grpc_library: +scala_grpc_library: (cd scala/example/scala_grpc_library && bazel build //...) -clean_scala_grpc_library: +clean_scala_grpc_library: (cd scala/example/scala_grpc_library && bazel clean) scala: scala_proto_compile scala_grpc_compile scala_proto_library scala_grpc_library clean_scala: clean_scala_proto_compile clean_scala_grpc_compile clean_scala_proto_library clean_scala_grpc_library -swift_proto_compile: +swift_proto_compile: (cd swift/example/swift_proto_compile && bazel build //...) -clean_swift_proto_compile: +clean_swift_proto_compile: (cd swift/example/swift_proto_compile && bazel clean) -swift_grpc_compile: +swift_grpc_compile: (cd swift/example/swift_grpc_compile && bazel build //...) -clean_swift_grpc_compile: +clean_swift_grpc_compile: (cd swift/example/swift_grpc_compile && bazel clean) -swift_proto_library: +swift_proto_library: (cd swift/example/swift_proto_library && bazel build //...) -clean_swift_proto_library: +clean_swift_proto_library: (cd swift/example/swift_proto_library && bazel clean) -swift_grpc_library: +swift_grpc_library: (cd swift/example/swift_grpc_library && bazel build //...) -clean_swift_grpc_library: +clean_swift_grpc_library: (cd swift/example/swift_grpc_library && bazel clean) swift: swift_proto_compile swift_grpc_compile swift_proto_library swift_grpc_library clean_swift: clean_swift_proto_compile clean_swift_grpc_compile clean_swift_proto_library clean_swift_grpc_library -gogo_proto_compile: +gogo_proto_compile: (cd github.com/gogo/protobuf/example/gogo_proto_compile && bazel build //...) -clean_gogo_proto_compile: +clean_gogo_proto_compile: (cd github.com/gogo/protobuf/example/gogo_proto_compile && bazel clean) -gogo_grpc_compile: +gogo_grpc_compile: (cd github.com/gogo/protobuf/example/gogo_grpc_compile && bazel build //...) -clean_gogo_grpc_compile: +clean_gogo_grpc_compile: (cd github.com/gogo/protobuf/example/gogo_grpc_compile && bazel clean) -gogo_proto_library: +gogo_proto_library: (cd github.com/gogo/protobuf/example/gogo_proto_library && bazel build //...) -clean_gogo_proto_library: +clean_gogo_proto_library: (cd github.com/gogo/protobuf/example/gogo_proto_library && bazel clean) -gogo_grpc_library: +gogo_grpc_library: (cd github.com/gogo/protobuf/example/gogo_grpc_library && bazel build //...) -clean_gogo_grpc_library: +clean_gogo_grpc_library: (cd github.com/gogo/protobuf/example/gogo_grpc_library && bazel clean) -gogofast_proto_compile: +gogofast_proto_compile: (cd github.com/gogo/protobuf/example/gogofast_proto_compile && bazel build //...) -clean_gogofast_proto_compile: +clean_gogofast_proto_compile: (cd github.com/gogo/protobuf/example/gogofast_proto_compile && bazel clean) -gogofast_grpc_compile: +gogofast_grpc_compile: (cd github.com/gogo/protobuf/example/gogofast_grpc_compile && bazel build //...) -clean_gogofast_grpc_compile: +clean_gogofast_grpc_compile: (cd github.com/gogo/protobuf/example/gogofast_grpc_compile && bazel clean) -gogofast_proto_library: +gogofast_proto_library: (cd github.com/gogo/protobuf/example/gogofast_proto_library && bazel build //...) -clean_gogofast_proto_library: +clean_gogofast_proto_library: (cd github.com/gogo/protobuf/example/gogofast_proto_library && bazel clean) -gogofast_grpc_library: +gogofast_grpc_library: (cd github.com/gogo/protobuf/example/gogofast_grpc_library && bazel build //...) -clean_gogofast_grpc_library: +clean_gogofast_grpc_library: (cd github.com/gogo/protobuf/example/gogofast_grpc_library && bazel clean) -gogofaster_proto_compile: +gogofaster_proto_compile: (cd github.com/gogo/protobuf/example/gogofaster_proto_compile && bazel build //...) -clean_gogofaster_proto_compile: +clean_gogofaster_proto_compile: (cd github.com/gogo/protobuf/example/gogofaster_proto_compile && bazel clean) -gogofaster_grpc_compile: +gogofaster_grpc_compile: (cd github.com/gogo/protobuf/example/gogofaster_grpc_compile && bazel build //...) -clean_gogofaster_grpc_compile: +clean_gogofaster_grpc_compile: (cd github.com/gogo/protobuf/example/gogofaster_grpc_compile && bazel clean) -gogofaster_proto_library: +gogofaster_proto_library: (cd github.com/gogo/protobuf/example/gogofaster_proto_library && bazel build //...) -clean_gogofaster_proto_library: +clean_gogofaster_proto_library: (cd github.com/gogo/protobuf/example/gogofaster_proto_library && bazel clean) -gogofaster_grpc_library: +gogofaster_grpc_library: (cd github.com/gogo/protobuf/example/gogofaster_grpc_library && bazel build //...) -clean_gogofaster_grpc_library: +clean_gogofaster_grpc_library: (cd github.com/gogo/protobuf/example/gogofaster_grpc_library && bazel clean) gogo: gogo_proto_compile gogo_grpc_compile gogo_proto_library gogo_grpc_library gogofast_proto_compile gogofast_grpc_compile gogofast_proto_library gogofast_grpc_library gogofaster_proto_compile gogofaster_grpc_compile gogofaster_proto_library gogofaster_grpc_library clean_gogo: clean_gogo_proto_compile clean_gogo_grpc_compile clean_gogo_proto_library clean_gogo_grpc_library clean_gogofast_proto_compile clean_gogofast_grpc_compile clean_gogofast_proto_library clean_gogofast_grpc_library clean_gogofaster_proto_compile clean_gogofaster_grpc_compile clean_gogofaster_proto_library clean_gogofaster_grpc_library -gateway_grpc_compile: +gateway_grpc_compile: (cd github.com/grpc-ecosystem/grpc-gateway/example/gateway_grpc_compile && bazel build //...) -clean_gateway_grpc_compile: +clean_gateway_grpc_compile: (cd github.com/grpc-ecosystem/grpc-gateway/example/gateway_grpc_compile && bazel clean) -gateway_swagger_compile: +gateway_swagger_compile: (cd github.com/grpc-ecosystem/grpc-gateway/example/gateway_swagger_compile && bazel build //...) -clean_gateway_swagger_compile: +clean_gateway_swagger_compile: (cd github.com/grpc-ecosystem/grpc-gateway/example/gateway_swagger_compile && bazel clean) -gateway_grpc_library: +gateway_grpc_library: (cd github.com/grpc-ecosystem/grpc-gateway/example/gateway_grpc_library && bazel build //...) -clean_gateway_grpc_library: +clean_gateway_grpc_library: (cd github.com/grpc-ecosystem/grpc-gateway/example/gateway_grpc_library && bazel clean) grpc-gateway: gateway_grpc_compile gateway_swagger_compile gateway_grpc_library clean_grpc-gateway: clean_gateway_grpc_compile clean_gateway_swagger_compile clean_gateway_grpc_library -closure_grpc_compile: +closure_grpc_compile: (cd github.com/stackb/grpc.js/example/closure_grpc_compile && bazel build //...) -clean_closure_grpc_compile: +clean_closure_grpc_compile: (cd github.com/stackb/grpc.js/example/closure_grpc_compile && bazel clean) -closure_grpc_library: +closure_grpc_library: (cd github.com/stackb/grpc.js/example/closure_grpc_library && bazel build //...) -clean_closure_grpc_library: +clean_closure_grpc_library: (cd github.com/stackb/grpc.js/example/closure_grpc_library && bazel clean) grpc.js: closure_grpc_compile closure_grpc_library clean_grpc.js: clean_closure_grpc_compile clean_closure_grpc_library -closure_grpc_compile: +closure_grpc_compile: (cd github.com/grpc/grpc-web/example/closure_grpc_compile && bazel build //...) -clean_closure_grpc_compile: +clean_closure_grpc_compile: (cd github.com/grpc/grpc-web/example/closure_grpc_compile && bazel clean) -commonjs_grpc_compile: +commonjs_grpc_compile: (cd github.com/grpc/grpc-web/example/commonjs_grpc_compile && bazel build //...) -clean_commonjs_grpc_compile: +clean_commonjs_grpc_compile: (cd github.com/grpc/grpc-web/example/commonjs_grpc_compile && bazel clean) -commonjs_dts_grpc_compile: +commonjs_dts_grpc_compile: (cd github.com/grpc/grpc-web/example/commonjs_dts_grpc_compile && bazel build //...) -clean_commonjs_dts_grpc_compile: +clean_commonjs_dts_grpc_compile: (cd github.com/grpc/grpc-web/example/commonjs_dts_grpc_compile && bazel clean) -ts_grpc_compile: +ts_grpc_compile: (cd github.com/grpc/grpc-web/example/ts_grpc_compile && bazel build //...) -clean_ts_grpc_compile: +clean_ts_grpc_compile: (cd github.com/grpc/grpc-web/example/ts_grpc_compile && bazel clean) -closure_grpc_library: +closure_grpc_library: (cd github.com/grpc/grpc-web/example/closure_grpc_library && bazel build //...) -clean_closure_grpc_library: +clean_closure_grpc_library: (cd github.com/grpc/grpc-web/example/closure_grpc_library && bazel clean) grpc-web: closure_grpc_compile commonjs_grpc_compile commonjs_dts_grpc_compile ts_grpc_compile closure_grpc_library clean_grpc-web: clean_closure_grpc_compile clean_commonjs_grpc_compile clean_commonjs_dts_grpc_compile clean_ts_grpc_compile clean_closure_grpc_library -ts_proto_compile: +ts_proto_compile: (cd github.com/improbable-eng/ts-protoc-gen/example/ts_proto_compile && bazel build //...) -clean_ts_proto_compile: +clean_ts_proto_compile: (cd github.com/improbable-eng/ts-protoc-gen/example/ts_proto_compile && bazel clean) ts-protoc-gen: ts_proto_compile diff --git a/README.md b/README.md index ea9327982..3ed4d3a90 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# `rules_proto` +# `rules_proto` Bazel skylark rules for building protocol buffers +/- gRPC :sparkles:. @@ -157,17 +157,17 @@ access that rule by adding `_pb` at the end of the rule name, like `bazel build * There are generally four rule flavors for any language `{lang}`: `{lang}_proto_compile`, `{lang}_proto_library`, `{lang}_grpc_compile`, and -`{lang}_grpc_library`. +`{lang}_grpc_library`. * If you are solely interested in the source code artifacts, use the - `{lang}_{proto|grpc}_compile` rule. + `{lang}_{proto|grpc}_compile` rule. * If your proto file has services, use the `{lang}_{grpc}_{compile|library}` - rule instead. + rule instead. * Load any external dependencies needed for the rule via the `load("@build_stack_rules_proto//{lang}:deps.bzl", - "{lang}_{proto|grpc}_{compile|library}")`. + "{lang}_{proto|grpc}_{compile|library}")`. ## Rules @@ -298,7 +298,7 @@ demonstrating standalone usage. The root directory contains the base rule defintions: * `plugin.bzl`: A build rule that defines the name, tool binary, and options for - a particular proto plugin. + a particular proto plugin. * `compile.bzl`: A build rule that contains the `proto_compile` rule. This rule calls `protoc` with a given list of plugins and generates output files. @@ -316,7 +316,7 @@ Follow the pattern seen in the multiple examples in this repository. The basic 1. Load the plugin rule: `load("@build_stack_rules_proto//:plugin.bzl", "proto_plugin")`. 2. Define the rule, giving it a `name`, `options` (not mandatory), `tool`, and - `outputs`. + `outputs`. 3. `tool` is a label that refers to the binary executable for the plugin itself. 4. `outputs` is a list of strings that predicts the pattern of files generated by the plugin. Specifying outputs is the only attribute that requires much @@ -325,4 +325,3 @@ Follow the pattern seen in the multiple examples in this repository. The basic ## Contributing Contributions welcome; please create Issues or GitHub pull requests. - diff --git a/WORKSPACE b/WORKSPACE index 312f848ba..8de1a1b4e 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -14,7 +14,7 @@ http_archive( url = "https://github.com/google/protobuf/archive/%s.tar.gz" % PROTOBUF_VERSION, sha256 = "5d82a718e271e7fda626f983628e4b4601221788c2244763a9e57eda4cc667dd", strip_prefix = "protobuf-" + PROTOBUF_VERSION, -) +) # ========================================= @@ -232,7 +232,7 @@ gogo_grpc_library() ## ## Must have swiftc on your system. To install on ubuntu 17.10, here's what I did: ## -## $ sudo apt install ubuntu-make; umake swift +## $ sudo apt install ubuntu-make; umake swift ## $ vi `/.bashrc` and update PATH to include ~/.local/share/umake/swift/swift-lang/usr/bin ## @@ -241,7 +241,7 @@ load("//swift:deps.bzl", "swift_grpc_library") swift_grpc_library() load("//swift:repositories.bzl", "swift_toolchain") -# Default values work with linux, x86_64, /usr/local/bin/clang. +# Default values work with linux, x86_64, /usr/local/bin/clang. swift_toolchain( root = "/home/pcj/.local/share/umake/swift/swift-lang/usr", ) @@ -299,7 +299,7 @@ load("@build_bazel_rules_android//android:sdk_repository.bzl", "android_sdk_repo # Why is this not a workspace rule? This is so painful. # $ curl -O -J -L https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip # $ mkdir ~/android-sdk -# $ unzip in that dir +# $ unzip in that dir # $ tools/bin/sdkmanager --list # $ tools/bin/sdkmanager "platforms;android-28" "build-tools;28.0.3" # $ export ANDROID_HOME="/home/pcj/android-sdk/" @@ -323,4 +323,4 @@ load("@com_github_grpc_ecosystem_grpc_gateway//:repositories.bzl", grpc_gateway_ grpc_gateway_repositories() load("//tools/exgen:deps.bzl", "exgen_deps") -exgen_deps() \ No newline at end of file +exgen_deps() diff --git a/android/BUILD.bazel b/android/BUILD.bazel index 327f5eb20..40cc731e6 100644 --- a/android/BUILD.bazel +++ b/android/BUILD.bazel @@ -1,4 +1,3 @@ - load("//:plugin.bzl", "proto_plugin") proto_plugin( diff --git a/android/README.md b/android/README.md index 476a98b2d..e29dd3d1b 100644 --- a/android/README.md +++ b/android/README.md @@ -144,7 +144,7 @@ Generates android protobuf library ```python # The set of dependencies loaded here is excessive for android proto alone -# (but simplifies our setup) +# (but simplifies our setup) load("@build_stack_rules_proto//:deps.bzl", "io_grpc_grpc_java") io_grpc_grpc_java() @@ -322,4 +322,3 @@ def android_grpc_library(**kwargs): | include_imports | `bool` | `True` | Pass the --include_imports argument to the protoc_plugin | | include_source_info | `bool` | `True` | Pass the --include_source_info argument to the protoc_plugin | | transitive | `bool` | `False` | Generated outputs for *.proto directly named in `deps` AND all transitive proto_library dependencies | - diff --git a/android/android_grpc_library.bzl b/android/android_grpc_library.bzl index 0be9c7ad4..3a19062d3 100644 --- a/android/android_grpc_library.bzl +++ b/android/android_grpc_library.bzl @@ -26,4 +26,3 @@ def android_grpc_library(**kwargs): ], visibility = visibility, ) - diff --git a/android/android_proto_library.bzl b/android/android_proto_library.bzl index 5f25814e9..770edd81a 100644 --- a/android/android_proto_library.bzl +++ b/android/android_proto_library.bzl @@ -26,4 +26,3 @@ def android_proto_library(**kwargs): ], visibility = visibility, ) - diff --git a/android/deps.bzl b/android/deps.bzl index cdbbe55dd..aa48c765e 100644 --- a/android/deps.bzl +++ b/android/deps.bzl @@ -1,7 +1,7 @@ -load("//:deps.bzl", +load("//:deps.bzl", "build_bazel_rules_android", "com_google_protobuf_lite", - "com_google_protobuf", + "com_google_protobuf", "gmaven_rules", "io_grpc_grpc_java", ) @@ -20,5 +20,5 @@ def android_proto_library(**kwargs): gmaven_rules(**kwargs) def android_grpc_library(**kwargs): - android_grpc_compile(**kwargs) - android_proto_library(**kwargs) \ No newline at end of file + android_grpc_compile(**kwargs) + android_proto_library(**kwargs) diff --git a/android/example/android_grpc_compile/WORKSPACE b/android/example/android_grpc_compile/WORKSPACE index 00abed304..dcfeab71a 100644 --- a/android/example/android_grpc_compile/WORKSPACE +++ b/android/example/android_grpc_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/android/example/android_grpc_library/WORKSPACE b/android/example/android_grpc_library/WORKSPACE index 729412bf3..7dd95990f 100644 --- a/android/example/android_grpc_library/WORKSPACE +++ b/android/example/android_grpc_library/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/android/example/android_proto_compile/WORKSPACE b/android/example/android_proto_compile/WORKSPACE index b59db0d80..152db5cac 100644 --- a/android/example/android_proto_compile/WORKSPACE +++ b/android/example/android_proto_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/android/example/android_proto_library/WORKSPACE b/android/example/android_proto_library/WORKSPACE index 60ae4dc8f..7d00561d0 100644 --- a/android/example/android_proto_library/WORKSPACE +++ b/android/example/android_proto_library/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ @@ -17,7 +16,7 @@ local_repository( # The set of dependencies loaded here is excessive for android proto alone -# (but simplifies our setup) +# (but simplifies our setup) load("@build_stack_rules_proto//:deps.bzl", "io_grpc_grpc_java") io_grpc_grpc_java() diff --git a/android/example/routeguide/BUILD.bazel b/android/example/routeguide/BUILD.bazel index e48208a1e..03fbcbdd9 100644 --- a/android/example/routeguide/BUILD.bazel +++ b/android/example/routeguide/BUILD.bazel @@ -10,7 +10,7 @@ android_grpc_library( # name = "clientlib", # manifest = "AndroidManifest.xml", # custom_package = "io.grpc.routeguideexample", - + # ) # NOTE: at the moment this is not a routeguide client at all. Only testing that @@ -23,7 +23,7 @@ android_binary( #proguard_specs = ["proguard-rules.pro"], multidex = 'native', resource_files = glob(["src/main/res/**"]), - srcs = glob(["src/main/java/**"]), + srcs = glob(["src/main/java/**"]), deps = [ ":routeguide", "@com_android_support_appcompat_v7_28_0_0//aar", diff --git a/android/example/routeguide/src/main/res/values/colors.xml b/android/example/routeguide/src/main/res/values/colors.xml index 1c10bfe70..3ab3e9cbc 100644 --- a/android/example/routeguide/src/main/res/values/colors.xml +++ b/android/example/routeguide/src/main/res/values/colors.xml @@ -4,4 +4,3 @@ #303F9F #FF4081 - diff --git a/android/example/routeguide/src/main/res/values/styles.xml b/android/example/routeguide/src/main/res/values/styles.xml index 7312f6a3b..5885930df 100644 --- a/android/example/routeguide/src/main/res/values/styles.xml +++ b/android/example/routeguide/src/main/res/values/styles.xml @@ -9,4 +9,3 @@ - diff --git a/closure/BUILD.bazel b/closure/BUILD.bazel index 7e9e40651..1a892fc41 100644 --- a/closure/BUILD.bazel +++ b/closure/BUILD.bazel @@ -1,12 +1,11 @@ - load("//:plugin.bzl", "proto_plugin") proto_plugin( name = "js", options = [ - "import_style=closure", - "binary", - "error_on_name_conflict", + "import_style=closure", + "binary", + "error_on_name_conflict", "library={name}", ], out = "{name}.js", diff --git a/closure/README.md b/closure/README.md index b3a6edee7..0adbcb171 100644 --- a/closure/README.md +++ b/closure/README.md @@ -154,4 +154,3 @@ def closure_proto_library(**kwargs): | include_imports | `bool` | `True` | Pass the --include_imports argument to the protoc_plugin | | include_source_info | `bool` | `True` | Pass the --include_source_info argument to the protoc_plugin | | transitive | `bool` | `False` | Generated outputs for *.proto directly named in `deps` AND all transitive proto_library dependencies | - diff --git a/closure/buildozer_http_archive.bzl b/closure/buildozer_http_archive.bzl index 0b8a59078..0a4be91d6 100644 --- a/closure/buildozer_http_archive.bzl +++ b/closure/buildozer_http_archive.bzl @@ -1,4 +1,3 @@ - load("@bazel_tools//tools/build_defs/repo:utils.bzl", "workspace_and_buildfile") def _http_archive_impl(ctx): @@ -104,7 +103,7 @@ rule lacks the patch functionality of the original. Following download and extraction of the archive, this rule will: 1. Execute a single buildozer command. -2. Execute a list of sed commands. +2. Execute a list of sed commands. The buildozer command is constructed from the `replace_deps` and `label_list` attributes. For each A -> B mapping in the replace_deps dict, a command like @@ -117,5 +116,5 @@ sed commands might not be necessary if buildozer was capable of replacement within *.bzl files, but currently it cannot. This attribute is a string_list_dict, meaning the dict keys are filename to modify (in place), and each dict value is are list of sed commands to apply onto that file. The value -typically looks something like 's|A|B|g'. +typically looks something like 's|A|B|g'. """ diff --git a/closure/closure_proto_library.bzl b/closure/closure_proto_library.bzl index da527afe2..bbba16fef 100644 --- a/closure/closure_proto_library.bzl +++ b/closure/closure_proto_library.bzl @@ -32,4 +32,3 @@ def closure_proto_library(**kwargs): name = kwargs.get("name") deps = kwargs.get("deps") visibility = kwargs.get("visibility") - diff --git a/closure/deps.bzl b/closure/deps.bzl index 401a06dc3..94cbeb5b8 100644 --- a/closure/deps.bzl +++ b/closure/deps.bzl @@ -1,5 +1,5 @@ -load("//:deps.bzl", - "com_google_protobuf", +load("//:deps.bzl", + "com_google_protobuf", "io_bazel_rules_closure", ) diff --git a/closure/example/closure_proto_compile/WORKSPACE b/closure/example/closure_proto_compile/WORKSPACE index e7955eaa7..63b585ab8 100644 --- a/closure/example/closure_proto_compile/WORKSPACE +++ b/closure/example/closure_proto_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/closure/example/closure_proto_library/WORKSPACE b/closure/example/closure_proto_library/WORKSPACE index 02439759b..9477ad7a1 100644 --- a/closure/example/closure_proto_library/WORKSPACE +++ b/closure/example/closure_proto_library/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/closure/example/routeguide/BUILD.bazel b/closure/example/routeguide/BUILD.bazel index 3f468895c..8cc56d575 100644 --- a/closure/example/routeguide/BUILD.bazel +++ b/closure/example/routeguide/BUILD.bazel @@ -1,4 +1,3 @@ - load( "@io_bazel_rules_closure//closure:defs.bzl", "closure_js_library", diff --git a/closure/example/routeguide/client/BUILD.bazel b/closure/example/routeguide/client/BUILD.bazel index e6e53edc2..29635ac62 100644 --- a/closure/example/routeguide/client/BUILD.bazel +++ b/closure/example/routeguide/client/BUILD.bazel @@ -1,4 +1,3 @@ - load( "@io_bazel_rules_closure//closure:defs.bzl", "closure_js_library", diff --git a/closure/example/routeguide/client/client.js b/closure/example/routeguide/client/client.js index 9e61e4e6a..fb1cd816f 100644 --- a/closure/example/routeguide/client/client.js +++ b/closure/example/routeguide/client/client.js @@ -12,15 +12,15 @@ class Client { constructor() { /** * A list of features - * @const @private @type {!Array} + * @const @private @type {!Array} */ this.features_ = []; } /** * Add a feature. - * - * @param {!Feature} feature + * + * @param {!Feature} feature */ addFeature(feature) { this.features_.push(feature); @@ -28,8 +28,8 @@ class Client { /** * Get a list of features. - * - * @return {!Array} + * + * @return {!Array} */ getFeatures() { return arrays.clone(this.features_); @@ -44,4 +44,4 @@ class Client { } -exports = Client; \ No newline at end of file +exports = Client; diff --git a/closure/example/routeguide/client/client_test.js b/closure/example/routeguide/client/client_test.js index fc0b5f055..0eb5cd3a0 100644 --- a/closure/example/routeguide/client/client_test.js +++ b/closure/example/routeguide/client/client_test.js @@ -30,4 +30,3 @@ testSuite({ }, }); - diff --git a/compile.bzl b/compile.bzl index e351414c0..a2bebc7cf 100644 --- a/compile.bzl +++ b/compile.bzl @@ -78,8 +78,8 @@ def _pascal_objc(s): https://github.com/protocolbuffers/protobuf/blob/54176b26a9be6c9903b375596b778f51f5947921/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc#L91 - Args: - s (string): The input string to be capitalized. + Args: + s (string): The input string to be capitalized. Returns: (string): The capitalized string. """ segments = [] @@ -114,7 +114,7 @@ def _rust_keyword(s): def _get_output_sibling_file(pattern, proto, descriptor): - """Get the correct place to + """Get the correct place to The ctx.actions.declare_file has a 'sibling = ' feature that allows one to declare files in the same directory as the sibling. @@ -127,7 +127,7 @@ def _get_output_sibling_file(pattern, proto, descriptor): pattern: the input filename pattern proto: the .proto (in the staging area) descriptor: the descriptor that marks the staging root. - + Returns: the to be used as the correct sibling. """ @@ -141,27 +141,27 @@ def _get_plugin_out(ctx, plugin): if not plugin.out: return None filename = plugin.out - filename = filename.replace("{name}", ctx.label.name) + filename = filename.replace("{name}", ctx.label.name) return filename def _get_output_filename(src, plugin, pattern): - """Build the predicted filename for file generated by the given plugin. + """Build the predicted filename for file generated by the given plugin. A 'proto_plugin' rule allows one to define the predicted outputs. For flexibility, we allow special tokens in the output filename that get replaced here. The overall pattern is '{token}' mimicking the python - 'format' feature. + 'format' feature. Additionally, there are '|' characters like '{basename|pascal}' that can be read as 'take the basename and pipe that through the pascal function'. - Args: - src: the .proto + Args: + src: the .proto plugin: the object. pattern: the input pattern string - Returns: + Returns: the replaced string """ @@ -178,7 +178,7 @@ def _get_output_filename(src, plugin, pattern): basename = basename[:-11] filename = basename - + if pattern.find("{basename}") != -1: filename = pattern.replace("{basename}", basename) elif pattern.find("{basename|pascal}") != -1: @@ -215,7 +215,7 @@ def copy_proto(ctx, descriptor, src): ctx: the object descriptor: the descriptor that marks the root of the 'staging area'. src: the source .proto - + Returns: for the copied .proto """ @@ -235,7 +235,7 @@ def _copy_jar_to_srcjar(ctx, jar): Args: ctx: the object jar: the of a jar containing source files. - + Returns: for the renamed file """ @@ -250,12 +250,12 @@ def _copy_jar_to_srcjar(ctx, jar): def _get_plugin_option(ctx, option): - """Build a plugin option + """Build a plugin option Args: ctx: the object option: string from the - + Returns: for the --plugin_out= arg """ @@ -268,7 +268,7 @@ def _get_plugin_options(ctx, options): Args: ctx: the object options: list options from the - + Returns: for the --plugin_out= arg """ @@ -301,16 +301,16 @@ def get_plugin_out_arg(ctx, outdir, plugin, plugin_outfiles): # global plugin_options list (if they exist) options = getattr(plugin, "options", []) + ctx.attr.plugin_options if options: - arg = "%s:%s" % (",".join(_get_plugin_options(ctx, options)), arg) - return "--%s_out=%s" % (plugin.name, arg) + arg = "%s:%s" % (",".join(_get_plugin_options(ctx, options)), arg) + return "--%s_out=%s" % (plugin.name, arg) def _apply_plugin_transitivity_rules(ctx, targets, plugin): """Process the proto target list according to plugin transitivity rules - + Args: ctx: the object - targets: the dict of .proto files that we intend to compile. + targets: the dict of .proto files that we intend to compile. plugin: the object. Returns: @@ -358,11 +358,11 @@ def _apply_plugin_transitivity_rules(ctx, targets, plugin): def _get_plugin_outputs(ctx, descriptor, outputs, src, proto, plugin): """Get the predicted generated outputs for a given plugin - + Args: ctx: the object descriptor: the descriptor - outputs: the list of outputs. + outputs: the list of outputs. src: the orginal .proto source . proto: the copied .proto (the one in the package 'staging area') plugin: the object. @@ -387,7 +387,7 @@ def get_plugin_runfiles(tool): if not tool: return files - info = tool[DefaultInfo] + info = tool[DefaultInfo] if not info: return files @@ -432,7 +432,7 @@ def proto_compile_impl(ctx): # > A list of ProtoInfo deps = [dep.proto for dep in ctx.attr.deps] - # > A list of PluginInfo + # > A list of PluginInfo plugins = [plugin[ProtoPluginInfo] for plugin in ctx.attr.plugins] # > The list of .proto files that will exist in the 'staging @@ -446,7 +446,7 @@ def proto_compile_impl(ctx): # transitive .protos. For example, even though we might transitively depend # on 'google/protobuf/any.proto', we don't necessarily want to actually # generate artifacts for it when compiling 'foo.proto'. Maintained as a dict - # for set semantics. The key is the value from File.path. + # for set semantics. The key is the value from File.path. targets = {} # > A mapping from plugin name to the plugin tool. Used to @@ -456,7 +456,7 @@ def proto_compile_impl(ctx): # A mapping from PluginInfo.name to File. In the case # of plugins that specify a single output 'archive' (like java), we gather # them in this dict. It is used to generate args like - # '--java_out=libjava.jar'. + # '--java_out=libjava.jar'. plugin_outfiles = {} # > The list of srcjars that we're generating (like @@ -466,9 +466,9 @@ def proto_compile_impl(ctx): # > The list of generated artifacts like 'foo_pb2.py' that we # expect to be produced. outputs = [] - + # Additional data files from plugin.data needed by plugin tools that are not - # single binaries. + # single binaries. data = [] ### @@ -484,7 +484,7 @@ def proto_compile_impl(ctx): # post-process them to have a 'srcjar' extension (java_library rules don't # accept source jars with a 'jar' extension) for plugin in plugins: - if plugin.executable: + if plugin.executable: plugin_tools[plugin.name] = plugin.executable data += plugin.data + get_plugin_runfiles(plugin.tool) @@ -508,7 +508,7 @@ def proto_compile_impl(ctx): # processed this one, skip it to avoid declaring duplicate outputs. # Create an action to copy the proto into our staging area. Consult the # plugin to assemble the actual list of predicted generated artifacts - # and save these in the 'outputs' list. + # and save these in the 'outputs' list. for src in dep.direct_sources: if targets.get(src.path): continue @@ -535,7 +535,7 @@ def proto_compile_impl(ctx): ### # If the 'transitive = true' was enabled, we collected all the protos into - # the 'targets' list. + # the 'targets' list. # At this point we want to post-process that list and remove any protos that # might be incompatible with the plugin transitivity rules. if ctx.attr.transitive: @@ -557,7 +557,7 @@ def proto_compile_impl(ctx): # By default we have a single 'proto_path' argument at the 'staging area' # root. - args += ["--proto_path=%s" % outdir] + args += ["--proto_path=%s" % outdir] if ctx.attr.include_imports: args += ["--include_imports"] @@ -566,9 +566,9 @@ def proto_compile_impl(ctx): args += ["--include_source_info"] for plugin in plugins: - args += [get_plugin_out_arg(ctx, outdir, plugin, plugin_outfiles)] + args += [get_plugin_out_arg(ctx, outdir, plugin, plugin_outfiles)] - args += ["--plugin=protoc-gen-%s=%s" % (k, v.path) for k, v in plugin_tools.items()] + args += ["--plugin=protoc-gen-%s=%s" % (k, v.path) for k, v in plugin_tools.items()] args += [proto.path for proto in targets.values()] @@ -589,7 +589,7 @@ def proto_compile_impl(ctx): if verbose > 3: command = "env && " + command for f in outputs: - print("expected output: %q", f.path) + print("expected output: %q", f.path) ctx.actions.run_shell( mnemonic = mnemonic, @@ -604,7 +604,7 @@ def proto_compile_impl(ctx): # The files for 'DefaultInfo' include any explicit outputs for the rule. If # we are generating srcjars, use those as the final outputs rather than - # their '.jar' intermediates. Otherwise include all the file outputs. + # their '.jar' intermediates. Otherwise include all the file outputs. # NOTE: this looks a little wonky here. It probably works in simple cases # where there list of plugins has length 1 OR all outputting to jars OR all # not outputting to jars. Probably would break here if they were mixed. @@ -697,7 +697,7 @@ def invoke_transitive(proto_compile_rule, name_suffix, kwargs): Returns: The name of the invoked rule. This can be used in the srcs label of a library rule. - """ + """ deps = kwargs.get("deps") has_services = kwargs.get("has_services") @@ -707,7 +707,7 @@ def invoke_transitive(proto_compile_rule, name_suffix, kwargs): outputs = kwargs.get("outputs") plugin_options = kwargs.get("plugin_options") plugins = kwargs.get("plugins") - protoc = kwargs.get("protoc") + protoc = kwargs.get("protoc") transitive = kwargs.get("transitive", True) verbose = kwargs.get("verbose") visibility = kwargs.get("visibility") @@ -731,4 +731,3 @@ def invoke_transitive(proto_compile_rule, name_suffix, kwargs): ) return rule_name - diff --git a/cpp/BUILD.bazel b/cpp/BUILD.bazel index f1700a2f7..5db46e35c 100644 --- a/cpp/BUILD.bazel +++ b/cpp/BUILD.bazel @@ -1,4 +1,3 @@ - load("//:plugin.bzl", "proto_plugin") proto_plugin( diff --git a/cpp/README.md b/cpp/README.md index c3d601ec3..dba27af36 100644 --- a/cpp/README.md +++ b/cpp/README.md @@ -285,4 +285,3 @@ def cpp_grpc_library(**kwargs): | include_imports | `bool` | `True` | Pass the --include_imports argument to the protoc_plugin | | include_source_info | `bool` | `True` | Pass the --include_source_info argument to the protoc_plugin | | transitive | `bool` | `False` | Generated outputs for *.proto directly named in `deps` AND all transitive proto_library dependencies | - diff --git a/cpp/cpp_grpc_library.bzl b/cpp/cpp_grpc_library.bzl index ce1860271..a5bf665c2 100644 --- a/cpp/cpp_grpc_library.bzl +++ b/cpp/cpp_grpc_library.bzl @@ -25,4 +25,3 @@ def cpp_grpc_library(**kwargs): includes = [name_pb], visibility = visibility, ) - diff --git a/cpp/cpp_proto_library.bzl b/cpp/cpp_proto_library.bzl index fb827ac10..59d0eec33 100644 --- a/cpp/cpp_proto_library.bzl +++ b/cpp/cpp_proto_library.bzl @@ -21,4 +21,3 @@ def cpp_proto_library(**kwargs): includes = [name_pb], visibility = visibility, ) - diff --git a/cpp/deps.bzl b/cpp/deps.bzl index 02010a233..eae7fa7f2 100644 --- a/cpp/deps.bzl +++ b/cpp/deps.bzl @@ -1,6 +1,6 @@ -load("//:deps.bzl", +load("//:deps.bzl", "com_github_grpc_grpc", - "com_google_protobuf", + "com_google_protobuf", "external_protobuf_clib", ) @@ -17,4 +17,4 @@ def cpp_proto_library(**kwargs): def cpp_grpc_library(**kwargs): cpp_grpc_compile(**kwargs) - cpp_proto_library(**kwargs) \ No newline at end of file + cpp_proto_library(**kwargs) diff --git a/cpp/example/cpp_grpc_compile/WORKSPACE b/cpp/example/cpp_grpc_compile/WORKSPACE index acbdcdb76..9b44f5df2 100644 --- a/cpp/example/cpp_grpc_compile/WORKSPACE +++ b/cpp/example/cpp_grpc_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/cpp/example/cpp_grpc_library/WORKSPACE b/cpp/example/cpp_grpc_library/WORKSPACE index c8e3517ac..e43ad39ac 100644 --- a/cpp/example/cpp_grpc_library/WORKSPACE +++ b/cpp/example/cpp_grpc_library/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/cpp/example/cpp_proto_compile/WORKSPACE b/cpp/example/cpp_proto_compile/WORKSPACE index 4ddfc864e..30d93912f 100644 --- a/cpp/example/cpp_proto_compile/WORKSPACE +++ b/cpp/example/cpp_proto_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/cpp/example/cpp_proto_library/WORKSPACE b/cpp/example/cpp_proto_library/WORKSPACE index 17beeb5a4..6d91b3699 100644 --- a/cpp/example/cpp_proto_library/WORKSPACE +++ b/cpp/example/cpp_proto_library/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/cpp/example/routeguide/client.cc b/cpp/example/routeguide/client.cc index 1a55e0928..c525ba3c4 100644 --- a/cpp/example/routeguide/client.cc +++ b/cpp/example/routeguide/client.cc @@ -233,4 +233,4 @@ int main(int argc, char** argv) { guide.RouteChat(); return 0; -} \ No newline at end of file +} diff --git a/cpp/example/routeguide/feature_test.cc b/cpp/example/routeguide/feature_test.cc index 25f08ee80..8f7441451 100644 --- a/cpp/example/routeguide/feature_test.cc +++ b/cpp/example/routeguide/feature_test.cc @@ -23,4 +23,4 @@ TEST_F(FeatureTest, testName) { int main(int ac, char* av[]) { testing::InitGoogleTest(&ac, av); return RUN_ALL_TESTS(); -} \ No newline at end of file +} diff --git a/cpp/example/routeguide/server.cc b/cpp/example/routeguide/server.cc index 9362d11e4..62d6dce65 100644 --- a/cpp/example/routeguide/server.cc +++ b/cpp/example/routeguide/server.cc @@ -185,4 +185,4 @@ int main(int argc, char** argv) { RunServer(db); return 0; -} \ No newline at end of file +} diff --git a/csharp/BUILD.bazel b/csharp/BUILD.bazel index 2ce3d22ac..33792d9ee 100644 --- a/csharp/BUILD.bazel +++ b/csharp/BUILD.bazel @@ -1,4 +1,3 @@ - load("//:plugin.bzl", "proto_plugin") proto_plugin( diff --git a/csharp/README.md b/csharp/README.md index 769d02613..c4bbadc6d 100644 --- a/csharp/README.md +++ b/csharp/README.md @@ -203,14 +203,14 @@ def csharp_proto_library(**kwargs): transitive = transitive, verbose = verbose, ) - + core_library( name = name, srcs = [name_pb], deps = [ "@google.protobuf//:core", "@io_bazel_rules_dotnet//dotnet/stdlib.core:system.io.dll", - ], + ], visibility = visibility, ) @@ -302,7 +302,7 @@ def csharp_grpc_library(**kwargs): transitive = transitive, verbose = verbose, ) - + core_library( name = name, srcs = [name_pb], @@ -310,8 +310,8 @@ def csharp_grpc_library(**kwargs): "@google.protobuf//:core", "@io_bazel_rules_dotnet//dotnet/stdlib.core:system.io.dll", "@grpc.core//:core", - "@system.interactive.async//:core", - ], + "@system.interactive.async//:core", + ], visibility = visibility, ) @@ -336,4 +336,3 @@ def csharp_grpc_library(**kwargs): | include_imports | `bool` | `True` | Pass the --include_imports argument to the protoc_plugin | | include_source_info | `bool` | `True` | Pass the --include_source_info argument to the protoc_plugin | | transitive | `bool` | `False` | Generated outputs for *.proto directly named in `deps` AND all transitive proto_library dependencies | - diff --git a/csharp/csharp_grpc_library.bzl b/csharp/csharp_grpc_library.bzl index 4ef4c6e00..dc25a03b9 100644 --- a/csharp/csharp_grpc_library.bzl +++ b/csharp/csharp_grpc_library.bzl @@ -16,7 +16,7 @@ def csharp_grpc_library(**kwargs): transitive = transitive, verbose = verbose, ) - + core_library( name = name, srcs = [name_pb], @@ -24,8 +24,7 @@ def csharp_grpc_library(**kwargs): "@google.protobuf//:core", "@io_bazel_rules_dotnet//dotnet/stdlib.core:system.io.dll", "@grpc.core//:core", - "@system.interactive.async//:core", - ], + "@system.interactive.async//:core", + ], visibility = visibility, ) - diff --git a/csharp/csharp_proto_library.bzl b/csharp/csharp_proto_library.bzl index 78db048f5..10a359623 100644 --- a/csharp/csharp_proto_library.bzl +++ b/csharp/csharp_proto_library.bzl @@ -16,14 +16,13 @@ def csharp_proto_library(**kwargs): transitive = transitive, verbose = verbose, ) - + core_library( name = name, srcs = [name_pb], deps = [ "@google.protobuf//:core", "@io_bazel_rules_dotnet//dotnet/stdlib.core:system.io.dll", - ], + ], visibility = visibility, ) - diff --git a/csharp/deps.bzl b/csharp/deps.bzl index b3148f36a..9086f42ee 100644 --- a/csharp/deps.bzl +++ b/csharp/deps.bzl @@ -1,6 +1,6 @@ -load("//:deps.bzl", +load("//:deps.bzl", "com_github_grpc_grpc", - "com_google_protobuf", + "com_google_protobuf", "io_bazel_rules_dotnet", ) diff --git a/csharp/example/csharp_grpc_compile/WORKSPACE b/csharp/example/csharp_grpc_compile/WORKSPACE index b79cf3ac5..c98c322c5 100644 --- a/csharp/example/csharp_grpc_compile/WORKSPACE +++ b/csharp/example/csharp_grpc_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/csharp/example/csharp_grpc_library/WORKSPACE b/csharp/example/csharp_grpc_library/WORKSPACE index 8c4ee437a..41fed3a7f 100644 --- a/csharp/example/csharp_grpc_library/WORKSPACE +++ b/csharp/example/csharp_grpc_library/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ @@ -37,4 +36,3 @@ load("@build_stack_rules_proto//csharp/nuget:nuget.bzl", "nuget_grpc_packages") nuget_protobuf_packages() nuget_grpc_packages() - diff --git a/csharp/example/csharp_proto_compile/WORKSPACE b/csharp/example/csharp_proto_compile/WORKSPACE index ffd49ebc4..f624468d2 100644 --- a/csharp/example/csharp_proto_compile/WORKSPACE +++ b/csharp/example/csharp_proto_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/csharp/example/csharp_proto_library/WORKSPACE b/csharp/example/csharp_proto_library/WORKSPACE index ad4cedb2e..a8e42de4a 100644 --- a/csharp/example/csharp_proto_library/WORKSPACE +++ b/csharp/example/csharp_proto_library/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ @@ -28,4 +27,3 @@ nuget_packages() load("@build_stack_rules_proto//csharp/nuget:nuget.bzl", "nuget_protobuf_packages") nuget_protobuf_packages() - diff --git a/csharp/example/routeguide/BUILD.bazel b/csharp/example/routeguide/BUILD.bazel index 038f73ce4..3170bcd1b 100644 --- a/csharp/example/routeguide/BUILD.bazel +++ b/csharp/example/routeguide/BUILD.bazel @@ -82,7 +82,7 @@ core_binary( "@io_bazel_rules_dotnet//dotnet/stdlib.core:system.xml.dll", "@io_bazel_rules_dotnet//dotnet/stdlib.core:system.xml.xdocument.dll", "@io_bazel_rules_dotnet//dotnet/stdlib.core:system.text.encoding.dll", - "@io_bazel_rules_dotnet//dotnet/stdlib.core:system.io.filesystem.primitives.dll", + "@io_bazel_rules_dotnet//dotnet/stdlib.core:system.io.filesystem.primitives.dll", "@io_bazel_rules_dotnet//dotnet/stdlib.core:system.core.dll", "@io_bazel_rules_dotnet//dotnet/stdlib.core:system.dll", ], @@ -119,7 +119,7 @@ core_binary( "@io_bazel_rules_dotnet//dotnet/stdlib.core:system.xml.dll", "@io_bazel_rules_dotnet//dotnet/stdlib.core:system.xml.xdocument.dll", "@io_bazel_rules_dotnet//dotnet/stdlib.core:system.text.encoding.dll", - "@io_bazel_rules_dotnet//dotnet/stdlib.core:system.io.filesystem.primitives.dll", + "@io_bazel_rules_dotnet//dotnet/stdlib.core:system.io.filesystem.primitives.dll", "@io_bazel_rules_dotnet//dotnet/stdlib.core:system.core.dll", "@io_bazel_rules_dotnet//dotnet/stdlib.core:system.dll", ], diff --git a/csharp/example/routeguide/Client.cs b/csharp/example/routeguide/Client.cs index 56b5eb75a..3652ae175 100644 --- a/csharp/example/routeguide/Client.cs +++ b/csharp/example/routeguide/Client.cs @@ -43,7 +43,7 @@ public void GetFeature(int lat, int lon) Log("*** GetFeature: lat={0} lon={1}", lat, lon); RouteGuide.Point request = new RouteGuide.Point { Latitude = lat, Longitude = lon }; - + RouteGuide.Feature feature = client.GetFeature(request); if (feature.Exists()) { @@ -79,7 +79,7 @@ public async Task ListFeatures(int lowLat, int lowLon, int hiLat, int hiLon) Lo = new RouteGuide.Point { Latitude = lowLat, Longitude = lowLon }, Hi = new RouteGuide.Point { Latitude = hiLat, Longitude = hiLon } }; - + using (var call = client.ListFeatures(request)) { var responseStream = call.ResponseStream; @@ -95,13 +95,13 @@ public async Task ListFeatures(int lowLat, int lowLon, int hiLat, int hiLon) } catch (RpcException e) { - Log("RPC failed " + e); + Log("RPC failed " + e); throw; } } /// - /// Client-streaming example. Sends numPoints randomly chosen points from features + /// Client-streaming example. Sends numPoints randomly chosen points from features /// with a variable delay in between. Prints the statistics when they are sent from the server. /// public async Task RecordRoute(List features, int numPoints) @@ -123,7 +123,7 @@ public async Task RecordRoute(List features, int numPoints) await call.RequestStream.WriteAsync(point); // A bit of delay before sending the next one. - await Task.Delay(rand.Next(1000) + 500); + await Task.Delay(rand.Next(1000) + 500); } await call.RequestStream.CompleteAsync(); @@ -166,7 +166,7 @@ public async Task RouteChat() while (await call.ResponseStream.MoveNext()) { var note = call.ResponseStream.Current; - Log("Got message \"{0}\" at {1}, {2}", note.Message, + Log("Got message \"{0}\" at {1}, {2}", note.Message, note.Location.Latitude, note.Location.Longitude); } }); diff --git a/csharp/example/routeguide/Reflect.cs b/csharp/example/routeguide/Reflect.cs index a064b2dbe..a6ff695bb 100644 --- a/csharp/example/routeguide/Reflect.cs +++ b/csharp/example/routeguide/Reflect.cs @@ -16,7 +16,7 @@ public static void GetAllClassesAndMethodsOfAssembly(string name) Type[] types = assem1.GetTypes(); foreach (Type tc in types) { - + if (tc.IsAbstract) { Console.WriteLine("Abstract Class : " + tc.Name); @@ -28,7 +28,7 @@ public static void GetAllClassesAndMethodsOfAssembly(string name) else if (tc.IsSealed) { Console.WriteLine("Sealed Class : " + tc.Name); - } + } Console.WriteLine("Type.Namespace : " + tc.Namespace); Console.WriteLine("Type.FullName : " + tc.FullName); @@ -57,5 +57,5 @@ static void Main(string[] args) var filename = args[0]; Console.WriteLine(File.Exists(filename) ? "File exists." : "File does not exist."); GetAllClassesAndMethodsOfAssembly(filename); - } -} \ No newline at end of file + } +} diff --git a/csharp/example/routeguide/Server.cs b/csharp/example/routeguide/Server.cs index 2837b20fa..6252a54d9 100644 --- a/csharp/example/routeguide/Server.cs +++ b/csharp/example/routeguide/Server.cs @@ -90,7 +90,7 @@ public override async Task ListFeatures(RouteGuide.Rectangle request, IServerStr } stopwatch.Stop(); - + return new RouteGuide.RouteSummary { PointCount = pointCount, @@ -184,4 +184,4 @@ static void Main(string[] args) } -} \ No newline at end of file +} diff --git a/csharp/nuget/grpc.bzl b/csharp/nuget/grpc.bzl index 9e75dcbb5..aab42a77b 100644 --- a/csharp/nuget/grpc.bzl +++ b/csharp/nuget/grpc.bzl @@ -1,7 +1,7 @@ load("io_bazel_rules_dotnet//dotnet:defs.bzl", "nuget_package") def packages(): - - + + ### Generated by the tool nuget_package( name = "system.interactive.async", diff --git a/csharp/nuget/nuget.bzl b/csharp/nuget/nuget.bzl index 4d222fbab..efb11e3a2 100644 --- a/csharp/nuget/nuget.bzl +++ b/csharp/nuget/nuget.bzl @@ -1,6 +1,6 @@ load("@io_bazel_rules_dotnet//dotnet:defs.bzl", "nuget_package") def nuget_protobuf_packages(): - + ### Generated by the tool nuget_package( name = "google.protobuf", @@ -32,8 +32,8 @@ def nuget_protobuf_packages(): ) ### End of generated by the tool def nuget_grpc_packages(): - - + + ### Generated by the tool nuget_package( name = "system.interactive.async", diff --git a/csharp/nuget/packages.bzl b/csharp/nuget/packages.bzl index 4a5a216e4..c5e36e696 100644 --- a/csharp/nuget/packages.bzl +++ b/csharp/nuget/packages.bzl @@ -619,4 +619,4 @@ def packages(): "lib/net46/NuGet.PackageManagement.xml", ], ) - ### End of generated by the tool \ No newline at end of file + ### End of generated by the tool diff --git a/csharp/nuget/protobuf.bzl b/csharp/nuget/protobuf.bzl index cf62cea2d..f13d8856c 100644 --- a/csharp/nuget/protobuf.bzl +++ b/csharp/nuget/protobuf.bzl @@ -1,6 +1,6 @@ load("io_bazel_rules_dotnet//dotnet:defs.bzl", "nuget_package") def packages(): - + ### Generated by the tool nuget_package( name = "google.protobuf", diff --git a/csharp/nuget/regenerate_packages.sh b/csharp/nuget/regenerate_packages.sh index 5f2ea8081..81158d0fc 100755 --- a/csharp/nuget/regenerate_packages.sh +++ b/csharp/nuget/regenerate_packages.sh @@ -21,7 +21,7 @@ TMPDIR=$(mktemp -d ${TMPDIR:-/tmp}/nuget.XXXXXXXXXX) touch "${TMPDIR}/WORKSPACE" # Gather protobuf deps -"${TOOL}" add --path "/${TMPDIR}" Google.Protobuf "${PROTOBUF_VERSION}" +"${TOOL}" add --path "/${TMPDIR}" Google.Protobuf "${PROTOBUF_VERSION}" # Create the nuget.bzl file, indent 4 spaces echo 'load("@io_bazel_rules_dotnet//dotnet:defs.bzl", "nuget_package")' > ./csharp/nuget/nuget.bzl @@ -32,7 +32,7 @@ sed -e 's/^/ /' "${TMPDIR}/WORKSPACE" >> csharp/nuget/nuget.bzl echo "" > "${TMPDIR}/WORKSPACE" # Rerun it for grpc deps -"${TOOL}" add --path "/${TMPDIR}" Grpc "${GRPC_VERSION}" +"${TOOL}" add --path "/${TMPDIR}" Grpc "${GRPC_VERSION}" # Similarly, write the gprc.bzl file echo "def nuget_grpc_packages():" >> ./csharp/nuget/nuget.bzl diff --git a/dart/BUILD.bazel b/dart/BUILD.bazel index 24d6ddb22..3ee22ce32 100644 --- a/dart/BUILD.bazel +++ b/dart/BUILD.bazel @@ -1,4 +1,3 @@ - load("//:plugin.bzl", "proto_plugin") proto_plugin( @@ -59,8 +58,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library", "go_embed_data go_embed_data( name = "assets", srcs = [ - ":protoc_plugin", - "@dart_sdk//:bin/dart", + ":protoc_plugin", + "@dart_sdk//:bin/dart", ], flatten = True, package = "main", @@ -92,4 +91,4 @@ go_binary( name = "protoc-gen-dart", embed = [":go_default_library"], visibility = ["//visibility:public"], -) \ No newline at end of file +) diff --git a/dart/README.md b/dart/README.md index 83efdefe6..faad02ba5 100644 --- a/dart/README.md +++ b/dart/README.md @@ -336,4 +336,3 @@ def dart_grpc_library(**kwargs): | include_imports | `bool` | `True` | Pass the --include_imports argument to the protoc_plugin | | include_source_info | `bool` | `True` | Pass the --include_source_info argument to the protoc_plugin | | transitive | `bool` | `False` | Generated outputs for *.proto directly named in `deps` AND all transitive proto_library dependencies | - diff --git a/dart/dart_grpc_library.bzl b/dart/dart_grpc_library.bzl index ace984d4b..3b6bc3617 100644 --- a/dart/dart_grpc_library.bzl +++ b/dart/dart_grpc_library.bzl @@ -24,4 +24,3 @@ def dart_grpc_library(**kwargs): pub_pkg_name = name, visibility = visibility, ) - diff --git a/dart/dart_proto_library.bzl b/dart/dart_proto_library.bzl index 3026ffc25..04e8bc567 100644 --- a/dart/dart_proto_library.bzl +++ b/dart/dart_proto_library.bzl @@ -23,4 +23,3 @@ def dart_proto_library(**kwargs): pub_pkg_name = name, visibility = visibility, ) - diff --git a/dart/dart_protoc_plugin.dart b/dart/dart_protoc_plugin.dart index 5b142a428..c6555a90d 100644 --- a/dart/dart_protoc_plugin.dart +++ b/dart/dart_protoc_plugin.dart @@ -9,4 +9,4 @@ import 'package:protoc_plugin/protoc.dart'; void main() { new CodeGenerator(stdin, stdout).generate(); -} \ No newline at end of file +} diff --git a/dart/dart_pub_deps.bzl b/dart/dart_pub_deps.bzl index cd6b3bae7..bca6c0896 100644 --- a/dart/dart_pub_deps.bzl +++ b/dart/dart_pub_deps.bzl @@ -1,4 +1,3 @@ - def _execute(rtx, cmds): """Execute a command and fail if return code. Args: @@ -75,7 +74,7 @@ def _dart_pub_deps_impl(rtx): override = rtx.attr.override # int verbose = rtx.attr.verbose - # string + # string pub = rtx.path(rtx.attr._pub) # string spec = rtx.path(rtx.attr.spec) @@ -89,7 +88,7 @@ def _dart_pub_deps_impl(rtx): # Run pub deps result = _execute(rtx, [pub, "deps", "--style", "list"]) - # name -> entry + # name -> entry direct_deps = {} # name -> entry @@ -176,4 +175,3 @@ dart_pub_deps = repository_rule( ), }, ) - diff --git a/dart/deps.bzl b/dart/deps.bzl index a7fa360c8..9cc54f76f 100644 --- a/dart/deps.bzl +++ b/dart/deps.bzl @@ -1,5 +1,4 @@ - -load("//:deps.bzl", +load("//:deps.bzl", "com_google_protobuf", "dart_pub_deps_protoc_plugin", "dart_pub_deps_grpc", diff --git a/dart/example/dart_grpc_compile/WORKSPACE b/dart/example/dart_grpc_compile/WORKSPACE index 17e57520b..c0ed60fd7 100644 --- a/dart/example/dart_grpc_compile/WORKSPACE +++ b/dart/example/dart_grpc_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ @@ -29,4 +28,3 @@ dart_repositories() load("@dart_pub_deps_protoc_plugin//:deps.bzl", dart_protoc_plugin_deps = "pub_deps") dart_protoc_plugin_deps() - diff --git a/dart/example/dart_grpc_library/WORKSPACE b/dart/example/dart_grpc_library/WORKSPACE index 68a456f51..1ba65fcc4 100644 --- a/dart/example/dart_grpc_library/WORKSPACE +++ b/dart/example/dart_grpc_library/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ @@ -32,4 +31,3 @@ dart_protoc_plugin_deps() load("@dart_pub_deps_grpc//:deps.bzl", dart_grpc_deps = "pub_deps") dart_grpc_deps() - diff --git a/dart/example/dart_proto_compile/WORKSPACE b/dart/example/dart_proto_compile/WORKSPACE index 5fa114067..4a8db93cd 100644 --- a/dart/example/dart_proto_compile/WORKSPACE +++ b/dart/example/dart_proto_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ @@ -29,4 +28,3 @@ dart_repositories() load("@dart_pub_deps_protoc_plugin//:deps.bzl", dart_protoc_plugin_deps = "pub_deps") dart_protoc_plugin_deps() - diff --git a/dart/example/dart_proto_library/WORKSPACE b/dart/example/dart_proto_library/WORKSPACE index 91674650e..7b5f83006 100644 --- a/dart/example/dart_proto_library/WORKSPACE +++ b/dart/example/dart_proto_library/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ @@ -29,4 +28,3 @@ dart_repositories() load("@dart_pub_deps_protoc_plugin//:deps.bzl", dart_protoc_plugin_deps = "pub_deps") dart_protoc_plugin_deps() - diff --git a/dart/example/routeguide/Makefile b/dart/example/routeguide/Makefile index 0f8d05256..76c22127c 100644 --- a/dart/example/routeguide/Makefile +++ b/dart/example/routeguide/Makefile @@ -2,4 +2,4 @@ client: bazel run //dart/example/routeguide:client_bin server: - bazel run //dart/example/routeguide:server_bin \ No newline at end of file + bazel run //dart/example/routeguide:server_bin diff --git a/dart/example/routeguide/client.dart b/dart/example/routeguide/client.dart index be77f975b..4f05121cd 100644 --- a/dart/example/routeguide/client.dart +++ b/dart/example/routeguide/client.dart @@ -149,4 +149,4 @@ class Client { .location.longitude}'); } } -} \ No newline at end of file +} diff --git a/dart/example/routeguide/client_bin.dart b/dart/example/routeguide/client_bin.dart index 3d4bd4c7b..99522f7e9 100644 --- a/dart/example/routeguide/client_bin.dart +++ b/dart/example/routeguide/client_bin.dart @@ -17,4 +17,4 @@ import 'client.dart'; main(List args) async { await new Client().main(args); -} \ No newline at end of file +} diff --git a/dart/example/routeguide/common.dart b/dart/example/routeguide/common.dart index d6af408b1..ffd1f1a9c 100644 --- a/dart/example/routeguide/common.dart +++ b/dart/example/routeguide/common.dart @@ -21,7 +21,7 @@ import 'dart:io'; // 'routeguide_pb', which is actually the implicit target name of the // `dart_grpc_compile` rule; (3) the package path of the actual proto // 'example/proto'; (4) the generated name of the proto library -// 'routeguide.pb.dart'. +// 'routeguide.pb.dart'. // import 'routeguide_pb/example/proto/routeguide.pb.dart'; @@ -40,4 +40,4 @@ List _readDatabase() { ..name = entry['name'] ..location = location; }).toList(); -} \ No newline at end of file +} diff --git a/dart/example/routeguide/server.dart b/dart/example/routeguide/server.dart index 2dd61bb07..9c74b57e5 100644 --- a/dart/example/routeguide/server.dart +++ b/dart/example/routeguide/server.dart @@ -147,4 +147,4 @@ class Server { await server.serve(port: 8080); print('Server listening on port ${server.port}...'); } -} \ No newline at end of file +} diff --git a/dart/example/routeguide/server_bin.dart b/dart/example/routeguide/server_bin.dart index 5a9b8bbdb..3dcaab43a 100644 --- a/dart/example/routeguide/server_bin.dart +++ b/dart/example/routeguide/server_bin.dart @@ -17,4 +17,4 @@ import 'server.dart'; main(List args) async { await new Server().main(args); -} \ No newline at end of file +} diff --git a/deps.bzl b/deps.bzl index 0fb211ce5..28c213431 100644 --- a/deps.bzl +++ b/deps.bzl @@ -10,7 +10,7 @@ load("//dart:sdk.bzl", "dart_sdk_repository") load("//dart:dart_pub_deps.bzl", "dart_pub_deps") -def github_archive(name, org, repo, ref, sha256): +def github_archive(name, org, repo, ref, sha256): """Declare an http_archive from github """ if name not in native.existing_rules(): @@ -26,7 +26,7 @@ def github_archive(name, org, repo, ref, sha256): def jar(name, artifact, sha1): """Declare a maven_jar - """ + """ if name not in native.existing_rules(): maven_jar( name = name, @@ -149,7 +149,7 @@ def com_github_nanopb_nanopb(**kwargs): def com_google_protobuf(**kwargs): name = "com_google_protobuf" - ref = get_ref(name, "b829ff2a4614ff25048944b2cdc8e43b6488fda0", kwargs) + ref = get_ref(name, "b829ff2a4614ff25048944b2cdc8e43b6488fda0", kwargs) sha256 = get_sha256(name, "5d82a718e271e7fda626f983628e4b4601221788c2244763a9e57eda4cc667dd", kwargs) github_archive(name, "google", "protobuf", ref, sha256) @@ -165,42 +165,42 @@ def com_github_grpc_grpc(**kwargs): # Create an issue for this. def io_bazel_rules_dotnet(**kwargs): name = "io_bazel_rules_dotnet" - ref = get_ref(name, "e1254bf789f5008cf0f3d26fb6031695413a2d50", kwargs) + ref = get_ref(name, "e1254bf789f5008cf0f3d26fb6031695413a2d50", kwargs) sha256 = get_sha256(name, "4fdda2aeeef61a2ebbeac7d5885fe361adbc73cc93b395494a84b41865065b4d", kwargs) github_archive(name, "stackb", "rules_dotnet", ref, sha256) def io_bazel_rules_scala(**kwargs): name = "io_bazel_rules_scala" - ref = get_ref(name, "f33c6a659e3af540de35df1413f57f31d36d70c7", kwargs) + ref = get_ref(name, "f33c6a659e3af540de35df1413f57f31d36d70c7", kwargs) sha256 = get_sha256(name, "fc5c25ff314d53ed895a4b98960650daa5e55c9e5e7e57bb822d813059a2947d", kwargs) github_archive(name, "bazelbuild", "rules_scala", ref, sha256) def io_bazel_rules_rust(**kwargs): name = "io_bazel_rules_rust" - ref = get_ref(name, "88022d175adb48aa5f8904f95dfc716c543b3f1e", kwargs) + ref = get_ref(name, "88022d175adb48aa5f8904f95dfc716c543b3f1e", kwargs) sha256 = get_sha256(name, "d9832945f0fa7097ee548bd6fecfc814bd19759561dd7b06723e1c6a1879aa71", kwargs) github_archive(name, "bazelbuild", "rules_rust", ref, sha256) def com_github_yugui_rules_ruby(**kwargs): name = "com_github_yugui_rules_ruby" - ref = get_ref(name, "5976385c9c4b94647bc95e8bf9d9989f1dee4ee3", kwargs) # PR#8, + ref = get_ref(name, "5976385c9c4b94647bc95e8bf9d9989f1dee4ee3", kwargs) # PR#8, sha256 = get_sha256(name, "7991ded3b902aba4c13fa7bdd67132edfcc279930b356737c1a3d3b2686d08c8", kwargs) github_archive(name, "yugui", "rules_ruby", ref, sha256) def com_github_grpc_ecosystem_grpc_gateway(**kwargs): name = "com_github_grpc_ecosystem_grpc_gateway" - ref = get_ref(name, "8aa3d3f00fbaea619d864e688cd045497aa30fe8", kwargs) # Oct 2, 2018, + ref = get_ref(name, "8aa3d3f00fbaea619d864e688cd045497aa30fe8", kwargs) # Oct 2, 2018, sha256 = get_sha256(name, "e21e3a3ac5e2be3869474f1c703db5d4f72e459e07084e9228eaaf2484e0dd48", kwargs) github_archive(name, "grpc-ecosystem", "grpc-gateway", ref, sha256) def org_pubref_rules_node(**kwargs): name = "org_pubref_rules_node" - ref = get_ref(name, "144b4b705e5e56b3ea5a64f47b086388be939b1d", kwargs) + ref = get_ref(name, "144b4b705e5e56b3ea5a64f47b086388be939b1d", kwargs) sha256 = get_sha256(name, "c5d8f923bdf1ba905d7e46ce718d564814c2fad13673bc7dc4a2fce20c946315", kwargs) github_archive(name, "pubref", "rules_node", ref, sha256) @@ -209,7 +209,7 @@ def build_bazel_rules_android(**kwargs): """Android Rules """ name = "build_bazel_rules_android" - ref = get_ref(name, "60f03a20cefbe1e110ae0ac7f25359822e9ea24a", kwargs) + ref = get_ref(name, "60f03a20cefbe1e110ae0ac7f25359822e9ea24a", kwargs) sha256 = get_sha256(name, "4305b6cf6b098752a19fdb1abdc9ae2e069f5ff61359bfc3c752e4b4c862d18e", kwargs) github_archive(name, "bazelbuild", "rules_android", ref, sha256) @@ -218,7 +218,7 @@ def build_bazel_rules_swift(**kwargs): """swift Rules """ name = "build_bazel_rules_swift" - ref = get_ref(name, "8f594d9a9b39ce471064cc13d35c07ea77a24628", kwargs) + ref = get_ref(name, "8f594d9a9b39ce471064cc13d35c07ea77a24628", kwargs) sha256 = get_sha256(name, "0b6c009c18f4a1235db65acf841bbe85043d290f39ebb142436c046476a823e5", kwargs) github_archive(name, "bazelbuild", "rules_swift", ref, sha256) @@ -232,13 +232,13 @@ def com_github_apple_swift_swift_protobuf(**kwargs): sha256 = "edd677ff3ad01a4090902c80e7a28671a2f48fa6ce06726f0616678465f575f1", strip_prefix = "swift-protobuf-" + version, build_file = "@build_bazel_rules_swift//third_party:com_github_apple_swift_swift_protobuf/BUILD.overlay", - ) + ) def io_bazel_rules_go(**kwargs): """Go Rules """ name = "io_bazel_rules_go" - ref = get_ref(name, "0f0d007c89dc67a5a34490acafc5195b191f5045", kwargs) # 0.15.3 + ref = get_ref(name, "0f0d007c89dc67a5a34490acafc5195b191f5045", kwargs) # 0.15.3 sha256 = get_sha256(name, "75a187b761dd3437c0722e3ab9a5c0835afc0acdd2cd1dc08f5d4810f409d57d", kwargs) github_archive(name, "bazelbuild", "rules_go", ref, sha256) @@ -247,7 +247,7 @@ def io_bazel_rules_python(**kwargs): """python Rules """ name = "io_bazel_rules_python" - ref = get_ref(name, "8b5d0683a7d878b28fffe464779c8a53659fc645", kwargs) + ref = get_ref(name, "8b5d0683a7d878b28fffe464779c8a53659fc645", kwargs) sha256 = get_sha256(name, "8b32d2dbb0b0dca02e0410da81499eef8ff051dad167d6931a92579e3b2a1d48", kwargs) github_archive(name, "bazelbuild", "rules_python", ref, sha256) @@ -281,7 +281,7 @@ def io_bazel_rules_dart(**kwargs): """Dart Rules """ name = "io_bazel_rules_dart" - ref = get_ref(name, "78a4e1ba257bbe9a9d7a064c8cde8c5317059e17", kwargs) # ~11/27/2018 + ref = get_ref(name, "78a4e1ba257bbe9a9d7a064c8cde8c5317059e17", kwargs) # ~11/27/2018 sha256 = get_sha256(name, "7e699c457f45151e5c61dce6bdcaf14e4cb840d95af86c13a9e7eecc49fd39a3", kwargs) github_archive(name, "dart-lang", "rules_dart", ref, sha256) @@ -305,10 +305,10 @@ def dart_pub_deps_protoc_plugin(**kwargs): name = name, spec = str(Label("//dart:pubspec.yaml")), - # these overrides were determined by manually browsing pub.dartlang.org, + # these overrides were determined by manually browsing pub.dartlang.org, # starting at protoc_plugin and going through all transitive dependencies, # pinning them to the version specified there (basically, seems like latest) - + override = { "analyzer": "0.34.0", "args": "1.5.1", @@ -347,10 +347,10 @@ def dart_pub_deps_grpc(**kwargs): name = name, spec = str(Label("//dart:pubspec-grpc.yaml")), - # these overrides were determined by manually browsing pub.dartlang.org, + # these overrides were determined by manually browsing pub.dartlang.org, # starting at protoc_plugin and going through all transitive dependencies, # pinning them to the version specified there (basically, seems like latest) - + override = { "async": "2.0.8", "collection": "1.14.11", @@ -374,7 +374,7 @@ def com_google_protobuf_lite(**kwargs): """A different branch of google/protobuf that contains the protobuf_lite plugin """ name = "com_google_protobuf_lite" - ref = get_ref(name, "5e8916e881c573c5d83980197a6f783c132d4276", kwargs) + ref = get_ref(name, "5e8916e881c573c5d83980197a6f783c132d4276", kwargs) sha256 = get_sha256(name, "d35902fb3cbe9afa67aad4e615a8224d0a531b8c06d32e100bdb235244748a3d", kwargs) github_archive(name, "protocolbuffers", "protobuf", ref, sha256) @@ -383,7 +383,7 @@ def gmaven_rules(**kwargs): """A catalog of maven & android jars on google maven server """ name = "gmaven_rules" - ref = get_ref(name, "20180927-1", kwargs) + ref = get_ref(name, "20180927-1", kwargs) sha256 = get_sha256(name, "ddaa0f5811253e82f67ee637dc8caf3989e4517bac0368355215b0dcfa9844d6", kwargs) github_archive(name, "bazelbuild", "gmaven_rules", ref, sha256) @@ -392,7 +392,7 @@ def io_grpc_grpc_java(**kwargs): """grpc java plugin and jars """ name = "io_grpc_grpc_java" - ref = get_ref(name, "3134daf471f90b8f00c037518fc64988a1cdc8f7", kwargs) # v1.15.0 + ref = get_ref(name, "3134daf471f90b8f00c037518fc64988a1cdc8f7", kwargs) # v1.15.0 sha256 = get_sha256(name, "a7d7def13fd019255ba6ef7499aa91dac38d0ec0f5d9c1262a75ae82f4d67174", kwargs) github_archive(name, "grpc", "grpc-java", ref, sha256) @@ -451,12 +451,12 @@ java_import( visibility = ["//visibility:public"], ) """ - ) + ) def io_bazel_rules_closure(**kwargs): name = "io_bazel_rules_closure" - ref = get_ref(name, "1e12aa5612d758daf2df339991c8d187223a7ee6", kwargs) + ref = get_ref(name, "1e12aa5612d758daf2df339991c8d187223a7ee6", kwargs) sha256 = get_sha256(name, "663424d34fd067a8d066308eb2887fcaba36d73b354669ec1467498726a6b82c", kwargs) if "io_bazel_rules_closure" not in native.existing_rules(): @@ -483,69 +483,69 @@ def com_github_stackb_grpc_js(**kwargs): """Grpc-web implementation (closure) """ name = "com_github_stackb_grpc_js" - ref = get_ref(name, "fb3d7dbd8bfc8e1d4fb259f76d75f59cd4b67c31", kwargs) + ref = get_ref(name, "fb3d7dbd8bfc8e1d4fb259f76d75f59cd4b67c31", kwargs) sha256 = get_sha256(name, "019c2fbaf3958fff3a8a68d775dde606f0eb77163f1256e1d700e78c9ed2db85", kwargs) github_archive(name, "stackb", "grpc.js", ref, sha256) def build_bazel_rules_nodejs(**kwargs): - """Rule node.js + """Rule node.js """ name = "build_bazel_rules_nodejs" - ref = get_ref(name, "d334fd8e2274fb939cf447106dced97472534e80", kwargs) + ref = get_ref(name, "d334fd8e2274fb939cf447106dced97472534e80", kwargs) sha256 = get_sha256(name, "5c69bae6545c5c335c834d4a7d04b888607993027513282a5139dbbea7166571", kwargs) github_archive(name, "bazelbuild", "rules_nodejs", ref, sha256) def build_bazel_rules_typescript(**kwargs): - """Rule for typescript + """Rule for typescript """ name = "build_bazel_rules_typescript" - ref = get_ref(name, "3488d4fb89c6a02d79875d217d1029182fbcd797", kwargs) + ref = get_ref(name, "3488d4fb89c6a02d79875d217d1029182fbcd797", kwargs) sha256 = get_sha256(name, "22ebe19999ce34de2f0329d29c7cac1cccd449cd61d0813aa0e633ac8dfaef80", kwargs) github_archive(name, "bazelbuild", "rules_typescript", ref, sha256) def io_bazel_rules_webtesting(**kwargs): - """Rule for browser testing + """Rule for browser testing """ name = "io_bazel_rules_webtesting" - ref = get_ref(name, "e417b122a3d1e8f8a4cc09b1b05e2a5f52c8ecbb", kwargs) + ref = get_ref(name, "e417b122a3d1e8f8a4cc09b1b05e2a5f52c8ecbb", kwargs) sha256 = get_sha256(name, "76af36aac2aed3ca6984e0c45d1204582243fa6b81165bf0e42eacfffed9c769", kwargs) github_archive(name, "bazelbuild", "rules_webtesting", ref, sha256) def ts_protoc_gen(**kwargs): - """ d.ts generator + """ d.ts generator """ name = "ts_protoc_gen" - ref = get_ref(name, "67e0c93fa4e29539ec57c97d23116f366ffb94e7", kwargs) + ref = get_ref(name, "67e0c93fa4e29539ec57c97d23116f366ffb94e7", kwargs) sha256 = get_sha256(name, "03b87365116b3e829b648c57bf17b8d252b682c33264de5663e7f410c9ad0e55", kwargs) github_archive(name, "improbable-eng", "ts-protoc-gen", ref, sha256) def bazel_gazelle(**kwargs): - """ build file generator for go + """ build file generator for go """ name = "bazel_gazelle" - ref = get_ref(name, "6a1b93cc9b1c7e55e7d05a6d324bcf9d87ea3ab1", kwargs) + ref = get_ref(name, "6a1b93cc9b1c7e55e7d05a6d324bcf9d87ea3ab1", kwargs) sha256 = get_sha256(name, "bc493cce447c02b361393a79e562a5f48f456705417ee76009a761a159540dd7", kwargs) github_archive(name, "bazelbuild", "bazel-gazelle", ref, sha256) def bazel_skylib(**kwargs): - """ bazel utils + """ bazel utils """ name = "bazel_skylib" - ref = get_ref(name, "8cecf885c8bf4c51e82fd6b50b9dd68d2c98f757", kwargs) + ref = get_ref(name, "8cecf885c8bf4c51e82fd6b50b9dd68d2c98f757", kwargs) sha256 = get_sha256(name, "68ef2998919a92c2c9553f7a6b00a1d0615b57720a13239c0e51d0ded5aa452a", kwargs) github_archive(name, "bazelbuild", "bazel-skylib", ref, sha256) def com_github_grpc_grpc_web(**kwargs): - """Rule for grpc-web + """Rule for grpc-web """ name = "com_github_grpc_grpc_web" - ref = get_ref(name, "92aa9f8fc8e7af4aadede52ea075dd5790a63b62", kwargs) + ref = get_ref(name, "92aa9f8fc8e7af4aadede52ea075dd5790a63b62", kwargs) sha256 = get_sha256(name, "f4996205e6d1d72e2be46f1bda4d26f8586998ed42021161322d490537d8c9b9", kwargs) github_archive(name, "grpc", "grpc-web", ref, sha256) diff --git a/example/proto/BUILD.bazel b/example/proto/BUILD.bazel index 53dc857a1..8c3e1f6f9 100644 --- a/example/proto/BUILD.bazel +++ b/example/proto/BUILD.bazel @@ -1,4 +1,3 @@ - proto_library( name = "person_proto", srcs = [ diff --git a/example/proto/empty.proto b/example/proto/empty.proto index 92e900b3e..b916d6f52 100644 --- a/example/proto/empty.proto +++ b/example/proto/empty.proto @@ -2,4 +2,3 @@ syntax = "proto3"; message Simple { } - diff --git a/example/proto/greeter.proto b/example/proto/greeter.proto index 2b68c7284..bc0d0e97c 100644 --- a/example/proto/greeter.proto +++ b/example/proto/greeter.proto @@ -35,4 +35,4 @@ message HelloRequest { // The response message containing the greetings message HelloReply { string message = 1; -} \ No newline at end of file +} diff --git a/example/proto/person.proto b/example/proto/person.proto index 9b1852395..ae9592f7f 100644 --- a/example/proto/person.proto +++ b/example/proto/person.proto @@ -8,4 +8,3 @@ message Person { string name = 1; example.proto.Place place = 3; } - diff --git a/example/proto/place.proto b/example/proto/place.proto index 8c36a8cc3..784f7046f 100644 --- a/example/proto/place.proto +++ b/example/proto/place.proto @@ -8,4 +8,3 @@ message Place { string name = 1; example.proto.Thing thing = 2; } - diff --git a/example/proto/routeguide.proto b/example/proto/routeguide.proto index 2dd615d21..620922586 100644 --- a/example/proto/routeguide.proto +++ b/example/proto/routeguide.proto @@ -113,4 +113,4 @@ message RouteSummary { // The duration of the traversal in seconds. int32 elapsed_time = 4; -} \ No newline at end of file +} diff --git a/example/proto/routeguide_features.json b/example/proto/routeguide_features.json index 9342beb57..9d6a980ab 100644 --- a/example/proto/routeguide_features.json +++ b/example/proto/routeguide_features.json @@ -598,4 +598,4 @@ "longitude": -747127767 }, "name": "3 Hasta Way, Newton, NJ 07860, USA" -}] \ No newline at end of file +}] diff --git a/github.com/gogo/protobuf/BUILD.bazel b/github.com/gogo/protobuf/BUILD.bazel index a92b90ea6..fd2ee6861 100644 --- a/github.com/gogo/protobuf/BUILD.bazel +++ b/github.com/gogo/protobuf/BUILD.bazel @@ -1,4 +1,3 @@ - load("//:plugin.bzl", "proto_plugin") [proto_plugin( diff --git a/github.com/gogo/protobuf/README.md b/github.com/gogo/protobuf/README.md index 91d8fc311..2f7e16210 100644 --- a/github.com/gogo/protobuf/README.md +++ b/github.com/gogo/protobuf/README.md @@ -1127,4 +1127,3 @@ def gogofaster_grpc_library(**kwargs): | transitive | `bool` | `False` | Generated outputs for *.proto directly named in `deps` AND all transitive proto_library dependencies | | importpath | `string` | `None` | Importpath for the generated artifacts | | importmap | `string_dict` | `None` | A dictionary of the form `{ K: V}` that dictates the importpath `V` for a matching imported proto file `K` | - diff --git a/github.com/gogo/protobuf/deps.bzl b/github.com/gogo/protobuf/deps.bzl index b2958878e..22a86e772 100644 --- a/github.com/gogo/protobuf/deps.bzl +++ b/github.com/gogo/protobuf/deps.bzl @@ -1,4 +1,4 @@ -load("//:deps.bzl", +load("//:deps.bzl", "io_bazel_rules_go", ) diff --git a/github.com/gogo/protobuf/example/gogo_grpc_compile/WORKSPACE b/github.com/gogo/protobuf/example/gogo_grpc_compile/WORKSPACE index dfcd321c5..8a839fe8e 100644 --- a/github.com/gogo/protobuf/example/gogo_grpc_compile/WORKSPACE +++ b/github.com/gogo/protobuf/example/gogo_grpc_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/github.com/gogo/protobuf/example/gogo_grpc_library/WORKSPACE b/github.com/gogo/protobuf/example/gogo_grpc_library/WORKSPACE index c2484dec2..30f43dd01 100644 --- a/github.com/gogo/protobuf/example/gogo_grpc_library/WORKSPACE +++ b/github.com/gogo/protobuf/example/gogo_grpc_library/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/github.com/gogo/protobuf/example/gogo_proto_compile/WORKSPACE b/github.com/gogo/protobuf/example/gogo_proto_compile/WORKSPACE index 2ca6c288d..9be4073b0 100644 --- a/github.com/gogo/protobuf/example/gogo_proto_compile/WORKSPACE +++ b/github.com/gogo/protobuf/example/gogo_proto_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/github.com/gogo/protobuf/example/gogo_proto_library/WORKSPACE b/github.com/gogo/protobuf/example/gogo_proto_library/WORKSPACE index 7584eeedf..2ebe57e46 100644 --- a/github.com/gogo/protobuf/example/gogo_proto_library/WORKSPACE +++ b/github.com/gogo/protobuf/example/gogo_proto_library/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/github.com/gogo/protobuf/example/gogofast_grpc_compile/WORKSPACE b/github.com/gogo/protobuf/example/gogofast_grpc_compile/WORKSPACE index 3d4765017..e2350b7c0 100644 --- a/github.com/gogo/protobuf/example/gogofast_grpc_compile/WORKSPACE +++ b/github.com/gogo/protobuf/example/gogofast_grpc_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/github.com/gogo/protobuf/example/gogofast_grpc_library/WORKSPACE b/github.com/gogo/protobuf/example/gogofast_grpc_library/WORKSPACE index 6aa708790..f6f4d32d9 100644 --- a/github.com/gogo/protobuf/example/gogofast_grpc_library/WORKSPACE +++ b/github.com/gogo/protobuf/example/gogofast_grpc_library/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/github.com/gogo/protobuf/example/gogofast_proto_compile/WORKSPACE b/github.com/gogo/protobuf/example/gogofast_proto_compile/WORKSPACE index 7dc05d2c2..41deddc88 100644 --- a/github.com/gogo/protobuf/example/gogofast_proto_compile/WORKSPACE +++ b/github.com/gogo/protobuf/example/gogofast_proto_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/github.com/gogo/protobuf/example/gogofast_proto_library/WORKSPACE b/github.com/gogo/protobuf/example/gogofast_proto_library/WORKSPACE index 66a8f2a56..60a7c6d6d 100644 --- a/github.com/gogo/protobuf/example/gogofast_proto_library/WORKSPACE +++ b/github.com/gogo/protobuf/example/gogofast_proto_library/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/github.com/gogo/protobuf/example/gogofaster_grpc_compile/WORKSPACE b/github.com/gogo/protobuf/example/gogofaster_grpc_compile/WORKSPACE index bb6ee956b..6eef279a4 100644 --- a/github.com/gogo/protobuf/example/gogofaster_grpc_compile/WORKSPACE +++ b/github.com/gogo/protobuf/example/gogofaster_grpc_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/github.com/gogo/protobuf/example/gogofaster_grpc_library/WORKSPACE b/github.com/gogo/protobuf/example/gogofaster_grpc_library/WORKSPACE index bd0add034..eeea14d13 100644 --- a/github.com/gogo/protobuf/example/gogofaster_grpc_library/WORKSPACE +++ b/github.com/gogo/protobuf/example/gogofaster_grpc_library/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/github.com/gogo/protobuf/example/gogofaster_proto_compile/WORKSPACE b/github.com/gogo/protobuf/example/gogofaster_proto_compile/WORKSPACE index 805323f71..a4ffaa417 100644 --- a/github.com/gogo/protobuf/example/gogofaster_proto_compile/WORKSPACE +++ b/github.com/gogo/protobuf/example/gogofaster_proto_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/github.com/gogo/protobuf/example/gogofaster_proto_library/WORKSPACE b/github.com/gogo/protobuf/example/gogofaster_proto_library/WORKSPACE index 14e0d8341..7ae537d3d 100644 --- a/github.com/gogo/protobuf/example/gogofaster_proto_library/WORKSPACE +++ b/github.com/gogo/protobuf/example/gogofaster_proto_library/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/github.com/gogo/protobuf/gogo_grpc_compile.bzl b/github.com/gogo/protobuf/gogo_grpc_compile.bzl index 1df7ba466..604a70ecb 100644 --- a/github.com/gogo/protobuf/gogo_grpc_compile.bzl +++ b/github.com/gogo/protobuf/gogo_grpc_compile.bzl @@ -22,4 +22,3 @@ def gogo_grpc_compile(**kwargs): proto_compile( **kwargs ) - diff --git a/github.com/gogo/protobuf/gogo_grpc_library.bzl b/github.com/gogo/protobuf/gogo_grpc_library.bzl index eefe5763a..f75563ec8 100644 --- a/github.com/gogo/protobuf/gogo_grpc_library.bzl +++ b/github.com/gogo/protobuf/gogo_grpc_library.bzl @@ -38,4 +38,3 @@ def gogo_grpc_library(**kwargs): importpath = importpath, visibility = visibility, ) - diff --git a/github.com/gogo/protobuf/gogo_proto_compile.bzl b/github.com/gogo/protobuf/gogo_proto_compile.bzl index 5e0bd9780..8e7150fba 100644 --- a/github.com/gogo/protobuf/gogo_proto_compile.bzl +++ b/github.com/gogo/protobuf/gogo_proto_compile.bzl @@ -22,4 +22,3 @@ def gogo_proto_compile(**kwargs): proto_compile( **kwargs ) - diff --git a/github.com/gogo/protobuf/gogo_proto_library.bzl b/github.com/gogo/protobuf/gogo_proto_library.bzl index 709560b95..bccf0d301 100644 --- a/github.com/gogo/protobuf/gogo_proto_library.bzl +++ b/github.com/gogo/protobuf/gogo_proto_library.bzl @@ -36,4 +36,3 @@ def gogo_proto_library(**kwargs): importpath = importpath, visibility = visibility, ) - diff --git a/github.com/gogo/protobuf/gogofast_grpc_compile.bzl b/github.com/gogo/protobuf/gogofast_grpc_compile.bzl index 8d6298997..94d974d34 100644 --- a/github.com/gogo/protobuf/gogofast_grpc_compile.bzl +++ b/github.com/gogo/protobuf/gogofast_grpc_compile.bzl @@ -22,4 +22,3 @@ def gogofast_grpc_compile(**kwargs): proto_compile( **kwargs ) - diff --git a/github.com/gogo/protobuf/gogofast_grpc_library.bzl b/github.com/gogo/protobuf/gogofast_grpc_library.bzl index 4049962c2..a002921a0 100644 --- a/github.com/gogo/protobuf/gogofast_grpc_library.bzl +++ b/github.com/gogo/protobuf/gogofast_grpc_library.bzl @@ -38,4 +38,3 @@ def gogofast_grpc_library(**kwargs): importpath = importpath, visibility = visibility, ) - diff --git a/github.com/gogo/protobuf/gogofast_proto_compile.bzl b/github.com/gogo/protobuf/gogofast_proto_compile.bzl index b07b75385..1b27278ea 100644 --- a/github.com/gogo/protobuf/gogofast_proto_compile.bzl +++ b/github.com/gogo/protobuf/gogofast_proto_compile.bzl @@ -22,4 +22,3 @@ def gogofast_proto_compile(**kwargs): proto_compile( **kwargs ) - diff --git a/github.com/gogo/protobuf/gogofast_proto_library.bzl b/github.com/gogo/protobuf/gogofast_proto_library.bzl index a61465525..816cabea5 100644 --- a/github.com/gogo/protobuf/gogofast_proto_library.bzl +++ b/github.com/gogo/protobuf/gogofast_proto_library.bzl @@ -36,4 +36,3 @@ def gogofast_proto_library(**kwargs): importpath = importpath, visibility = visibility, ) - diff --git a/github.com/gogo/protobuf/gogofaster_grpc_compile.bzl b/github.com/gogo/protobuf/gogofaster_grpc_compile.bzl index b7cb26265..8fea8ddc8 100644 --- a/github.com/gogo/protobuf/gogofaster_grpc_compile.bzl +++ b/github.com/gogo/protobuf/gogofaster_grpc_compile.bzl @@ -22,4 +22,3 @@ def gogofaster_grpc_compile(**kwargs): proto_compile( **kwargs ) - diff --git a/github.com/gogo/protobuf/gogofaster_grpc_library.bzl b/github.com/gogo/protobuf/gogofaster_grpc_library.bzl index c79e7512c..f3bcd6201 100644 --- a/github.com/gogo/protobuf/gogofaster_grpc_library.bzl +++ b/github.com/gogo/protobuf/gogofaster_grpc_library.bzl @@ -38,4 +38,3 @@ def gogofaster_grpc_library(**kwargs): importpath = importpath, visibility = visibility, ) - diff --git a/github.com/gogo/protobuf/gogofaster_proto_compile.bzl b/github.com/gogo/protobuf/gogofaster_proto_compile.bzl index 1099a9e5d..032688dcd 100644 --- a/github.com/gogo/protobuf/gogofaster_proto_compile.bzl +++ b/github.com/gogo/protobuf/gogofaster_proto_compile.bzl @@ -22,4 +22,3 @@ def gogofaster_proto_compile(**kwargs): proto_compile( **kwargs ) - diff --git a/github.com/gogo/protobuf/gogofaster_proto_library.bzl b/github.com/gogo/protobuf/gogofaster_proto_library.bzl index 0bbcbf087..63e37c727 100644 --- a/github.com/gogo/protobuf/gogofaster_proto_library.bzl +++ b/github.com/gogo/protobuf/gogofaster_proto_library.bzl @@ -36,4 +36,3 @@ def gogofaster_proto_library(**kwargs): importpath = importpath, visibility = visibility, ) - diff --git a/github.com/grpc-ecosystem/grpc-gateway/BUILD.bazel b/github.com/grpc-ecosystem/grpc-gateway/BUILD.bazel index 1a3cbe2ad..3e2ac2d03 100644 --- a/github.com/grpc-ecosystem/grpc-gateway/BUILD.bazel +++ b/github.com/grpc-ecosystem/grpc-gateway/BUILD.bazel @@ -1,4 +1,3 @@ - load("//:plugin.bzl", "proto_plugin") proto_plugin( diff --git a/github.com/grpc-ecosystem/grpc-gateway/README.md b/github.com/grpc-ecosystem/grpc-gateway/README.md index 43068c89c..c2b96396f 100644 --- a/github.com/grpc-ecosystem/grpc-gateway/README.md +++ b/github.com/grpc-ecosystem/grpc-gateway/README.md @@ -239,4 +239,3 @@ def gateway_grpc_library(**kwargs): | include_imports | `bool` | `True` | Pass the --include_imports argument to the protoc_plugin | | include_source_info | `bool` | `True` | Pass the --include_source_info argument to the protoc_plugin | | transitive | `bool` | `False` | Generated outputs for *.proto directly named in `deps` AND all transitive proto_library dependencies | - diff --git a/github.com/grpc-ecosystem/grpc-gateway/deps.bzl b/github.com/grpc-ecosystem/grpc-gateway/deps.bzl index b923b229f..9575c4e2b 100644 --- a/github.com/grpc-ecosystem/grpc-gateway/deps.bzl +++ b/github.com/grpc-ecosystem/grpc-gateway/deps.bzl @@ -1,4 +1,4 @@ -load("//:deps.bzl", +load("//:deps.bzl", "io_bazel_rules_go", "bazel_gazelle", "com_github_grpc_ecosystem_grpc_gateway", diff --git a/github.com/grpc-ecosystem/grpc-gateway/example/api/BUILD.bazel b/github.com/grpc-ecosystem/grpc-gateway/example/api/BUILD.bazel index 50947f7f8..838a6b33d 100644 --- a/github.com/grpc-ecosystem/grpc-gateway/example/api/BUILD.bazel +++ b/github.com/grpc-ecosystem/grpc-gateway/example/api/BUILD.bazel @@ -1,5 +1,3 @@ - - load("//github.com/grpc-ecosystem/grpc-gateway:gateway_grpc_library.bzl", "gateway_grpc_library") load("//github.com/grpc-ecosystem/grpc-gateway:gateway_swagger_compile.bzl", "gateway_swagger_compile") diff --git a/github.com/grpc-ecosystem/grpc-gateway/example/api/api.proto b/github.com/grpc-ecosystem/grpc-gateway/example/api/api.proto index 423bb3669..667246dbc 100644 --- a/github.com/grpc-ecosystem/grpc-gateway/example/api/api.proto +++ b/github.com/grpc-ecosystem/grpc-gateway/example/api/api.proto @@ -23,4 +23,4 @@ message GetCustomerRequest { message GetCustomerResponse { Customer customer = 1; -} \ No newline at end of file +} diff --git a/github.com/grpc-ecosystem/grpc-gateway/example/gateway_grpc_compile/WORKSPACE b/github.com/grpc-ecosystem/grpc-gateway/example/gateway_grpc_compile/WORKSPACE index 87ab97d40..1a9e6ab34 100644 --- a/github.com/grpc-ecosystem/grpc-gateway/example/gateway_grpc_compile/WORKSPACE +++ b/github.com/grpc-ecosystem/grpc-gateway/example/gateway_grpc_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/github.com/grpc-ecosystem/grpc-gateway/example/gateway_grpc_library/WORKSPACE b/github.com/grpc-ecosystem/grpc-gateway/example/gateway_grpc_library/WORKSPACE index db5ea5554..b7d1a696d 100644 --- a/github.com/grpc-ecosystem/grpc-gateway/example/gateway_grpc_library/WORKSPACE +++ b/github.com/grpc-ecosystem/grpc-gateway/example/gateway_grpc_library/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/github.com/grpc-ecosystem/grpc-gateway/example/gateway_swagger_compile/WORKSPACE b/github.com/grpc-ecosystem/grpc-gateway/example/gateway_swagger_compile/WORKSPACE index 0baa0de2c..50d47287a 100644 --- a/github.com/grpc-ecosystem/grpc-gateway/example/gateway_swagger_compile/WORKSPACE +++ b/github.com/grpc-ecosystem/grpc-gateway/example/gateway_swagger_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/github.com/grpc-ecosystem/grpc-gateway/example/server/BUILD.bazel b/github.com/grpc-ecosystem/grpc-gateway/example/server/BUILD.bazel index d7b281668..468158cc6 100644 --- a/github.com/grpc-ecosystem/grpc-gateway/example/server/BUILD.bazel +++ b/github.com/grpc-ecosystem/grpc-gateway/example/server/BUILD.bazel @@ -1,5 +1,3 @@ - - load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_binary") diff --git a/github.com/grpc-ecosystem/grpc-gateway/gateway_grpc_library.bzl b/github.com/grpc-ecosystem/grpc-gateway/gateway_grpc_library.bzl index 322a1e37c..dc14cfb7b 100644 --- a/github.com/grpc-ecosystem/grpc-gateway/gateway_grpc_library.bzl +++ b/github.com/grpc-ecosystem/grpc-gateway/gateway_grpc_library.bzl @@ -23,4 +23,3 @@ def gateway_grpc_library(**kwargs): deps = ["@go_googleapis//google/api:annotations_go_proto"], visibility = visibility, ) - diff --git a/github.com/grpc/grpc-web/BUILD.bazel b/github.com/grpc/grpc-web/BUILD.bazel index 96faab825..85c05c5c7 100644 --- a/github.com/grpc/grpc-web/BUILD.bazel +++ b/github.com/grpc/grpc-web/BUILD.bazel @@ -1,4 +1,3 @@ - load("//:plugin.bzl", "proto_plugin") proto_plugin( @@ -25,7 +24,7 @@ proto_plugin( name = "commonjs_dts", outputs = [ "_grpc_web_pb.js", - "_pb.d.ts", + "_pb.d.ts", ], options = ["import_style=commonjs+dts", "mode=grpcweb"], tool = "@com_github_grpc_grpc_web//javascript/net/grpc/web:protoc-gen-grpc-web", @@ -41,4 +40,3 @@ proto_plugin( tool = "@com_github_grpc_grpc_web//javascript/net/grpc/web:protoc-gen-grpc-web", visibility = ["//visibility:public"], ) - diff --git a/github.com/grpc/grpc-web/README.md b/github.com/grpc/grpc-web/README.md index 1b8563146..f5acbd51b 100644 --- a/github.com/grpc/grpc-web/README.md +++ b/github.com/grpc/grpc-web/README.md @@ -321,7 +321,7 @@ def closure_grpc_library(**kwargs): transitive = True, visibility = visibility, ) - + closure_grpc_compile( name = name_pb_grpc, deps = deps, @@ -367,4 +367,3 @@ def closure_grpc_library(**kwargs): | include_imports | `bool` | `True` | Pass the --include_imports argument to the protoc_plugin | | include_source_info | `bool` | `True` | Pass the --include_source_info argument to the protoc_plugin | | transitive | `bool` | `False` | Generated outputs for *.proto directly named in `deps` AND all transitive proto_library dependencies | - diff --git a/github.com/grpc/grpc-web/closure_grpc_library.bzl b/github.com/grpc/grpc-web/closure_grpc_library.bzl index 5fa399175..e3db80b0f 100644 --- a/github.com/grpc/grpc-web/closure_grpc_library.bzl +++ b/github.com/grpc/grpc-web/closure_grpc_library.bzl @@ -17,7 +17,7 @@ def closure_grpc_library(**kwargs): transitive = True, visibility = visibility, ) - + closure_grpc_compile( name = name_pb_grpc, deps = deps, @@ -40,5 +40,3 @@ def closure_grpc_library(**kwargs): lenient = True, visibility = visibility, ) - - diff --git a/github.com/grpc/grpc-web/deps.bzl b/github.com/grpc/grpc-web/deps.bzl index e981d5fda..6f01750da 100644 --- a/github.com/grpc/grpc-web/deps.bzl +++ b/github.com/grpc/grpc-web/deps.bzl @@ -1,10 +1,10 @@ -load("//:deps.bzl", +load("//:deps.bzl", "com_github_grpc_grpc_web", "com_google_protobuf", "io_bazel_rules_closure", ) -load("//closure:deps.bzl", +load("//closure:deps.bzl", "closure_proto_compile", ) @@ -24,5 +24,4 @@ def ts_grpc_compile(**kwargs): closure_grpc_compile(**kwargs) def closure_grpc_library(**kwargs): - closure_grpc_compile(**kwargs) - + closure_grpc_compile(**kwargs) diff --git a/github.com/grpc/grpc-web/example/closure_grpc_compile/WORKSPACE b/github.com/grpc/grpc-web/example/closure_grpc_compile/WORKSPACE index 83a4efa53..ab5075d4c 100644 --- a/github.com/grpc/grpc-web/example/closure_grpc_compile/WORKSPACE +++ b/github.com/grpc/grpc-web/example/closure_grpc_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/github.com/grpc/grpc-web/example/closure_grpc_library/WORKSPACE b/github.com/grpc/grpc-web/example/closure_grpc_library/WORKSPACE index 852f69d29..d2dd349d8 100644 --- a/github.com/grpc/grpc-web/example/closure_grpc_library/WORKSPACE +++ b/github.com/grpc/grpc-web/example/closure_grpc_library/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/github.com/grpc/grpc-web/example/commonjs_dts_grpc_compile/WORKSPACE b/github.com/grpc/grpc-web/example/commonjs_dts_grpc_compile/WORKSPACE index 053dc693a..8a7a4a179 100644 --- a/github.com/grpc/grpc-web/example/commonjs_dts_grpc_compile/WORKSPACE +++ b/github.com/grpc/grpc-web/example/commonjs_dts_grpc_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/github.com/grpc/grpc-web/example/commonjs_grpc_compile/WORKSPACE b/github.com/grpc/grpc-web/example/commonjs_grpc_compile/WORKSPACE index 027add3d4..324c40d2c 100644 --- a/github.com/grpc/grpc-web/example/commonjs_grpc_compile/WORKSPACE +++ b/github.com/grpc/grpc-web/example/commonjs_grpc_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/github.com/grpc/grpc-web/example/routeguide/closure/client.js b/github.com/grpc/grpc-web/example/routeguide/closure/client.js index c24afc35f..3127a651f 100644 --- a/github.com/grpc/grpc-web/example/routeguide/closure/client.js +++ b/github.com/grpc/grpc-web/example/routeguide/closure/client.js @@ -25,10 +25,10 @@ class Client { /** * List existing features. Promise resolves to a list of features. - * + * * @param {!Rectangle} rect * @param {!Object} metadata - * @return {!ClientReadableStream} + * @return {!ClientReadableStream} */ listFeatures(rect, metadata) { return this.client_.listFeatures(rect, metadata); @@ -43,4 +43,4 @@ class Client { } -exports = Client; \ No newline at end of file +exports = Client; diff --git a/github.com/grpc/grpc-web/example/routeguide/closure/client_test.js b/github.com/grpc/grpc-web/example/routeguide/closure/client_test.js index a025d8a6f..cf62f2569 100644 --- a/github.com/grpc/grpc-web/example/routeguide/closure/client_test.js +++ b/github.com/grpc/grpc-web/example/routeguide/closure/client_test.js @@ -16,11 +16,10 @@ testSuite({ testListFeatures: () => { const client = new Client("localhost", null, null); const rect = new Rectangle(); - + // Currently this segfaults phantomjs! const stream = client.listFeatures(rect, {}); asserts.assertNotNull(stream); }, }); - diff --git a/github.com/grpc/grpc-web/example/ts_grpc_compile/WORKSPACE b/github.com/grpc/grpc-web/example/ts_grpc_compile/WORKSPACE index 172b634a9..9ddff06d2 100644 --- a/github.com/grpc/grpc-web/example/ts_grpc_compile/WORKSPACE +++ b/github.com/grpc/grpc-web/example/ts_grpc_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/github.com/improbable-eng/ts-protoc-gen/BUILD.bazel b/github.com/improbable-eng/ts-protoc-gen/BUILD.bazel index c03769b1f..6fcd54ddd 100644 --- a/github.com/improbable-eng/ts-protoc-gen/BUILD.bazel +++ b/github.com/improbable-eng/ts-protoc-gen/BUILD.bazel @@ -34,7 +34,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library", "go_embed_data go_embed_data( name = "assets", srcs = [ - ":runfiles", + ":runfiles", "@node//:node", ], package = "main", diff --git a/github.com/improbable-eng/ts-protoc-gen/README.md b/github.com/improbable-eng/ts-protoc-gen/README.md index 7c5120d8a..113d1c096 100644 --- a/github.com/improbable-eng/ts-protoc-gen/README.md +++ b/github.com/improbable-eng/ts-protoc-gen/README.md @@ -89,4 +89,3 @@ def ts_proto_compile(**kwargs): | include_imports | `bool` | `True` | Pass the --include_imports argument to the protoc_plugin | | include_source_info | `bool` | `True` | Pass the --include_source_info argument to the protoc_plugin | | transitive | `bool` | `False` | Generated outputs for *.proto directly named in `deps` AND all transitive proto_library dependencies | - diff --git a/github.com/improbable-eng/ts-protoc-gen/deps.bzl b/github.com/improbable-eng/ts-protoc-gen/deps.bzl index f786596b8..8dd9b4464 100644 --- a/github.com/improbable-eng/ts-protoc-gen/deps.bzl +++ b/github.com/improbable-eng/ts-protoc-gen/deps.bzl @@ -1,4 +1,4 @@ -load("//:deps.bzl", +load("//:deps.bzl", "bazel_gazelle", "bazel_skylib", "org_pubref_rules_node", @@ -31,6 +31,5 @@ def ts_proto_library(**kwargs): ts_proto_compile(**kwargs) def ts_grpc_library(**kwargs): - ts_grpc_compile(**kwargs) + ts_grpc_compile(**kwargs) ts_proto_library(**kwargs) - diff --git a/github.com/improbable-eng/ts-protoc-gen/example/routeguide/BUILD.bazel b/github.com/improbable-eng/ts-protoc-gen/example/routeguide/BUILD.bazel index 3de380606..125d29d1c 100644 --- a/github.com/improbable-eng/ts-protoc-gen/example/routeguide/BUILD.bazel +++ b/github.com/improbable-eng/ts-protoc-gen/example/routeguide/BUILD.bazel @@ -15,4 +15,3 @@ ts_web_test_suite( "@io_bazel_rules_webtesting//browsers:firefox-local", ], ) - diff --git a/github.com/improbable-eng/ts-protoc-gen/example/routeguide/client.py b/github.com/improbable-eng/ts-protoc-gen/example/routeguide/client.py index 64ee6d758..24347b6ec 100644 --- a/github.com/improbable-eng/ts-protoc-gen/example/routeguide/client.py +++ b/github.com/improbable-eng/ts-protoc-gen/example/routeguide/client.py @@ -125,4 +125,4 @@ def run(): if __name__ == '__main__': - run() \ No newline at end of file + run() diff --git a/github.com/improbable-eng/ts-protoc-gen/example/routeguide/resources.py b/github.com/improbable-eng/ts-protoc-gen/example/routeguide/resources.py index 4ca38f46c..2b0fb29a2 100644 --- a/github.com/improbable-eng/ts-protoc-gen/example/routeguide/resources.py +++ b/github.com/improbable-eng/ts-protoc-gen/example/routeguide/resources.py @@ -33,4 +33,4 @@ def read_route_guide_database(): latitude=item["location"]["latitude"], longitude=item["location"]["longitude"])) feature_list.append(feature) - return feature_list \ No newline at end of file + return feature_list diff --git a/github.com/improbable-eng/ts-protoc-gen/example/routeguide/server.py b/github.com/improbable-eng/ts-protoc-gen/example/routeguide/server.py index b0c0e8b3f..915042380 100644 --- a/github.com/improbable-eng/ts-protoc-gen/example/routeguide/server.py +++ b/github.com/improbable-eng/ts-protoc-gen/example/routeguide/server.py @@ -126,4 +126,4 @@ def serve(): if __name__ == '__main__': - serve() \ No newline at end of file + serve() diff --git a/github.com/improbable-eng/ts-protoc-gen/example/ts_proto_compile/WORKSPACE b/github.com/improbable-eng/ts-protoc-gen/example/ts_proto_compile/WORKSPACE index 0ea6b06ad..197b13c41 100644 --- a/github.com/improbable-eng/ts-protoc-gen/example/ts_proto_compile/WORKSPACE +++ b/github.com/improbable-eng/ts-protoc-gen/example/ts_proto_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/github.com/improbable-eng/ts-protoc-gen/library.bzl b/github.com/improbable-eng/ts-protoc-gen/library.bzl index ef9a3a995..ef464ab26 100644 --- a/github.com/improbable-eng/ts-protoc-gen/library.bzl +++ b/github.com/improbable-eng/ts-protoc-gen/library.bzl @@ -18,7 +18,7 @@ def ts_proto_library(**kwargs): transitive = True, visibility = visibility, ) - + ts_proto_compile( name = name_pb, deps = deps, @@ -50,7 +50,7 @@ def ts_grpc_library(**kwargs): transitive = True, visibility = visibility, ) - + ts_grpc_compile( name = name_pb_grpc, deps = deps, @@ -65,4 +65,4 @@ def ts_grpc_library(**kwargs): deps = [ ], visibility = visibility, - ) \ No newline at end of file + ) diff --git a/github.com/improbable-eng/ts-protoc-gen/pkg_tar.bzl b/github.com/improbable-eng/ts-protoc-gen/pkg_tar.bzl index 14c648f60..01cba9f8b 100644 --- a/github.com/improbable-eng/ts-protoc-gen/pkg_tar.bzl +++ b/github.com/improbable-eng/ts-protoc-gen/pkg_tar.bzl @@ -138,4 +138,3 @@ def pkg_tar(**kwargs): "Consider renaming it in your BUILD file.") kwargs["srcs"] = kwargs.pop("files") _real_pkg_tar(**kwargs) - diff --git a/github.com/stackb/grpc.js/README.md b/github.com/stackb/grpc.js/README.md index 14c87c1bc..bf2aedce7 100644 --- a/github.com/stackb/grpc.js/README.md +++ b/github.com/stackb/grpc.js/README.md @@ -126,7 +126,7 @@ def closure_grpc_library(**kwargs): transitivity = transitivity, visibility = visibility, ) - + closure_grpc_compile( name = name_pb_grpc, deps = deps, @@ -182,4 +182,3 @@ def closure_grpc_library(**kwargs): | include_imports | `bool` | `True` | Pass the --include_imports argument to the protoc_plugin | | include_source_info | `bool` | `True` | Pass the --include_source_info argument to the protoc_plugin | | transitive | `bool` | `False` | Generated outputs for *.proto directly named in `deps` AND all transitive proto_library dependencies | - diff --git a/github.com/stackb/grpc.js/closure_grpc_library.bzl b/github.com/stackb/grpc.js/closure_grpc_library.bzl index 2c077fb67..326a80777 100644 --- a/github.com/stackb/grpc.js/closure_grpc_library.bzl +++ b/github.com/stackb/grpc.js/closure_grpc_library.bzl @@ -20,7 +20,7 @@ def closure_grpc_library(**kwargs): transitivity = transitivity, visibility = visibility, ) - + closure_grpc_compile( name = name_pb_grpc, deps = deps, @@ -54,4 +54,3 @@ def closure_grpc_library(**kwargs): ], visibility = visibility, ) - diff --git a/github.com/stackb/grpc.js/deps.bzl b/github.com/stackb/grpc.js/deps.bzl index d0a7ac79c..26e4f3b8d 100644 --- a/github.com/stackb/grpc.js/deps.bzl +++ b/github.com/stackb/grpc.js/deps.bzl @@ -1,11 +1,11 @@ -load("//:deps.bzl", +load("//:deps.bzl", "com_github_stackb_grpc_js", "com_google_protobuf", "io_bazel_rules_closure", "io_bazel_rules_go", ) -load("//closure:deps.bzl", +load("//closure:deps.bzl", "closure_proto_compile", ) @@ -20,5 +20,5 @@ def closure_grpc_compile(**kwargs): def closure_grpc_library(**kwargs): closure_proto_compile(**kwargs) - closure_grpc_compile(**kwargs) + closure_grpc_compile(**kwargs) io_bazel_rules_closure(**kwargs) diff --git a/github.com/stackb/grpc.js/example/closure_grpc_compile/WORKSPACE b/github.com/stackb/grpc.js/example/closure_grpc_compile/WORKSPACE index 664134e25..570820219 100644 --- a/github.com/stackb/grpc.js/example/closure_grpc_compile/WORKSPACE +++ b/github.com/stackb/grpc.js/example/closure_grpc_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/github.com/stackb/grpc.js/example/closure_grpc_library/WORKSPACE b/github.com/stackb/grpc.js/example/closure_grpc_library/WORKSPACE index 82e4e2860..76258481b 100644 --- a/github.com/stackb/grpc.js/example/closure_grpc_library/WORKSPACE +++ b/github.com/stackb/grpc.js/example/closure_grpc_library/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/github.com/stackb/grpc.js/example/routeguide/client/client.js b/github.com/stackb/grpc.js/example/routeguide/client/client.js index 4efc065e2..20ce0dd7d 100644 --- a/github.com/stackb/grpc.js/example/routeguide/client/client.js +++ b/github.com/stackb/grpc.js/example/routeguide/client/client.js @@ -20,13 +20,13 @@ class Client { /** * List existing features. Promise resolves to a list of features. - * + * * @param {!Rectangle} rect - * @return {!GoogPromise>} feature + * @return {!GoogPromise>} feature */ listFeatures(rect) { /** - * @type {!Array} + * @type {!Array} */ const features = []; @@ -44,4 +44,4 @@ class Client { } -exports = Client; \ No newline at end of file +exports = Client; diff --git a/github.com/stackb/grpc.js/example/routeguide/client/client_test.js b/github.com/stackb/grpc.js/example/routeguide/client/client_test.js index d96ab2d7b..aa3d7a3bd 100644 --- a/github.com/stackb/grpc.js/example/routeguide/client/client_test.js +++ b/github.com/stackb/grpc.js/example/routeguide/client/client_test.js @@ -15,11 +15,10 @@ testSuite({ testListFeatures: () => { const client = new Client(); const rect = new Rectangle(); - + return client.listFeatures(rect).then(features => { asserts.assertEquals(0, features.length); }); }, }); - diff --git a/go/BUILD.bazel b/go/BUILD.bazel index fb9233925..53013319f 100644 --- a/go/BUILD.bazel +++ b/go/BUILD.bazel @@ -1,4 +1,3 @@ - load("//:plugin.bzl", "proto_plugin") proto_plugin( diff --git a/go/README.md b/go/README.md index b57a60b62..f49bcb282 100644 --- a/go/README.md +++ b/go/README.md @@ -360,4 +360,3 @@ def go_grpc_library(**kwargs): | transitive | `bool` | `False` | Generated outputs for *.proto directly named in `deps` AND all transitive proto_library dependencies | | importpath | `string` | `None` | Importpath for the generated artifacts | | importmap | `string_dict` | `None` | A dictionary of the form `{ K: V}` that dictates the importpath `V` for a matching imported proto file `K` | - diff --git a/go/deps.bzl b/go/deps.bzl index 664c2d78c..007c7803a 100644 --- a/go/deps.bzl +++ b/go/deps.bzl @@ -1,10 +1,10 @@ -load("//:deps.bzl", +load("//:deps.bzl", "io_bazel_rules_go", - "com_google_protobuf", + "com_google_protobuf", ) def go_proto_compile(**kwargs): - com_google_protobuf(**kwargs) + com_google_protobuf(**kwargs) io_bazel_rules_go(**kwargs) def go_grpc_compile(**kwargs): diff --git a/go/example/go_grpc_compile/WORKSPACE b/go/example/go_grpc_compile/WORKSPACE index 42b79cf9c..3bf4f861c 100644 --- a/go/example/go_grpc_compile/WORKSPACE +++ b/go/example/go_grpc_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/go/example/go_grpc_library/WORKSPACE b/go/example/go_grpc_library/WORKSPACE index 85e417064..e03fe2767 100644 --- a/go/example/go_grpc_library/WORKSPACE +++ b/go/example/go_grpc_library/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/go/example/go_proto_compile/WORKSPACE b/go/example/go_proto_compile/WORKSPACE index 754325f4b..b1bb7c308 100644 --- a/go/example/go_proto_compile/WORKSPACE +++ b/go/example/go_proto_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/go/example/go_proto_library/WORKSPACE b/go/example/go_proto_library/WORKSPACE index bb7dfc5bd..d98524f21 100644 --- a/go/example/go_proto_library/WORKSPACE +++ b/go/example/go_proto_library/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/go/go_grpc_compile.bzl b/go/go_grpc_compile.bzl index a9a833e23..30509fa77 100644 --- a/go/go_grpc_compile.bzl +++ b/go/go_grpc_compile.bzl @@ -22,4 +22,3 @@ def go_grpc_compile(**kwargs): proto_compile( **kwargs ) - diff --git a/go/go_grpc_library.bzl b/go/go_grpc_library.bzl index b64d18a6f..15d50ab67 100644 --- a/go/go_grpc_library.bzl +++ b/go/go_grpc_library.bzl @@ -30,4 +30,3 @@ def go_grpc_library(**kwargs): importpath = importpath, visibility = visibility, ) - diff --git a/go/go_proto_compile.bzl b/go/go_proto_compile.bzl index 119784f9d..2efa3b85c 100644 --- a/go/go_proto_compile.bzl +++ b/go/go_proto_compile.bzl @@ -22,4 +22,3 @@ def go_proto_compile(**kwargs): proto_compile( **kwargs ) - diff --git a/go/go_proto_library.bzl b/go/go_proto_library.bzl index 2d74817f5..454b94921 100644 --- a/go/go_proto_library.bzl +++ b/go/go_proto_library.bzl @@ -28,4 +28,3 @@ def go_proto_library(**kwargs): importpath = importpath, visibility = visibility, ) - diff --git a/go/utils.bzl b/go/utils.bzl index e18e62f26..e229c09ba 100644 --- a/go/utils.bzl +++ b/go/utils.bzl @@ -1,9 +1,8 @@ - def get_importmappings(mappings): """Build list of importmappings Args: - mappings: dict src: dst + mappings: dict src: dst Returns list in the form 'M{src}={dst}` """ diff --git a/java/README.md b/java/README.md index 6c7bf7dc3..dc94927e4 100644 --- a/java/README.md +++ b/java/README.md @@ -280,4 +280,3 @@ def java_grpc_library(**kwargs): | include_imports | `bool` | `True` | Pass the --include_imports argument to the protoc_plugin | | include_source_info | `bool` | `True` | Pass the --include_source_info argument to the protoc_plugin | | transitive | `bool` | `False` | Generated outputs for *.proto directly named in `deps` AND all transitive proto_library dependencies | - diff --git a/java/deps.bzl b/java/deps.bzl index 185f34aa5..1140d2cda 100644 --- a/java/deps.bzl +++ b/java/deps.bzl @@ -1,6 +1,6 @@ -load("//:deps.bzl", +load("//:deps.bzl", "com_google_guava_guava", - "com_google_protobuf", + "com_google_protobuf", "io_grpc_grpc_java", ) @@ -10,7 +10,7 @@ def java_proto_compile(**kwargs): def java_grpc_compile(**kwargs): java_proto_compile(**kwargs) io_grpc_grpc_java(**kwargs) - + def java_proto_library(**kwargs): java_proto_compile(**kwargs) com_google_guava_guava(**kwargs) diff --git a/java/example/java_grpc_compile/WORKSPACE b/java/example/java_grpc_compile/WORKSPACE index 7486381b1..6c5c41e41 100644 --- a/java/example/java_grpc_compile/WORKSPACE +++ b/java/example/java_grpc_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/java/example/java_grpc_library/WORKSPACE b/java/example/java_grpc_library/WORKSPACE index 1760f98da..06bb96539 100644 --- a/java/example/java_grpc_library/WORKSPACE +++ b/java/example/java_grpc_library/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/java/example/java_proto_compile/WORKSPACE b/java/example/java_proto_compile/WORKSPACE index 8dcfa21fa..67aca4e0c 100644 --- a/java/example/java_proto_compile/WORKSPACE +++ b/java/example/java_proto_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/java/example/java_proto_library/WORKSPACE b/java/example/java_proto_library/WORKSPACE index ee0575e6b..217b55473 100644 --- a/java/example/java_proto_library/WORKSPACE +++ b/java/example/java_proto_library/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/java/example/routeguide/BUILD.bazel b/java/example/routeguide/BUILD.bazel index 980e4a37f..a8892b96f 100644 --- a/java/example/routeguide/BUILD.bazel +++ b/java/example/routeguide/BUILD.bazel @@ -39,4 +39,4 @@ java_binary( "//java:grpc_netty", ], resources = ["route_guide_db.json"], -) \ No newline at end of file +) diff --git a/java/example/routeguide/io/grpc/examples/routeguide/RouteGuideClient.java b/java/example/routeguide/io/grpc/examples/routeguide/RouteGuideClient.java index b99b9f5c2..a65f120a3 100644 --- a/java/example/routeguide/io/grpc/examples/routeguide/RouteGuideClient.java +++ b/java/example/routeguide/io/grpc/examples/routeguide/RouteGuideClient.java @@ -324,4 +324,4 @@ interface TestHelper { void setTestHelper(TestHelper testHelper) { this.testHelper = testHelper; } -} \ No newline at end of file +} diff --git a/java/example/routeguide/io/grpc/examples/routeguide/RouteGuideServer.java b/java/example/routeguide/io/grpc/examples/routeguide/RouteGuideServer.java index 407c6378b..48c2a043e 100644 --- a/java/example/routeguide/io/grpc/examples/routeguide/RouteGuideServer.java +++ b/java/example/routeguide/io/grpc/examples/routeguide/RouteGuideServer.java @@ -291,4 +291,4 @@ private static int calcDistance(Point start, Point end) { return (int) (r * c); } } -} \ No newline at end of file +} diff --git a/java/example/routeguide/io/grpc/examples/routeguide/RouteGuideUtil.java b/java/example/routeguide/io/grpc/examples/routeguide/RouteGuideUtil.java index 7750fb12b..090a1bf01 100644 --- a/java/example/routeguide/io/grpc/examples/routeguide/RouteGuideUtil.java +++ b/java/example/routeguide/io/grpc/examples/routeguide/RouteGuideUtil.java @@ -84,4 +84,4 @@ public static List parseFeatures(URL file) throws IOException { public static boolean exists(Feature feature) { return feature != null && !feature.getName().isEmpty(); } -} \ No newline at end of file +} diff --git a/java/example/routeguide/route_guide_db.json b/java/example/routeguide/route_guide_db.json index e387f5738..8c7b8b3aa 100644 --- a/java/example/routeguide/route_guide_db.json +++ b/java/example/routeguide/route_guide_db.json @@ -600,4 +600,4 @@ }, "name": "3 Hasta Way, Newton, NJ 07860, USA" }] - } \ No newline at end of file + } diff --git a/java/java_grpc_library.bzl b/java/java_grpc_library.bzl index cddc1bf72..8e3584e55 100644 --- a/java/java_grpc_library.bzl +++ b/java/java_grpc_library.bzl @@ -21,4 +21,3 @@ def java_grpc_library(**kwargs): ], visibility = visibility, ) - diff --git a/java/java_proto_library.bzl b/java/java_proto_library.bzl index b6e034a93..ecd4fb8e1 100644 --- a/java/java_proto_library.bzl +++ b/java/java_proto_library.bzl @@ -21,4 +21,3 @@ def java_proto_library(**kwargs): ], visibility = visibility, ) - diff --git a/node/BUILD.bazel b/node/BUILD.bazel index 34aa07236..9b7533d28 100644 --- a/node/BUILD.bazel +++ b/node/BUILD.bazel @@ -1,4 +1,3 @@ - load("//:plugin.bzl", "proto_plugin") proto_plugin( diff --git a/node/README.md b/node/README.md index 50be27cf3..fa78eea59 100644 --- a/node/README.md +++ b/node/README.md @@ -330,4 +330,3 @@ def node_grpc_library(**kwargs): | include_imports | `bool` | `True` | Pass the --include_imports argument to the protoc_plugin | | include_source_info | `bool` | `True` | Pass the --include_source_info argument to the protoc_plugin | | transitive | `bool` | `False` | Generated outputs for *.proto directly named in `deps` AND all transitive proto_library dependencies | - diff --git a/node/deps.bzl b/node/deps.bzl index 09dcb11aa..1ac9c0d75 100644 --- a/node/deps.bzl +++ b/node/deps.bzl @@ -1,6 +1,6 @@ -load("//:deps.bzl", +load("//:deps.bzl", "com_github_grpc_grpc", - "com_google_protobuf", + "com_google_protobuf", "org_pubref_rules_node", ) diff --git a/node/example/node_grpc_compile/WORKSPACE b/node/example/node_grpc_compile/WORKSPACE index f0b4f6518..b0c0614de 100644 --- a/node/example/node_grpc_compile/WORKSPACE +++ b/node/example/node_grpc_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/node/example/node_grpc_library/WORKSPACE b/node/example/node_grpc_library/WORKSPACE index 237724b7e..78308219f 100644 --- a/node/example/node_grpc_library/WORKSPACE +++ b/node/example/node_grpc_library/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ @@ -40,5 +39,3 @@ yarn_modules( "grpc": "1.15.1", }, ) - - diff --git a/node/example/node_proto_compile/WORKSPACE b/node/example/node_proto_compile/WORKSPACE index 85b13501a..6805cb758 100644 --- a/node/example/node_proto_compile/WORKSPACE +++ b/node/example/node_proto_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/node/example/node_proto_library/WORKSPACE b/node/example/node_proto_library/WORKSPACE index 16e451d5b..ba807e475 100644 --- a/node/example/node_proto_library/WORKSPACE +++ b/node/example/node_proto_library/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ @@ -29,4 +28,3 @@ yarn_modules( "google-protobuf": "3.6.1", }, ) - diff --git a/node/example/routeguide/client.js b/node/example/routeguide/client.js index f52b63fb0..efb8e05dc 100644 --- a/node/example/routeguide/client.js +++ b/node/example/routeguide/client.js @@ -57,7 +57,7 @@ const messages = routeguide.routeguide_pb; const services = routeguide.routeguide_grpc_pb; //console.log("routeguide services", services); -// This is included as data in the client node_module, so we can load +// This is included as data in the client node_module, so we can load // this database as a constant. const featureList = require('./example/proto/routeguide_features.json'); console.log(`Loaded ${featureList.length} from feature database`); @@ -80,7 +80,7 @@ function runGetFeature(callback) { console.warn("ERROR occured while attempting to get feature", error); if (callback) { callback(error); - callback = undefined + callback = undefined } return; } @@ -271,4 +271,4 @@ exports.runListFeatures = runListFeatures; exports.runRecordRoute = runRecordRoute; -exports.runRouteChat = runRouteChat; \ No newline at end of file +exports.runRouteChat = runRouteChat; diff --git a/node/example/routeguide/server.js b/node/example/routeguide/server.js index 1e86f1bb5..e732471ff 100644 --- a/node/example/routeguide/server.js +++ b/node/example/routeguide/server.js @@ -241,4 +241,4 @@ if (require.main === module) { routeServer.start(); } -exports.getServer = getServer; \ No newline at end of file +exports.getServer = getServer; diff --git a/node/node_grpc_library.bzl b/node/node_grpc_library.bzl index 39a0d51b0..f087e75ef 100644 --- a/node/node_grpc_library.bzl +++ b/node/node_grpc_library.bzl @@ -30,4 +30,3 @@ def node_grpc_library(**kwargs): ], visibility = visibility, ) - diff --git a/node/node_proto_library.bzl b/node/node_proto_library.bzl index 419b8c3e5..1113664a4 100644 --- a/node/node_proto_library.bzl +++ b/node/node_proto_library.bzl @@ -29,4 +29,3 @@ def node_proto_library(**kwargs): ], visibility = visibility, ) - diff --git a/objc/BUILD.bazel b/objc/BUILD.bazel index 3c059aa3c..478ff9e1b 100644 --- a/objc/BUILD.bazel +++ b/objc/BUILD.bazel @@ -1,4 +1,3 @@ - load("//:plugin.bzl", "proto_plugin") proto_plugin( diff --git a/objc/README.md b/objc/README.md index 0e3514bd3..eb088aac8 100644 --- a/objc/README.md +++ b/objc/README.md @@ -127,4 +127,3 @@ def objc_grpc_compile(**kwargs): | include_imports | `bool` | `True` | Pass the --include_imports argument to the protoc_plugin | | include_source_info | `bool` | `True` | Pass the --include_source_info argument to the protoc_plugin | | transitive | `bool` | `False` | Generated outputs for *.proto directly named in `deps` AND all transitive proto_library dependencies | - diff --git a/objc/deps.bzl b/objc/deps.bzl index 7c530519c..7da8b927c 100644 --- a/objc/deps.bzl +++ b/objc/deps.bzl @@ -1,6 +1,6 @@ -load("//:deps.bzl", +load("//:deps.bzl", "com_github_grpc_grpc", - "com_google_protobuf", + "com_google_protobuf", ) def objc_proto_compile(**kwargs): @@ -15,4 +15,4 @@ def objc_grpc_compile(**kwargs): # def objc_grpc_library(**kwargs): # objc_grpc_compile(**kwargs) -# objc_proto_library(**kwargs) \ No newline at end of file +# objc_proto_library(**kwargs) diff --git a/objc/example/objc_grpc_compile/WORKSPACE b/objc/example/objc_grpc_compile/WORKSPACE index bf2a70af6..ac572b4b9 100644 --- a/objc/example/objc_grpc_compile/WORKSPACE +++ b/objc/example/objc_grpc_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/objc/example/objc_proto_compile/WORKSPACE b/objc/example/objc_proto_compile/WORKSPACE index ca87473db..c6dcd04dc 100644 --- a/objc/example/objc_proto_compile/WORKSPACE +++ b/objc/example/objc_proto_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/php/BUILD.bazel b/php/BUILD.bazel index 661d056cb..2aa78c18d 100644 --- a/php/BUILD.bazel +++ b/php/BUILD.bazel @@ -1,4 +1,3 @@ - load("//:plugin.bzl", "proto_plugin") proto_plugin( diff --git a/php/README.md b/php/README.md index 9b4230cfd..7613f2af8 100644 --- a/php/README.md +++ b/php/README.md @@ -127,4 +127,3 @@ def php_grpc_compile(**kwargs): | include_imports | `bool` | `True` | Pass the --include_imports argument to the protoc_plugin | | include_source_info | `bool` | `True` | Pass the --include_source_info argument to the protoc_plugin | | transitive | `bool` | `False` | Generated outputs for *.proto directly named in `deps` AND all transitive proto_library dependencies | - diff --git a/php/deps.bzl b/php/deps.bzl index 4d276e46b..f8ac69b02 100644 --- a/php/deps.bzl +++ b/php/deps.bzl @@ -1,6 +1,6 @@ -load("//:deps.bzl", +load("//:deps.bzl", "com_github_grpc_grpc", - "com_google_protobuf", + "com_google_protobuf", ) def php_proto_compile(**kwargs): diff --git a/php/example/php_grpc_compile/WORKSPACE b/php/example/php_grpc_compile/WORKSPACE index 31a98ec1f..edc6f8d0d 100644 --- a/php/example/php_grpc_compile/WORKSPACE +++ b/php/example/php_grpc_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/php/example/php_proto_compile/WORKSPACE b/php/example/php_proto_compile/WORKSPACE index ef3c93981..5f664f914 100644 --- a/php/example/php_proto_compile/WORKSPACE +++ b/php/example/php_proto_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/plugin.bzl b/plugin.bzl index 32925ae19..78b844332 100644 --- a/plugin.bzl +++ b/plugin.bzl @@ -53,4 +53,3 @@ proto_plugin = rule( ), } ) - diff --git a/python/BUILD.bazel b/python/BUILD.bazel index 797f9ea7d..a5e82ee1b 100644 --- a/python/BUILD.bazel +++ b/python/BUILD.bazel @@ -1,4 +1,3 @@ - load("//:plugin.bzl", "proto_plugin") proto_plugin( diff --git a/python/README.md b/python/README.md index 1e45dfeb8..d0ea6ab8b 100644 --- a/python/README.md +++ b/python/README.md @@ -330,4 +330,3 @@ py_grpc_library = python_grpc_library | include_imports | `bool` | `True` | Pass the --include_imports argument to the protoc_plugin | | include_source_info | `bool` | `True` | Pass the --include_source_info argument to the protoc_plugin | | transitive | `bool` | `False` | Generated outputs for *.proto directly named in `deps` AND all transitive proto_library dependencies | - diff --git a/python/deps.bzl b/python/deps.bzl index fdae848c1..251be45f5 100644 --- a/python/deps.bzl +++ b/python/deps.bzl @@ -1,4 +1,4 @@ -load("//:deps.bzl", +load("//:deps.bzl", "com_github_grpc_grpc", "com_google_protobuf", "io_bazel_rules_python", @@ -20,4 +20,4 @@ def python_proto_library(**kwargs): def python_grpc_library(**kwargs): python_grpc_compile(**kwargs) - python_proto_library(**kwargs) \ No newline at end of file + python_proto_library(**kwargs) diff --git a/python/example/python_grpc_compile/WORKSPACE b/python/example/python_grpc_compile/WORKSPACE index a2867c2d0..4ba12d91a 100644 --- a/python/example/python_grpc_compile/WORKSPACE +++ b/python/example/python_grpc_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/python/example/python_grpc_library/WORKSPACE b/python/example/python_grpc_library/WORKSPACE index 3b5a17c4d..ee58487c1 100644 --- a/python/example/python_grpc_library/WORKSPACE +++ b/python/example/python_grpc_library/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/python/example/python_proto_compile/WORKSPACE b/python/example/python_proto_compile/WORKSPACE index 8469e0fe4..282d43815 100644 --- a/python/example/python_proto_compile/WORKSPACE +++ b/python/example/python_proto_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/python/example/python_proto_library/WORKSPACE b/python/example/python_proto_library/WORKSPACE index 6c14412fb..db3a70fe8 100644 --- a/python/example/python_proto_library/WORKSPACE +++ b/python/example/python_proto_library/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ @@ -31,4 +30,3 @@ pip_import( load("@protobuf_py_deps//:requirements.bzl", protobuf_pip_install = "pip_install") protobuf_pip_install() - diff --git a/python/example/routeguide/client.py b/python/example/routeguide/client.py index df95cf5d0..247db2aa3 100644 --- a/python/example/routeguide/client.py +++ b/python/example/routeguide/client.py @@ -118,4 +118,4 @@ def run(): if __name__ == '__main__': - run() \ No newline at end of file + run() diff --git a/python/example/routeguide/resources.py b/python/example/routeguide/resources.py index e94b8f34f..1da126339 100644 --- a/python/example/routeguide/resources.py +++ b/python/example/routeguide/resources.py @@ -33,4 +33,4 @@ def read_route_guide_database(): latitude=item["location"]["latitude"], longitude=item["location"]["longitude"])) feature_list.append(feature) - return feature_list \ No newline at end of file + return feature_list diff --git a/python/example/routeguide/server.py b/python/example/routeguide/server.py index cb49df9a7..1668ec24d 100644 --- a/python/example/routeguide/server.py +++ b/python/example/routeguide/server.py @@ -131,4 +131,4 @@ def serve(): if __name__ == '__main__': - serve() \ No newline at end of file + serve() diff --git a/python/grpc_library.bzl b/python/grpc_library.bzl index 6b45d8e5f..093cc8335 100644 --- a/python/grpc_library.bzl +++ b/python/grpc_library.bzl @@ -26,4 +26,4 @@ def python_grpc_library(**kwargs): ) # Alias -py_grpc_library = python_grpc_library \ No newline at end of file +py_grpc_library = python_grpc_library diff --git a/python/python_grpc_library.bzl b/python/python_grpc_library.bzl index 6765146fa..d8c723afa 100644 --- a/python/python_grpc_library.bzl +++ b/python/python_grpc_library.bzl @@ -28,4 +28,3 @@ def python_grpc_library(**kwargs): # Alias py_grpc_library = python_grpc_library - diff --git a/python/python_proto_library.bzl b/python/python_proto_library.bzl index b3ef2af27..7670c0087 100644 --- a/python/python_proto_library.bzl +++ b/python/python_proto_library.bzl @@ -27,4 +27,3 @@ def python_proto_library(**kwargs): # Alias py_proto_library = python_proto_library - diff --git a/python/requirements.txt b/python/requirements.txt index 9bc746114..3431d7874 100644 --- a/python/requirements.txt +++ b/python/requirements.txt @@ -1,2 +1,2 @@ grpcio==1.15.0 -protobuf==3.6.1 \ No newline at end of file +protobuf==3.6.1 diff --git a/python/requirements/grpc.txt b/python/requirements/grpc.txt index 0e3c0383d..f3bad8969 100644 --- a/python/requirements/grpc.txt +++ b/python/requirements/grpc.txt @@ -1 +1 @@ -grpcio==1.15.0 \ No newline at end of file +grpcio==1.15.0 diff --git a/python/requirements/protobuf.txt b/python/requirements/protobuf.txt index 154300fb2..3428e8a68 100644 --- a/python/requirements/protobuf.txt +++ b/python/requirements/protobuf.txt @@ -1 +1 @@ -protobuf==3.6.1 \ No newline at end of file +protobuf==3.6.1 diff --git a/ruby/BUILD.bazel b/ruby/BUILD.bazel index 8f473d6da..c8b488cda 100644 --- a/ruby/BUILD.bazel +++ b/ruby/BUILD.bazel @@ -1,4 +1,3 @@ - load("//:plugin.bzl", "proto_plugin") proto_plugin( diff --git a/ruby/README.md b/ruby/README.md index cdea3cfc9..4431f7d37 100644 --- a/ruby/README.md +++ b/ruby/README.md @@ -180,7 +180,7 @@ def ruby_proto_library(**kwargs): visibility = kwargs.get("visibility") name_pb = name + "_pb" - + ruby_proto_compile( name = name_pb, deps = deps, @@ -191,7 +191,7 @@ def ruby_proto_library(**kwargs): ruby_library( name = name, srcs = [name_pb], - includes = ["{package}/%s" % name_pb], + includes = ["{package}/%s" % name_pb], visibility = visibility, ) @@ -282,7 +282,7 @@ def ruby_grpc_library(**kwargs): ruby_library( name = name, srcs = [name_pb], - includes = ["{package}/%s" % name_pb], + includes = ["{package}/%s" % name_pb], visibility = visibility, ) @@ -307,4 +307,3 @@ def ruby_grpc_library(**kwargs): | include_imports | `bool` | `True` | Pass the --include_imports argument to the protoc_plugin | | include_source_info | `bool` | `True` | Pass the --include_source_info argument to the protoc_plugin | | transitive | `bool` | `False` | Generated outputs for *.proto directly named in `deps` AND all transitive proto_library dependencies | - diff --git a/ruby/deps.bzl b/ruby/deps.bzl index 47a761d99..2e812b97d 100644 --- a/ruby/deps.bzl +++ b/ruby/deps.bzl @@ -1,5 +1,4 @@ - -load("//:deps.bzl", +load("//:deps.bzl", "com_google_protobuf", "com_github_grpc_grpc", "com_github_yugui_rules_ruby", diff --git a/ruby/example/routeguide/BUILD.bazel b/ruby/example/routeguide/BUILD.bazel index ad01cb8b4..6c49b46ff 100644 --- a/ruby/example/routeguide/BUILD.bazel +++ b/ruby/example/routeguide/BUILD.bazel @@ -4,7 +4,7 @@ load("@com_github_yugui_rules_ruby//ruby:def.bzl", "ruby_library", "ruby_binary" ruby_grpc_library( name = "routeguide", deps = ["//example/proto:routeguide_proto"], - includes = ["."], + includes = ["."], ) ruby_binary( @@ -14,7 +14,7 @@ ruby_binary( ":routeguide", "@routeguide_gems_bundle//:libs", ], - includes = ["."], + includes = ["."], data = ["//example/proto:routeguide_features"], args = ["example/proto/routeguide_features.json"], ) diff --git a/ruby/example/routeguide/client.rb b/ruby/example/routeguide/client.rb index c39e43ac4..3dff5f65f 100644 --- a/ruby/example/routeguide/client.rb +++ b/ruby/example/routeguide/client.rb @@ -174,4 +174,4 @@ def main run_record_route(stub, raw_data) end -main \ No newline at end of file +main diff --git a/ruby/example/routeguide/server.rb b/ruby/example/routeguide/server.rb index dbfeb2d2b..83273dbf4 100644 --- a/ruby/example/routeguide/server.rb +++ b/ruby/example/routeguide/server.rb @@ -177,4 +177,4 @@ def main s.run_till_terminated end -main \ No newline at end of file +main diff --git a/ruby/example/ruby_grpc_compile/WORKSPACE b/ruby/example/ruby_grpc_compile/WORKSPACE index fbf03c423..e9389df40 100644 --- a/ruby/example/ruby_grpc_compile/WORKSPACE +++ b/ruby/example/ruby_grpc_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/ruby/example/ruby_grpc_library/WORKSPACE b/ruby/example/ruby_grpc_library/WORKSPACE index 9fc453558..9ebb7f580 100644 --- a/ruby/example/ruby_grpc_library/WORKSPACE +++ b/ruby/example/ruby_grpc_library/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ @@ -34,4 +33,3 @@ bundle_install( gemfile = "//ruby:Gemfile", gemfile_lock = "//ruby:Gemfile.lock", ) - diff --git a/ruby/example/ruby_proto_compile/WORKSPACE b/ruby/example/ruby_proto_compile/WORKSPACE index b53088191..316657a26 100644 --- a/ruby/example/ruby_proto_compile/WORKSPACE +++ b/ruby/example/ruby_proto_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ diff --git a/ruby/example/ruby_proto_library/WORKSPACE b/ruby/example/ruby_proto_library/WORKSPACE index 7cbb356d8..d658931a6 100644 --- a/ruby/example/ruby_proto_library/WORKSPACE +++ b/ruby/example/ruby_proto_library/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ @@ -30,4 +29,3 @@ bundle_install( gemfile = "//ruby:Gemfile", gemfile_lock = "//ruby:Gemfile.lock", ) - diff --git a/ruby/ruby_grpc_library.bzl b/ruby/ruby_grpc_library.bzl index 6c56d4613..3f042f071 100644 --- a/ruby/ruby_grpc_library.bzl +++ b/ruby/ruby_grpc_library.bzl @@ -18,7 +18,6 @@ def ruby_grpc_library(**kwargs): ruby_library( name = name, srcs = [name_pb], - includes = ["{package}/%s" % name_pb], + includes = ["{package}/%s" % name_pb], visibility = visibility, ) - diff --git a/ruby/ruby_proto_library.bzl b/ruby/ruby_proto_library.bzl index 5ddb27106..e05f19c2d 100644 --- a/ruby/ruby_proto_library.bzl +++ b/ruby/ruby_proto_library.bzl @@ -7,7 +7,7 @@ def ruby_proto_library(**kwargs): visibility = kwargs.get("visibility") name_pb = name + "_pb" - + ruby_proto_compile( name = name_pb, deps = deps, @@ -18,7 +18,6 @@ def ruby_proto_library(**kwargs): ruby_library( name = name, srcs = [name_pb], - includes = ["{package}/%s" % name_pb], + includes = ["{package}/%s" % name_pb], visibility = visibility, ) - diff --git a/rust/BUILD.bazel b/rust/BUILD.bazel index ba977d90b..fcff591e9 100644 --- a/rust/BUILD.bazel +++ b/rust/BUILD.bazel @@ -1,4 +1,3 @@ - load("//:plugin.bzl", "proto_plugin") proto_plugin( diff --git a/rust/README.md b/rust/README.md index 01337f832..60bf10005 100644 --- a/rust/README.md +++ b/rust/README.md @@ -330,4 +330,3 @@ def rust_grpc_library(**kwargs): | include_imports | `bool` | `True` | Pass the --include_imports argument to the protoc_plugin | | include_source_info | `bool` | `True` | Pass the --include_source_info argument to the protoc_plugin | | transitive | `bool` | `False` | Generated outputs for *.proto directly named in `deps` AND all transitive proto_library dependencies | - diff --git a/rust/cargo/Cargo.toml b/rust/cargo/Cargo.toml index 06b725b88..39d0b71e2 100644 --- a/rust/cargo/Cargo.toml +++ b/rust/cargo/Cargo.toml @@ -21,4 +21,4 @@ workspace_path = "//rust/cargo" [raze.crates.lazy_static.'1.1.0'] additional_flags = [ "--cfg=lazy_static_heap_impl", -] \ No newline at end of file +] diff --git a/rust/cargo/crates.bzl b/rust/cargo/crates.bzl index a29a4e4c2..118d49c38 100644 --- a/rust/cargo/crates.bzl +++ b/rust/cargo/crates.bzl @@ -621,4 +621,3 @@ def raze_fetch_remote_crates(): strip_prefix = "ws2_32-sys-0.2.1", build_file = str(Label("//rust/cargo/remote:ws2_32-sys-0.2.1.BUILD")) ) - diff --git a/rust/cargo/regenerate_crates.sh b/rust/cargo/regenerate_crates.sh index f121497fe..3468ff270 100755 --- a/rust/cargo/regenerate_crates.sh +++ b/rust/cargo/regenerate_crates.sh @@ -23,4 +23,4 @@ perl -p -e 's|("//rust[^"]+")|str(Label(\1))|g' "crates.bzl" #rm crates.bzl.bak # Remove these outdated rust_bench_test references -find remote -name '*BUILD' | xargs sed -i.bak '/rust_bench_test/d' \ No newline at end of file +find remote -name '*BUILD' | xargs sed -i.bak '/rust_bench_test/d' diff --git a/rust/cargo/remote/bitflags-1.0.4.BUILD b/rust/cargo/remote/bitflags-1.0.4.BUILD index 69c727b4d..5c4a6c520 100644 --- a/rust/cargo/remote/bitflags-1.0.4.BUILD +++ b/rust/cargo/remote/bitflags-1.0.4.BUILD @@ -32,4 +32,3 @@ rust_library( "default", ], ) - diff --git a/rust/cargo/remote/byteorder-1.2.6.BUILD b/rust/cargo/remote/byteorder-1.2.6.BUILD index 48cd7ccf7..4971c31ac 100644 --- a/rust/cargo/remote/byteorder-1.2.6.BUILD +++ b/rust/cargo/remote/byteorder-1.2.6.BUILD @@ -35,4 +35,3 @@ rust_library( "std", ], ) - diff --git a/rust/cargo/remote/cloudabi-0.0.3.BUILD b/rust/cargo/remote/cloudabi-0.0.3.BUILD index a24b83984..0cecb34ac 100644 --- a/rust/cargo/remote/cloudabi-0.0.3.BUILD +++ b/rust/cargo/remote/cloudabi-0.0.3.BUILD @@ -34,4 +34,3 @@ rust_library( "default", ], ) - diff --git a/rust/cargo/remote/crossbeam-utils-0.5.0.BUILD b/rust/cargo/remote/crossbeam-utils-0.5.0.BUILD index 383e6b037..c51553d41 100644 --- a/rust/cargo/remote/crossbeam-utils-0.5.0.BUILD +++ b/rust/cargo/remote/crossbeam-utils-0.5.0.BUILD @@ -33,4 +33,3 @@ rust_library( "use_std", ], ) - diff --git a/rust/cargo/remote/fuchsia-zircon-0.3.3.BUILD b/rust/cargo/remote/fuchsia-zircon-0.3.3.BUILD index 788672be3..38f44f005 100644 --- a/rust/cargo/remote/fuchsia-zircon-0.3.3.BUILD +++ b/rust/cargo/remote/fuchsia-zircon-0.3.3.BUILD @@ -33,4 +33,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/cargo/remote/grpc-compiler-0.4.0.BUILD b/rust/cargo/remote/grpc-compiler-0.4.0.BUILD index 84327e4f5..8a80c8dc3 100644 --- a/rust/cargo/remote/grpc-compiler-0.4.0.BUILD +++ b/rust/cargo/remote/grpc-compiler-0.4.0.BUILD @@ -53,4 +53,3 @@ rust_binary( crate_features = [ ], ) - diff --git a/rust/cargo/remote/iovec-0.1.2.BUILD b/rust/cargo/remote/iovec-0.1.2.BUILD index 7b8d5515c..23876db11 100644 --- a/rust/cargo/remote/iovec-0.1.2.BUILD +++ b/rust/cargo/remote/iovec-0.1.2.BUILD @@ -32,4 +32,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/cargo/remote/kernel32-sys-0.2.2.BUILD b/rust/cargo/remote/kernel32-sys-0.2.2.BUILD index 7158c5320..c6826b751 100644 --- a/rust/cargo/remote/kernel32-sys-0.2.2.BUILD +++ b/rust/cargo/remote/kernel32-sys-0.2.2.BUILD @@ -36,4 +36,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/cargo/remote/lazycell-1.2.0.BUILD b/rust/cargo/remote/lazycell-1.2.0.BUILD index 54ed9a957..8a85b4812 100644 --- a/rust/cargo/remote/lazycell-1.2.0.BUILD +++ b/rust/cargo/remote/lazycell-1.2.0.BUILD @@ -31,4 +31,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/cargo/remote/libc-0.2.43.BUILD b/rust/cargo/remote/libc-0.2.43.BUILD index ac1daa26d..74f6622fe 100644 --- a/rust/cargo/remote/libc-0.2.43.BUILD +++ b/rust/cargo/remote/libc-0.2.43.BUILD @@ -33,4 +33,3 @@ rust_library( "use_std", ], ) - diff --git a/rust/cargo/remote/lock_api-0.1.3.BUILD b/rust/cargo/remote/lock_api-0.1.3.BUILD index cf552b889..a7719c573 100644 --- a/rust/cargo/remote/lock_api-0.1.3.BUILD +++ b/rust/cargo/remote/lock_api-0.1.3.BUILD @@ -34,4 +34,3 @@ rust_library( "owning_ref", ], ) - diff --git a/rust/cargo/remote/log-0.3.9.BUILD b/rust/cargo/remote/log-0.3.9.BUILD index 405870148..2b5ac1a3a 100644 --- a/rust/cargo/remote/log-0.3.9.BUILD +++ b/rust/cargo/remote/log-0.3.9.BUILD @@ -35,4 +35,3 @@ rust_library( "use_std", ], ) - diff --git a/rust/cargo/remote/log-0.4.5.BUILD b/rust/cargo/remote/log-0.4.5.BUILD index 5ad86c31c..a28ca60cc 100644 --- a/rust/cargo/remote/log-0.4.5.BUILD +++ b/rust/cargo/remote/log-0.4.5.BUILD @@ -34,4 +34,3 @@ rust_library( "std", ], ) - diff --git a/rust/cargo/remote/memoffset-0.2.1.BUILD b/rust/cargo/remote/memoffset-0.2.1.BUILD index 895741dd5..fa4eb95f3 100644 --- a/rust/cargo/remote/memoffset-0.2.1.BUILD +++ b/rust/cargo/remote/memoffset-0.2.1.BUILD @@ -31,4 +31,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/cargo/remote/miow-0.2.1.BUILD b/rust/cargo/remote/miow-0.2.1.BUILD index 9dc2458fb..1fe1626eb 100644 --- a/rust/cargo/remote/miow-0.2.1.BUILD +++ b/rust/cargo/remote/miow-0.2.1.BUILD @@ -35,4 +35,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/cargo/remote/net2-0.2.33.BUILD b/rust/cargo/remote/net2-0.2.33.BUILD index 879909706..0f8577fa7 100644 --- a/rust/cargo/remote/net2-0.2.33.BUILD +++ b/rust/cargo/remote/net2-0.2.33.BUILD @@ -36,4 +36,3 @@ rust_library( "duration", ], ) - diff --git a/rust/cargo/remote/nodrop-0.1.12.BUILD b/rust/cargo/remote/nodrop-0.1.12.BUILD index 714a735bd..783a678f0 100644 --- a/rust/cargo/remote/nodrop-0.1.12.BUILD +++ b/rust/cargo/remote/nodrop-0.1.12.BUILD @@ -31,4 +31,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/cargo/remote/num_cpus-1.8.0.BUILD b/rust/cargo/remote/num_cpus-1.8.0.BUILD index 390effbb1..3590ceabe 100644 --- a/rust/cargo/remote/num_cpus-1.8.0.BUILD +++ b/rust/cargo/remote/num_cpus-1.8.0.BUILD @@ -32,4 +32,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/cargo/remote/owning_ref-0.3.3.BUILD b/rust/cargo/remote/owning_ref-0.3.3.BUILD index d09c0568f..a848cca62 100644 --- a/rust/cargo/remote/owning_ref-0.3.3.BUILD +++ b/rust/cargo/remote/owning_ref-0.3.3.BUILD @@ -32,4 +32,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/cargo/remote/parking_lot-0.6.4.BUILD b/rust/cargo/remote/parking_lot-0.6.4.BUILD index 2a2d08b34..f973db8ea 100644 --- a/rust/cargo/remote/parking_lot-0.6.4.BUILD +++ b/rust/cargo/remote/parking_lot-0.6.4.BUILD @@ -36,4 +36,3 @@ rust_library( "owning_ref", ], ) - diff --git a/rust/cargo/remote/parking_lot_core-0.3.1.BUILD b/rust/cargo/remote/parking_lot_core-0.3.1.BUILD index 2ce2ccecf..4d529df6c 100644 --- a/rust/cargo/remote/parking_lot_core-0.3.1.BUILD +++ b/rust/cargo/remote/parking_lot_core-0.3.1.BUILD @@ -34,4 +34,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/cargo/remote/protobuf-1.6.0.BUILD b/rust/cargo/remote/protobuf-1.6.0.BUILD index aa92d277b..925ebaa29 100644 --- a/rust/cargo/remote/protobuf-1.6.0.BUILD +++ b/rust/cargo/remote/protobuf-1.6.0.BUILD @@ -36,4 +36,3 @@ rust_library( "with-bytes", ], ) - diff --git a/rust/cargo/remote/protobuf-codegen-1.6.0.BUILD b/rust/cargo/remote/protobuf-codegen-1.6.0.BUILD index 0ed3c6b4d..08238aae0 100644 --- a/rust/cargo/remote/protobuf-codegen-1.6.0.BUILD +++ b/rust/cargo/remote/protobuf-codegen-1.6.0.BUILD @@ -70,4 +70,3 @@ rust_binary( crate_features = [ ], ) - diff --git a/rust/cargo/remote/rand-0.5.5.BUILD b/rust/cargo/remote/rand-0.5.5.BUILD index be0937721..4fe5fc9d8 100644 --- a/rust/cargo/remote/rand-0.5.5.BUILD +++ b/rust/cargo/remote/rand-0.5.5.BUILD @@ -47,4 +47,3 @@ rust_library( "winapi", ], ) - diff --git a/rust/cargo/remote/rand_core-0.2.1.BUILD b/rust/cargo/remote/rand_core-0.2.1.BUILD index 13837d1f9..21be6a28d 100644 --- a/rust/cargo/remote/rand_core-0.2.1.BUILD +++ b/rust/cargo/remote/rand_core-0.2.1.BUILD @@ -33,4 +33,3 @@ rust_library( "std", ], ) - diff --git a/rust/cargo/remote/rustc_version-0.2.3.BUILD b/rust/cargo/remote/rustc_version-0.2.3.BUILD index ce4ae5f1a..f190d3647 100644 --- a/rust/cargo/remote/rustc_version-0.2.3.BUILD +++ b/rust/cargo/remote/rustc_version-0.2.3.BUILD @@ -32,4 +32,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/cargo/remote/safemem-0.3.0.BUILD b/rust/cargo/remote/safemem-0.3.0.BUILD index 050101acf..bf2747257 100644 --- a/rust/cargo/remote/safemem-0.3.0.BUILD +++ b/rust/cargo/remote/safemem-0.3.0.BUILD @@ -33,4 +33,3 @@ rust_library( "std", ], ) - diff --git a/rust/cargo/remote/scoped-tls-0.1.2.BUILD b/rust/cargo/remote/scoped-tls-0.1.2.BUILD index 6787c9131..8ba87df1f 100644 --- a/rust/cargo/remote/scoped-tls-0.1.2.BUILD +++ b/rust/cargo/remote/scoped-tls-0.1.2.BUILD @@ -31,4 +31,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/cargo/remote/scopeguard-0.3.3.BUILD b/rust/cargo/remote/scopeguard-0.3.3.BUILD index 0be998ac3..a383faaa0 100644 --- a/rust/cargo/remote/scopeguard-0.3.3.BUILD +++ b/rust/cargo/remote/scopeguard-0.3.3.BUILD @@ -32,4 +32,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/cargo/remote/semver-parser-0.7.0.BUILD b/rust/cargo/remote/semver-parser-0.7.0.BUILD index c71ca657c..cd8dc479a 100644 --- a/rust/cargo/remote/semver-parser-0.7.0.BUILD +++ b/rust/cargo/remote/semver-parser-0.7.0.BUILD @@ -31,4 +31,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/cargo/remote/slab-0.3.0.BUILD b/rust/cargo/remote/slab-0.3.0.BUILD index 0106f4d63..df037675f 100644 --- a/rust/cargo/remote/slab-0.3.0.BUILD +++ b/rust/cargo/remote/slab-0.3.0.BUILD @@ -31,4 +31,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/cargo/remote/smallvec-0.6.5.BUILD b/rust/cargo/remote/smallvec-0.6.5.BUILD index b288de0c7..0e1e9f8fd 100644 --- a/rust/cargo/remote/smallvec-0.6.5.BUILD +++ b/rust/cargo/remote/smallvec-0.6.5.BUILD @@ -35,4 +35,3 @@ rust_library( "std", ], ) - diff --git a/rust/cargo/remote/stable_deref_trait-1.1.1.BUILD b/rust/cargo/remote/stable_deref_trait-1.1.1.BUILD index 577ac2a6e..e0e044ead 100644 --- a/rust/cargo/remote/stable_deref_trait-1.1.1.BUILD +++ b/rust/cargo/remote/stable_deref_trait-1.1.1.BUILD @@ -33,4 +33,3 @@ rust_library( "std", ], ) - diff --git a/rust/cargo/remote/tls-api-0.1.20.BUILD b/rust/cargo/remote/tls-api-0.1.20.BUILD index e786d85cd..fa77d2e6c 100644 --- a/rust/cargo/remote/tls-api-0.1.20.BUILD +++ b/rust/cargo/remote/tls-api-0.1.20.BUILD @@ -32,4 +32,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/cargo/remote/tls-api-stub-0.1.20.BUILD b/rust/cargo/remote/tls-api-stub-0.1.20.BUILD index 8e0830ef2..06644fc3e 100644 --- a/rust/cargo/remote/tls-api-stub-0.1.20.BUILD +++ b/rust/cargo/remote/tls-api-stub-0.1.20.BUILD @@ -33,4 +33,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/cargo/remote/tokio-codec-0.1.0.BUILD b/rust/cargo/remote/tokio-codec-0.1.0.BUILD index 4e5b5f602..b57351d07 100644 --- a/rust/cargo/remote/tokio-codec-0.1.0.BUILD +++ b/rust/cargo/remote/tokio-codec-0.1.0.BUILD @@ -38,4 +38,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/cargo/remote/tokio-current-thread-0.1.1.BUILD b/rust/cargo/remote/tokio-current-thread-0.1.1.BUILD index bb765b8aa..1e50d95b6 100644 --- a/rust/cargo/remote/tokio-current-thread-0.1.1.BUILD +++ b/rust/cargo/remote/tokio-current-thread-0.1.1.BUILD @@ -34,4 +34,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/cargo/remote/tokio-executor-0.1.4.BUILD b/rust/cargo/remote/tokio-executor-0.1.4.BUILD index f5da9d248..039b0bb1a 100644 --- a/rust/cargo/remote/tokio-executor-0.1.4.BUILD +++ b/rust/cargo/remote/tokio-executor-0.1.4.BUILD @@ -33,4 +33,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/cargo/remote/tokio-fs-0.1.3.BUILD b/rust/cargo/remote/tokio-fs-0.1.3.BUILD index a42fcc8a1..a71c767c6 100644 --- a/rust/cargo/remote/tokio-fs-0.1.3.BUILD +++ b/rust/cargo/remote/tokio-fs-0.1.3.BUILD @@ -36,4 +36,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/cargo/remote/tokio-io-0.1.8.BUILD b/rust/cargo/remote/tokio-io-0.1.8.BUILD index ddd88e50c..6ff8fb57d 100644 --- a/rust/cargo/remote/tokio-io-0.1.8.BUILD +++ b/rust/cargo/remote/tokio-io-0.1.8.BUILD @@ -36,4 +36,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/cargo/remote/tokio-reactor-0.1.5.BUILD b/rust/cargo/remote/tokio-reactor-0.1.5.BUILD index 3d66e60ce..fd6ab0e81 100644 --- a/rust/cargo/remote/tokio-reactor-0.1.5.BUILD +++ b/rust/cargo/remote/tokio-reactor-0.1.5.BUILD @@ -42,4 +42,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/cargo/remote/tokio-tcp-0.1.1.BUILD b/rust/cargo/remote/tokio-tcp-0.1.1.BUILD index e080b74f6..fe75242ac 100644 --- a/rust/cargo/remote/tokio-tcp-0.1.1.BUILD +++ b/rust/cargo/remote/tokio-tcp-0.1.1.BUILD @@ -42,4 +42,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/cargo/remote/tokio-threadpool-0.1.6.BUILD b/rust/cargo/remote/tokio-threadpool-0.1.6.BUILD index a6a75eee1..4677ba141 100644 --- a/rust/cargo/remote/tokio-threadpool-0.1.6.BUILD +++ b/rust/cargo/remote/tokio-threadpool-0.1.6.BUILD @@ -47,4 +47,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/cargo/remote/tokio-timer-0.1.2.BUILD b/rust/cargo/remote/tokio-timer-0.1.2.BUILD index b473fb142..0f2e48525 100644 --- a/rust/cargo/remote/tokio-timer-0.1.2.BUILD +++ b/rust/cargo/remote/tokio-timer-0.1.2.BUILD @@ -35,4 +35,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/cargo/remote/tokio-timer-0.2.6.BUILD b/rust/cargo/remote/tokio-timer-0.2.6.BUILD index 9293f74d8..2a98a4c65 100644 --- a/rust/cargo/remote/tokio-timer-0.2.6.BUILD +++ b/rust/cargo/remote/tokio-timer-0.2.6.BUILD @@ -42,4 +42,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/cargo/remote/tokio-tls-api-0.1.20.BUILD b/rust/cargo/remote/tokio-tls-api-0.1.20.BUILD index 39c72f778..0de031ba7 100644 --- a/rust/cargo/remote/tokio-tls-api-0.1.20.BUILD +++ b/rust/cargo/remote/tokio-tls-api-0.1.20.BUILD @@ -37,4 +37,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/cargo/remote/tokio-uds-0.1.7.BUILD b/rust/cargo/remote/tokio-uds-0.1.7.BUILD index 1dc1f53bd..d2ab6cc63 100644 --- a/rust/cargo/remote/tokio-uds-0.1.7.BUILD +++ b/rust/cargo/remote/tokio-uds-0.1.7.BUILD @@ -40,4 +40,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/cargo/remote/tokio-uds-0.2.1.BUILD b/rust/cargo/remote/tokio-uds-0.2.1.BUILD index a4626bcdd..debe081da 100644 --- a/rust/cargo/remote/tokio-uds-0.2.1.BUILD +++ b/rust/cargo/remote/tokio-uds-0.2.1.BUILD @@ -41,4 +41,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/cargo/remote/unix_socket-0.5.0.BUILD b/rust/cargo/remote/unix_socket-0.5.0.BUILD index dbaa265e0..40be20f31 100644 --- a/rust/cargo/remote/unix_socket-0.5.0.BUILD +++ b/rust/cargo/remote/unix_socket-0.5.0.BUILD @@ -33,4 +33,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/cargo/remote/unreachable-1.0.0.BUILD b/rust/cargo/remote/unreachable-1.0.0.BUILD index eb2ab54a0..07975b947 100644 --- a/rust/cargo/remote/unreachable-1.0.0.BUILD +++ b/rust/cargo/remote/unreachable-1.0.0.BUILD @@ -32,4 +32,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/cargo/remote/version_check-0.1.5.BUILD b/rust/cargo/remote/version_check-0.1.5.BUILD index 18a7cbd22..49d41a424 100644 --- a/rust/cargo/remote/version_check-0.1.5.BUILD +++ b/rust/cargo/remote/version_check-0.1.5.BUILD @@ -31,4 +31,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/cargo/remote/void-1.0.2.BUILD b/rust/cargo/remote/void-1.0.2.BUILD index 5f5cc7ec1..81bf93f38 100644 --- a/rust/cargo/remote/void-1.0.2.BUILD +++ b/rust/cargo/remote/void-1.0.2.BUILD @@ -33,4 +33,3 @@ rust_library( "std", ], ) - diff --git a/rust/cargo/remote/winapi-0.2.8.BUILD b/rust/cargo/remote/winapi-0.2.8.BUILD index 1f0635c01..88c97a79b 100644 --- a/rust/cargo/remote/winapi-0.2.8.BUILD +++ b/rust/cargo/remote/winapi-0.2.8.BUILD @@ -31,4 +31,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/cargo/remote/winapi-0.3.6.BUILD b/rust/cargo/remote/winapi-0.3.6.BUILD index f262e5fa8..2ba61c48a 100644 --- a/rust/cargo/remote/winapi-0.3.6.BUILD +++ b/rust/cargo/remote/winapi-0.3.6.BUILD @@ -44,4 +44,3 @@ rust_library( "ws2tcpip", ], ) - diff --git a/rust/cargo/remote/winapi-build-0.1.1.BUILD b/rust/cargo/remote/winapi-build-0.1.1.BUILD index 6c6c3f89e..57f5b7adf 100644 --- a/rust/cargo/remote/winapi-build-0.1.1.BUILD +++ b/rust/cargo/remote/winapi-build-0.1.1.BUILD @@ -35,4 +35,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/cargo/remote/winapi-i686-pc-windows-gnu-0.4.0.BUILD b/rust/cargo/remote/winapi-i686-pc-windows-gnu-0.4.0.BUILD index fc8278944..f55304ad0 100644 --- a/rust/cargo/remote/winapi-i686-pc-windows-gnu-0.4.0.BUILD +++ b/rust/cargo/remote/winapi-i686-pc-windows-gnu-0.4.0.BUILD @@ -31,4 +31,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/cargo/remote/winapi-x86_64-pc-windows-gnu-0.4.0.BUILD b/rust/cargo/remote/winapi-x86_64-pc-windows-gnu-0.4.0.BUILD index 64746c72f..6a3a01722 100644 --- a/rust/cargo/remote/winapi-x86_64-pc-windows-gnu-0.4.0.BUILD +++ b/rust/cargo/remote/winapi-x86_64-pc-windows-gnu-0.4.0.BUILD @@ -31,4 +31,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/cargo/remote/ws2_32-sys-0.2.1.BUILD b/rust/cargo/remote/ws2_32-sys-0.2.1.BUILD index 84dd90f8a..860d39586 100644 --- a/rust/cargo/remote/ws2_32-sys-0.2.1.BUILD +++ b/rust/cargo/remote/ws2_32-sys-0.2.1.BUILD @@ -36,4 +36,3 @@ rust_library( crate_features = [ ], ) - diff --git a/rust/deps.bzl b/rust/deps.bzl index 1bc778e62..acc9a52a7 100644 --- a/rust/deps.bzl +++ b/rust/deps.bzl @@ -1,4 +1,4 @@ -load("//:deps.bzl", +load("//:deps.bzl", "com_google_protobuf", "io_bazel_rules_rust", ) diff --git a/rust/example/routeguide/client.rs b/rust/example/routeguide/client.rs index ad43d6104..bbccdf7bb 100644 --- a/rust/example/routeguide/client.rs +++ b/rust/example/routeguide/client.rs @@ -61,4 +61,4 @@ fn main() { } } -} \ No newline at end of file +} diff --git a/rust/example/routeguide/server.rs b/rust/example/routeguide/server.rs index c7e5d41ee..dc61c48ce 100644 --- a/rust/example/routeguide/server.rs +++ b/rust/example/routeguide/server.rs @@ -123,7 +123,7 @@ impl Future for RouteSummaryFuture { fn poll(&mut self) -> Poll { Ok(Async::Ready(self.summary.to_owned())) - } + } } #[derive(Debug)] @@ -145,9 +145,9 @@ impl Stream for RouteNoteStream { // fn poll(&mut self) -> Poll { // Ok(Async::Ready(self.note)) - // } + // } fn poll(&mut self) -> Result>, grpc::Error> { Ok(Async::Ready(std::option::Option::Some(self.note.to_owned()))) - } -} \ No newline at end of file + } +} diff --git a/rust/example/rust_grpc_compile/WORKSPACE b/rust/example/rust_grpc_compile/WORKSPACE index def2a9245..38fe0b3fc 100644 --- a/rust/example/rust_grpc_compile/WORKSPACE +++ b/rust/example/rust_grpc_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ @@ -26,4 +25,3 @@ rust_repositories() load("@build_stack_rules_proto//rust/cargo:crates.bzl", "raze_fetch_remote_crates") raze_fetch_remote_crates() - diff --git a/rust/example/rust_grpc_library/WORKSPACE b/rust/example/rust_grpc_library/WORKSPACE index e0aeee398..c6584272f 100644 --- a/rust/example/rust_grpc_library/WORKSPACE +++ b/rust/example/rust_grpc_library/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ @@ -26,4 +25,3 @@ rust_repositories() load("@build_stack_rules_proto//rust/cargo:crates.bzl", "raze_fetch_remote_crates") raze_fetch_remote_crates() - diff --git a/rust/example/rust_proto_compile/WORKSPACE b/rust/example/rust_proto_compile/WORKSPACE index c8aece56c..b4c0cba13 100644 --- a/rust/example/rust_proto_compile/WORKSPACE +++ b/rust/example/rust_proto_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ @@ -26,4 +25,3 @@ rust_repositories() load("@build_stack_rules_proto//rust/cargo:crates.bzl", "raze_fetch_remote_crates") raze_fetch_remote_crates() - diff --git a/rust/example/rust_proto_library/WORKSPACE b/rust/example/rust_proto_library/WORKSPACE index 4397a08e7..c47adf920 100644 --- a/rust/example/rust_proto_library/WORKSPACE +++ b/rust/example/rust_proto_library/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ @@ -26,4 +25,3 @@ rust_repositories() load("@build_stack_rules_proto//rust/cargo:crates.bzl", "raze_fetch_remote_crates") raze_fetch_remote_crates() - diff --git a/rust/rust_grpc_library.bzl b/rust/rust_grpc_library.bzl index 122318cac..934f374fc 100644 --- a/rust/rust_grpc_library.bzl +++ b/rust/rust_grpc_library.bzl @@ -33,4 +33,3 @@ def rust_grpc_library(**kwargs): ], visibility = visibility, ) - diff --git a/rust/rust_proto_lib.bzl b/rust/rust_proto_lib.bzl index 35e8472a1..b000e8ee6 100644 --- a/rust/rust_proto_lib.bzl +++ b/rust/rust_proto_lib.bzl @@ -15,7 +15,7 @@ def _rust_proto_lib_impl(ctx): srcs = compilation.files lib_rs = ctx.actions.declare_file("%s/lib.rs" % compilation.label.name) - # Search in the plugin list for 'protoc_gen_rust_grpc' or similar. + # Search in the plugin list for 'protoc_gen_rust_grpc' or similar. grpc = False for plugin in compilation.plugins: if plugin.executable.path.endswith("grpc"): diff --git a/rust/rust_proto_library.bzl b/rust/rust_proto_library.bzl index 0abf0f0e8..23e77135c 100644 --- a/rust/rust_proto_library.bzl +++ b/rust/rust_proto_library.bzl @@ -30,4 +30,3 @@ def rust_proto_library(**kwargs): ], visibility = visibility, ) - diff --git a/scala/BUILD.bazel b/scala/BUILD.bazel index f6cb0c646..db35abd3f 100644 --- a/scala/BUILD.bazel +++ b/scala/BUILD.bazel @@ -1,4 +1,3 @@ - load("//:plugin.bzl", "proto_plugin") proto_plugin( @@ -16,8 +15,8 @@ proto_plugin( # Ths function will append '_pb' if the basename is a scala keyword. out = "{name}.jar", options = [ - "grpc", - #"java_conversions", # causes weird import problems + "grpc", + #"java_conversions", # causes weird import problems ], tool = ":protoc-gen-scala", visibility = ["//visibility:public"], @@ -84,7 +83,7 @@ scala_binary( # outs = ["protoc-gen-scala.sh"], # cmd = """ # echo '$(location @local_jdk//:bin/java) -jar $(location protoc_gen_deploy.jar) $$@' > $@ -# """, +# """, # executable = True, # ) @@ -115,4 +114,4 @@ go_binary( ":compiler_plugin_deploy.jar", "@bazel_tools//tools/jdk:jre", ], -) \ No newline at end of file +) diff --git a/scala/CompilerPlugin.scala b/scala/CompilerPlugin.scala index 1487a051d..996fa8f3f 100644 --- a/scala/CompilerPlugin.scala +++ b/scala/CompilerPlugin.scala @@ -9,7 +9,7 @@ object CompilerPlugin { def main(args: Array[String]): Unit = { val registry = ExtensionRegistry.newInstance() Scalapb.registerAllExtensions(registry) - val request = CodeGeneratorRequest.parseFrom(Streamable.bytes(System.in), registry) + val request = CodeGeneratorRequest.parseFrom(Streamable.bytes(System.in), registry) System.out.write(ProtobufGenerator.handleCodeGeneratorRequest(request).toByteArray) - } + } } diff --git a/scala/README.md b/scala/README.md index f120fdc18..6cc083434 100644 --- a/scala/README.md +++ b/scala/README.md @@ -344,4 +344,3 @@ def scala_grpc_library(**kwargs): | include_imports | `bool` | `True` | Pass the --include_imports argument to the protoc_plugin | | include_source_info | `bool` | `True` | Pass the --include_source_info argument to the protoc_plugin | | transitive | `bool` | `False` | Generated outputs for *.proto directly named in `deps` AND all transitive proto_library dependencies | - diff --git a/scala/deps.bzl b/scala/deps.bzl index e521c0dd6..57d6bca74 100644 --- a/scala/deps.bzl +++ b/scala/deps.bzl @@ -1,4 +1,4 @@ -load("//:deps.bzl", +load("//:deps.bzl", "com_google_protobuf", "io_bazel_rules_go", "io_bazel_rules_scala", diff --git a/scala/example/routeguide/BUILD.bazel b/scala/example/routeguide/BUILD.bazel index c5de16b8f..f40e60e13 100644 --- a/scala/example/routeguide/BUILD.bazel +++ b/scala/example/routeguide/BUILD.bazel @@ -52,4 +52,4 @@ scala_binary( resources = ["route_guide_db.json"], ) -# TODO: routeguide server implementations \ No newline at end of file +# TODO: routeguide server implementations diff --git a/scala/example/routeguide/example/AtomicRef.scala b/scala/example/routeguide/example/AtomicRef.scala index 49d5529e1..3cadc2e0d 100644 --- a/scala/example/routeguide/example/AtomicRef.scala +++ b/scala/example/routeguide/example/AtomicRef.scala @@ -18,4 +18,4 @@ class AtomicRef[T](initial: T) { updateAndGet(update) } } -} \ No newline at end of file +} diff --git a/scala/example/routeguide/example/RouteGuideClient.scala b/scala/example/routeguide/example/RouteGuideClient.scala index 1634bae77..0edd72433 100644 --- a/scala/example/routeguide/example/RouteGuideClient.scala +++ b/scala/example/routeguide/example/RouteGuideClient.scala @@ -193,4 +193,4 @@ object RouteGuideClient extends App { if (!finishLatch.await(1, TimeUnit.MINUTES)) logger.warning("routeChat can not finish within 1 minutes") } finally client.shutdown() -} \ No newline at end of file +} diff --git a/scala/example/routeguide/example/RouteGuidePersistence.scala b/scala/example/routeguide/example/RouteGuidePersistence.scala index 334aa4bd7..9337425f6 100644 --- a/scala/example/routeguide/example/RouteGuidePersistence.scala +++ b/scala/example/routeguide/example/RouteGuidePersistence.scala @@ -31,4 +31,4 @@ object RouteGuidePersistence { features } -} \ No newline at end of file +} diff --git a/scala/example/routeguide/example/RouteGuideService.scala b/scala/example/routeguide/example/RouteGuideService.scala index c7ba1fe76..b2b4d34c5 100644 --- a/scala/example/routeguide/example/RouteGuideService.scala +++ b/scala/example/routeguide/example/RouteGuideService.scala @@ -161,4 +161,4 @@ object RouteGuideService { val c = 2 * atan2(sqrt(a), sqrt(1 - a)) (r * c).toInt } -} \ No newline at end of file +} diff --git a/scala/example/routeguide/route_guide_db.json b/scala/example/routeguide/route_guide_db.json index e387f5738..8c7b8b3aa 100644 --- a/scala/example/routeguide/route_guide_db.json +++ b/scala/example/routeguide/route_guide_db.json @@ -600,4 +600,4 @@ }, "name": "3 Hasta Way, Newton, NJ 07860, USA" }] - } \ No newline at end of file + } diff --git a/scala/example/scala_grpc_compile/WORKSPACE b/scala/example/scala_grpc_compile/WORKSPACE index e603bbb0e..0c8ca13b1 100644 --- a/scala/example/scala_grpc_compile/WORKSPACE +++ b/scala/example/scala_grpc_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ @@ -32,4 +31,3 @@ scala_register_toolchains() load("@io_bazel_rules_scala//scala_proto:scala_proto.bzl", "scala_proto_repositories") scala_proto_repositories() - diff --git a/scala/example/scala_grpc_library/WORKSPACE b/scala/example/scala_grpc_library/WORKSPACE index c1de174d5..13de6fca0 100644 --- a/scala/example/scala_grpc_library/WORKSPACE +++ b/scala/example/scala_grpc_library/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ @@ -32,4 +31,3 @@ scala_register_toolchains() load("@io_bazel_rules_scala//scala_proto:scala_proto.bzl", "scala_proto_repositories") scala_proto_repositories() - diff --git a/scala/example/scala_proto_compile/WORKSPACE b/scala/example/scala_proto_compile/WORKSPACE index 450db69bc..7e2c30c26 100644 --- a/scala/example/scala_proto_compile/WORKSPACE +++ b/scala/example/scala_proto_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ @@ -32,4 +31,3 @@ scala_register_toolchains() load("@io_bazel_rules_scala//scala_proto:scala_proto.bzl", "scala_proto_repositories") scala_proto_repositories() - diff --git a/scala/example/scala_proto_library/WORKSPACE b/scala/example/scala_proto_library/WORKSPACE index df14cb1c1..29462dd00 100644 --- a/scala/example/scala_proto_library/WORKSPACE +++ b/scala/example/scala_proto_library/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ @@ -32,4 +31,3 @@ scala_register_toolchains() load("@io_bazel_rules_scala//scala_proto:scala_proto.bzl", "scala_proto_repositories") scala_proto_repositories() - diff --git a/scala/scala_grpc_library.bzl b/scala/scala_grpc_library.bzl index 7c937b342..f7b858b52 100644 --- a/scala/scala_grpc_library.bzl +++ b/scala/scala_grpc_library.bzl @@ -24,4 +24,3 @@ def scala_grpc_library(**kwargs): ], visibility = visibility, ) - diff --git a/scala/scala_proto_library.bzl b/scala/scala_proto_library.bzl index f9a21f8ab..7949fe900 100644 --- a/scala/scala_proto_library.bzl +++ b/scala/scala_proto_library.bzl @@ -24,4 +24,3 @@ def scala_proto_library(**kwargs): ], visibility = visibility, ) - diff --git a/swift/BUILD.bazel b/swift/BUILD.bazel index 7d3c9e3b5..46a6c8520 100644 --- a/swift/BUILD.bazel +++ b/swift/BUILD.bazel @@ -1,4 +1,3 @@ - load("//:plugin.bzl", "proto_plugin") proto_plugin( diff --git a/swift/README.md b/swift/README.md index a44d39834..0f65fc866 100644 --- a/swift/README.md +++ b/swift/README.md @@ -30,7 +30,7 @@ go_rules_dependencies() go_register_toolchains() load("@build_stack_rules_proto//swift:repositories.bzl", "swift_toolchain") -# Default values work with linux, x86_64, /usr/local/bin/clang. +# Default values work with linux, x86_64, /usr/local/bin/clang. swift_toolchain( #root = "/home/pcj/.local/share/umake/swift/swift-lang/usr", ) @@ -107,7 +107,7 @@ go_rules_dependencies() go_register_toolchains() load("@build_stack_rules_proto//swift:repositories.bzl", "swift_toolchain") -# Default values work with linux, x86_64, /usr/local/bin/clang. +# Default values work with linux, x86_64, /usr/local/bin/clang. swift_toolchain( #root = "/home/pcj/.local/share/umake/swift/swift-lang/usr", ) @@ -184,7 +184,7 @@ go_rules_dependencies() go_register_toolchains() load("@build_stack_rules_proto//swift:repositories.bzl", "swift_toolchain") -# Default values work with linux, x86_64, /usr/local/bin/clang. +# Default values work with linux, x86_64, /usr/local/bin/clang. swift_toolchain( #root = "/home/pcj/.local/share/umake/swift/swift-lang/usr", ) @@ -258,7 +258,7 @@ go_rules_dependencies() go_register_toolchains() load("@build_stack_rules_proto//swift:repositories.bzl", "swift_toolchain") -# Default values work with linux, x86_64, /usr/local/bin/clang. +# Default values work with linux, x86_64, /usr/local/bin/clang. swift_toolchain( #root = "/home/pcj/.local/share/umake/swift/swift-lang/usr", ) @@ -311,4 +311,3 @@ def swift_grpc_library(**kwargs): | include_imports | `bool` | `True` | Pass the --include_imports argument to the protoc_plugin | | include_source_info | `bool` | `True` | Pass the --include_source_info argument to the protoc_plugin | | transitive | `bool` | `False` | Generated outputs for *.proto directly named in `deps` AND all transitive proto_library dependencies | - diff --git a/swift/deps.bzl b/swift/deps.bzl index 0b846789e..5b595242a 100644 --- a/swift/deps.bzl +++ b/swift/deps.bzl @@ -1,4 +1,4 @@ -load("//:deps.bzl", +load("//:deps.bzl", "com_github_grpc_grpc", "com_google_protobuf", "io_bazel_rules_go", @@ -22,4 +22,4 @@ def swift_proto_library(**kwargs): def swift_grpc_library(**kwargs): swift_grpc_compile(**kwargs) - swift_proto_library(**kwargs) \ No newline at end of file + swift_proto_library(**kwargs) diff --git a/swift/docker/Dockerfile b/swift/docker/Dockerfile index 85aa22e56..33e6ec4d6 100644 --- a/swift/docker/Dockerfile +++ b/swift/docker/Dockerfile @@ -26,7 +26,7 @@ RUN SWIFT_URL=https://swift.org/builds/$SWIFT_BRANCH/$(echo "$SWIFT_PLATFORM" | A3BAFD3556A59079C06894BD63BC1CFE91D306C6 \ # pub 4096R/71E1B235 2016-05-31 [expires: 2019-06-14] # Key fingerprint = 5E4D F843 FB06 5D7F 7E24 FBA2 EF54 30F0 71E1 B235 - # uid Swift 4.x Release Signing Key + # uid Swift 4.x Release Signing Key 5E4DF843FB065D7F7E24FBA2EF5430F071E1B235 \ ; do \ gpg --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ @@ -34,7 +34,7 @@ RUN SWIFT_URL=https://swift.org/builds/$SWIFT_BRANCH/$(echo "$SWIFT_PLATFORM" | && gpg --batch --verify --quiet swift.tar.gz.sig swift.tar.gz \ && tar -xzf swift.tar.gz --directory / --strip-components=1 \ && rm -r "$GNUPGHOME" swift.tar.gz.sig swift.tar.gz \ - && chmod -R o+r /usr/lib/swift + && chmod -R o+r /usr/lib/swift RUN apt-get -q update && \ apt-get -q install -y \ @@ -46,9 +46,9 @@ RUN apt-get -q update && \ tzdata \ libcurl4-openssl-dev \ pkg-config \ - && rm -r /var/lib/apt/lists/* + && rm -r /var/lib/apt/lists/* RUN update-alternatives --install /usr/bin/clang clang /usr/local/bin/clang 1 # Print Installed Swift Version -RUN swift --version \ No newline at end of file +RUN swift --version diff --git a/swift/example/swift_grpc_compile/WORKSPACE b/swift/example/swift_grpc_compile/WORKSPACE index d218926c1..e46e3827d 100644 --- a/swift/example/swift_grpc_compile/WORKSPACE +++ b/swift/example/swift_grpc_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ @@ -24,7 +23,7 @@ go_rules_dependencies() go_register_toolchains() load("@build_stack_rules_proto//swift:repositories.bzl", "swift_toolchain") -# Default values work with linux, x86_64, /usr/local/bin/clang. +# Default values work with linux, x86_64, /usr/local/bin/clang. swift_toolchain( #root = "/home/pcj/.local/share/umake/swift/swift-lang/usr", ) @@ -32,5 +31,3 @@ swift_toolchain( # Uncomment for ocal development with swift installed on your machine # load("@build_bazel_rules_swift//swift:repositories.bzl", "swift_rules_dependencies") # swift_rules_dependencies() - - diff --git a/swift/example/swift_grpc_library/WORKSPACE b/swift/example/swift_grpc_library/WORKSPACE index 7f31b028a..12bd92f34 100644 --- a/swift/example/swift_grpc_library/WORKSPACE +++ b/swift/example/swift_grpc_library/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ @@ -24,7 +23,7 @@ go_rules_dependencies() go_register_toolchains() load("@build_stack_rules_proto//swift:repositories.bzl", "swift_toolchain") -# Default values work with linux, x86_64, /usr/local/bin/clang. +# Default values work with linux, x86_64, /usr/local/bin/clang. swift_toolchain( #root = "/home/pcj/.local/share/umake/swift/swift-lang/usr", ) @@ -32,5 +31,3 @@ swift_toolchain( # Uncomment for ocal development with swift installed on your machine # load("@build_bazel_rules_swift//swift:repositories.bzl", "swift_rules_dependencies") # swift_rules_dependencies() - - diff --git a/swift/example/swift_proto_compile/WORKSPACE b/swift/example/swift_proto_compile/WORKSPACE index 0e0450a40..7b6b99a36 100644 --- a/swift/example/swift_proto_compile/WORKSPACE +++ b/swift/example/swift_proto_compile/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ @@ -24,7 +23,7 @@ go_rules_dependencies() go_register_toolchains() load("@build_stack_rules_proto//swift:repositories.bzl", "swift_toolchain") -# Default values work with linux, x86_64, /usr/local/bin/clang. +# Default values work with linux, x86_64, /usr/local/bin/clang. swift_toolchain( #root = "/home/pcj/.local/share/umake/swift/swift-lang/usr", ) @@ -32,5 +31,3 @@ swift_toolchain( # Uncomment for ocal development with swift installed on your machine # load("@build_bazel_rules_swift//swift:repositories.bzl", "swift_rules_dependencies") # swift_rules_dependencies() - - diff --git a/swift/example/swift_proto_library/WORKSPACE b/swift/example/swift_proto_library/WORKSPACE index 1c2172c54..da2f902b5 100644 --- a/swift/example/swift_proto_library/WORKSPACE +++ b/swift/example/swift_proto_library/WORKSPACE @@ -1,4 +1,3 @@ - http_archive( name = "bazel_toolchains", urls = [ @@ -24,7 +23,7 @@ go_rules_dependencies() go_register_toolchains() load("@build_stack_rules_proto//swift:repositories.bzl", "swift_toolchain") -# Default values work with linux, x86_64, /usr/local/bin/clang. +# Default values work with linux, x86_64, /usr/local/bin/clang. swift_toolchain( #root = "/home/pcj/.local/share/umake/swift/swift-lang/usr", ) @@ -32,5 +31,3 @@ swift_toolchain( # Uncomment for ocal development with swift installed on your machine # load("@build_bazel_rules_swift//swift:repositories.bzl", "swift_rules_dependencies") # swift_rules_dependencies() - - diff --git a/swift/repositories.bzl b/swift/repositories.bzl index ecc42b76f..3a3631a6d 100644 --- a/swift/repositories.bzl +++ b/swift/repositories.bzl @@ -49,11 +49,11 @@ _swift_toolchain = repository_rule( def swift_toolchain(**kwargs): """ - swift_toolchain - configure toolchain for swift specifically for use within + swift_toolchain - configure toolchain for swift specifically for use within a docker sandbox. """ # This should probably always be 'build_bazel_rules_swift_local_config', but # make it configurable just in case. kwargs["name"] = kwargs.pop("name", "build_bazel_rules_swift_local_config") - _swift_toolchain(**kwargs) \ No newline at end of file + _swift_toolchain(**kwargs) diff --git a/swift/requirements.txt b/swift/requirements.txt index 9bc746114..3431d7874 100644 --- a/swift/requirements.txt +++ b/swift/requirements.txt @@ -1,2 +1,2 @@ grpcio==1.15.0 -protobuf==3.6.1 \ No newline at end of file +protobuf==3.6.1 diff --git a/swift/swift_grpc_library.bzl b/swift/swift_grpc_library.bzl index 39d8c76e8..22dfa5a31 100644 --- a/swift/swift_grpc_library.bzl +++ b/swift/swift_grpc_library.bzl @@ -3,4 +3,3 @@ load("@build_bazel_rules_swift//swift:swift.bzl", _swift_proto_library = "swift_ def swift_grpc_library(**kwargs): _swift_proto_library(**kwargs) - diff --git a/swift/swift_proto_library.bzl b/swift/swift_proto_library.bzl index ceb76cb1d..e37dac81c 100644 --- a/swift/swift_proto_library.bzl +++ b/swift/swift_proto_library.bzl @@ -3,4 +3,3 @@ load("@build_bazel_rules_swift//swift:swift.bzl", _swift_proto_library = "swift_ def swift_proto_library(**kwargs): _swift_proto_library(**kwargs) - diff --git a/swift/swift_protoc_gen_aspect.bzl b/swift/swift_protoc_gen_aspect.bzl index 9e71df100..e22003613 100644 --- a/swift/swift_protoc_gen_aspect.bzl +++ b/swift/swift_protoc_gen_aspect.bzl @@ -510,4 +510,4 @@ detail of the `swift_proto_library` rule. "swift", ], implementation = _swift_protoc_gen_aspect_impl, -) \ No newline at end of file +) diff --git a/tools/exgen/BUILD.bazel b/tools/exgen/BUILD.bazel index 5f9ba222f..20f6e68c0 100644 --- a/tools/exgen/BUILD.bazel +++ b/tools/exgen/BUILD.bazel @@ -1,4 +1,3 @@ - load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library") go_library( @@ -29,7 +28,7 @@ go_library( ], importpath = "github.com/stackb/rules_proto/tools/exgen", deps = [ - "@com_github_urfave_cli//:go_default_library", + "@com_github_urfave_cli//:go_default_library", ] ) @@ -40,7 +39,7 @@ go_library( ], importpath = "github.com/stackb/rules_proto/tools/grpc_js", deps = [ - "@com_github_urfave_cli//:go_default_library", + "@com_github_urfave_cli//:go_default_library", ] ) @@ -53,4 +52,4 @@ go_binary( "header.tpl", "footer.tpl", ], -) \ No newline at end of file +) diff --git a/tools/exgen/android.go b/tools/exgen/android.go index 7bd401f6f..685ff4380 100644 --- a/tools/exgen/android.go +++ b/tools/exgen/android.go @@ -2,7 +2,7 @@ package main var androidProtoLibraryUsageTemplate = mustTemplate(` # The set of dependencies loaded here is excessive for android proto alone -# (but simplifies our setup) +# (but simplifies our setup) load("@build_stack_rules_proto//:deps.bzl", "io_grpc_grpc_java") io_grpc_grpc_java() diff --git a/tools/exgen/csharp.go b/tools/exgen/csharp.go index 8799dabb8..7d47bb9e9 100644 --- a/tools/exgen/csharp.go +++ b/tools/exgen/csharp.go @@ -57,14 +57,14 @@ def {{ .Rule.Name }}(**kwargs): transitive = transitive, verbose = verbose, ) - + core_library( name = name, srcs = [name_pb], deps = [ "@google.protobuf//:core", "@io_bazel_rules_dotnet//dotnet/stdlib.core:system.io.dll", - ], + ], visibility = visibility, ) `) @@ -87,7 +87,7 @@ def {{ .Rule.Name }}(**kwargs): transitive = transitive, verbose = verbose, ) - + core_library( name = name, srcs = [name_pb], @@ -95,8 +95,8 @@ def {{ .Rule.Name }}(**kwargs): "@google.protobuf//:core", "@io_bazel_rules_dotnet//dotnet/stdlib.core:system.io.dll", "@grpc.core//:core", - "@system.interactive.async//:core", - ], + "@system.interactive.async//:core", + ], visibility = visibility, ) `) diff --git a/tools/exgen/footer.tpl b/tools/exgen/footer.tpl index ef31d62ad..4d440eaa6 100644 --- a/tools/exgen/footer.tpl +++ b/tools/exgen/footer.tpl @@ -44,7 +44,7 @@ demonstrating standalone usage. The root directory contains the base rule defintions: * `plugin.bzl`: A build rule that defines the name, tool binary, and options for - a particular proto plugin. + a particular proto plugin. * `compile.bzl`: A build rule that contains the `proto_compile` rule. This rule calls `protoc` with a given list of plugins and generates output files. @@ -62,7 +62,7 @@ Follow the pattern seen in the multiple examples in this repository. The basic 1. Load the plugin rule: `load("@build_stack_rules_proto//:plugin.bzl", "proto_plugin")`. 2. Define the rule, giving it a `name`, `options` (not mandatory), `tool`, and - `outputs`. + `outputs`. 3. `tool` is a label that refers to the binary executable for the plugin itself. 4. `outputs` is a list of strings that predicts the pattern of files generated by the plugin. Specifying outputs is the only attribute that requires much diff --git a/tools/exgen/github_grpc_grpc_web.go b/tools/exgen/github_grpc_grpc_web.go index 9f2a3e04c..ec4e9681a 100644 --- a/tools/exgen/github_grpc_grpc_web.go +++ b/tools/exgen/github_grpc_grpc_web.go @@ -29,7 +29,7 @@ def {{ .Rule.Name }}(**kwargs): transitive = True, visibility = visibility, ) - + closure_grpc_compile( name = name_pb_grpc, deps = deps, diff --git a/tools/exgen/grpcjs.go b/tools/exgen/grpcjs.go index bb023675f..c1741ec63 100644 --- a/tools/exgen/grpcjs.go +++ b/tools/exgen/grpcjs.go @@ -32,7 +32,7 @@ def {{ .Rule.Name }}(**kwargs): transitivity = transitivity, visibility = visibility, ) - + closure_grpc_compile( name = name_pb_grpc, deps = deps, diff --git a/tools/exgen/header.tpl b/tools/exgen/header.tpl index c13409008..8072cb186 100644 --- a/tools/exgen/header.tpl +++ b/tools/exgen/header.tpl @@ -1,4 +1,4 @@ -# `rules_proto` +# `rules_proto` Bazel skylark rules for building protocol buffers +/- gRPC :sparkles:. @@ -157,14 +157,14 @@ access that rule by adding `_pb` at the end of the rule name, like `bazel build * There are generally four rule flavors for any language `{lang}`: `{lang}_proto_compile`, `{lang}_proto_library`, `{lang}_grpc_compile`, and -`{lang}_grpc_library`. +`{lang}_grpc_library`. * If you are solely interested in the source code artifacts, use the - `{lang}_{proto|grpc}_compile` rule. + `{lang}_{proto|grpc}_compile` rule. * If your proto file has services, use the `{lang}_{grpc}_{compile|library}` - rule instead. + rule instead. * Load any external dependencies needed for the rule via the `load("@build_stack_rules_proto//{lang}:deps.bzl", - "{lang}_{proto|grpc}_{compile|library}")`. + "{lang}_{proto|grpc}_{compile|library}")`. diff --git a/tools/exgen/ruby.go b/tools/exgen/ruby.go index f4b48da88..3945a3f8e 100644 --- a/tools/exgen/ruby.go +++ b/tools/exgen/ruby.go @@ -47,7 +47,7 @@ def {{ .Rule.Name }}(**kwargs): visibility = kwargs.get("visibility") name_pb = name + "_pb" - + ruby_proto_compile( name = name_pb, deps = deps, @@ -58,7 +58,7 @@ def {{ .Rule.Name }}(**kwargs): ruby_library( name = name, srcs = [name_pb], - includes = ["{package}/%s" % name_pb], + includes = ["{package}/%s" % name_pb], visibility = visibility, ) `) @@ -83,7 +83,7 @@ def {{ .Rule.Name }}(**kwargs): ruby_library( name = name, srcs = [name_pb], - includes = ["{package}/%s" % name_pb], + includes = ["{package}/%s" % name_pb], visibility = visibility, ) `) diff --git a/tools/exgen/swift.go b/tools/exgen/swift.go index 58995a07f..77048c275 100644 --- a/tools/exgen/swift.go +++ b/tools/exgen/swift.go @@ -9,7 +9,7 @@ go_rules_dependencies() go_register_toolchains() load("@build_stack_rules_proto//{{ .Lang.Dir }}:repositories.bzl", "swift_toolchain") -# Default values work with linux, x86_64, /usr/local/bin/clang. +# Default values work with linux, x86_64, /usr/local/bin/clang. swift_toolchain( #root = "/home/pcj/.local/share/umake/swift/swift-lang/usr", )