Merge pull request #140 from rules-proto-grpc/dev

4.0.0 Release

Author: aaliddell

.bazelci/presubmit.yml

@@ -7,6 +7,7 @@ lang-cpp: ['cpp/**/*', 'example/cpp/**/*', 'tools/rulegen/cpp.go']
 lang-csharp: ['csharp/**/*', 'example/csharp/**/*', 'tools/rulegen/csharp.go']
 lang-d: ['d/**/*', 'example/d/**/*', 'tools/rulegen/d.go']
 lang-doc: ['doc/**/*', 'example/doc/**/*', 'tools/rulegen/doc.go']
+lang-fsharp: ['fsharp/**/*', 'example/fsharp/**/*', 'tools/rulegen/fsharp.go']
 lang-go: ['go/**/*', 'example/go/**/*', 'tools/rulegen/go.go']
 lang-grpc-gateway: ['grpc-gateway/**/*', 'example/grpc-gateway/**/*', 'tools/rulegen/grpc_gateway.go']
 lang-java: ['java/**/*', 'example/java/**/*', 'tools/rulegen/java.go']

.github/labeler.yml

@@ -1 +1 @@
-rules-proto-grpc.aliddell.com
+rules-proto-grpc.com

CNAME

@@ -53,59 +53,19 @@ pip_compile:
 .PHONY: csharp_regenerate_packages
 csharp_regenerate_packages:
 	./csharp/nuget/regenerate_packages.sh
+	bazel run //tools:buildifier
+
+
+# Run F# package regeneration
+.PHONY: fsharp_regenerate_packages
+fsharp_regenerate_packages:
+	./fsharp/nuget/regenerate_packages.sh
+	bazel run //tools:buildifier
 
 
 # Run all language specific updates
 .PHONY: all_updates
-all_updates: rust_raze yarn_upgrade ruby_bundle_upgrade pip_compile csharp_regenerate_packages
-
-
-# A collection of targets that build routeguide clients
-.PHONY: clients
-clients:
-	bazel build \
-		//cpp/example/routeguide:client \
-		//go/example/routeguide/client \
-		//java/example/routeguide:client \
-		//python/example/routeguide:client \
-		//scala/example/routeguide:client \
-
-# A collection of targets that build routeguide servers
-.PHONY: servers
-servers:
-	bazel build \
-		//cpp/example/routeguide:server \
-		//go/example/routeguide/server \
-		//java/example/routeguide:server \
-		//python/example/routeguide:server \
-		//scala/example/routeguide:server \
-
-
-# A collection of test targets
-.PHONY: tests
-tests:
-	bazel test \
-		//cpp/example/routeguide/... \
-		//java/example/routeguide/... \
-		//go/example/routeguide/... \
-
-.PHONY: pending_clients
-pending_clients:
-	bazel build \
-		//android/example/routeguide:client \
-		//js/example/routeguide:client \
-		//ruby/example/routeguide:client \
-		//rust/example/routeguide:client
-
-.PHONY: pending_servers
-pending_servers:
-	bazel build \
-		//js/example/routeguide:server \
-		//ruby/example/routeguide:server \
-		//rust/example/routeguide:server
-
-.PHONY: all
-all: clients servers tests
+all_updates: rust_raze yarn_upgrade ruby_bundle_upgrade pip_compile csharp_regenerate_packages fsharp_regenerate_packages
 
 
 # Pull in auto-generated examples makefile

Makefile

@@ -73,7 +73,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe
 go_rules_dependencies()
 
 go_register_toolchains(
-    version = "1.15.8",
+    version = "1.17.1",
 )
 
 load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
@@ -96,7 +96,7 @@ load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
 grpc_deps()
 
 #
-# C#
+# C#/F#
 #
 load("//csharp:repositories.bzl", "csharp_repos")
 
@@ -116,9 +116,13 @@ dotnet_register_toolchains()
 
 dotnet_repositories_nugets()
 
-load("@rules_proto_grpc//csharp/nuget:nuget.bzl", "nuget_rules_proto_grpc_packages")
+load("@rules_proto_grpc//csharp/nuget:nuget.bzl", nuget_rules_proto_grpc_packages_csharp = "nuget_rules_proto_grpc_packages")
 
-nuget_rules_proto_grpc_packages()
+nuget_rules_proto_grpc_packages_csharp()
+
+load("@rules_proto_grpc//fsharp/nuget:nuget.bzl", nuget_rules_proto_grpc_packages_fsharp = "nuget_rules_proto_grpc_packages")
+
+nuget_rules_proto_grpc_packages_fsharp()
 
 #
 # D
@@ -220,14 +224,15 @@ load("@bazelruby_rules_ruby//ruby:deps.bzl", "rules_ruby_dependencies", "rules_r
 
 rules_ruby_dependencies()
 
-rules_ruby_select_sdk(version = "2.7.1")
+rules_ruby_select_sdk(version = "3.0.1")
 
 load("@bazelruby_rules_ruby//ruby:defs.bzl", "ruby_bundle")
 
 ruby_bundle(
     name = "rules_proto_grpc_bundle",
     gemfile = "@rules_proto_grpc//ruby:Gemfile",
     gemfile_lock = "@rules_proto_grpc//ruby:Gemfile.lock",
+    includes = {"grpc": ["etc"]},
 )
 
 #
@@ -244,7 +249,7 @@ rust_repositories()
 #
 # Scala
 #
-load("//scala:repositories.bzl", "scala_repos")
+load("//scala:repositories.bzl", "MAVEN_ARTIFACTS", "scala_repos")
 
 scala_repos()
 
@@ -260,41 +265,12 @@ load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains")
 
 scala_register_toolchains()
 
-load("@io_bazel_rules_scala//scala_proto:scala_proto.bzl", "scala_proto_repositories")
-
-scala_proto_repositories()
-
-#
-# Scala routeguide
-#
-load("@bazel_tools//tools/build_defs/repo:jvm.bzl", "jvm_maven_import_external")
-
-jvm_maven_import_external(
-    name = "com_thesamet_scalapb_scalapb_json4s",
-    artifact = "com.thesamet.scalapb:scalapb-json4s_2.12:0.7.1",
-    artifact_sha256 = "6c8771714329464e03104b6851bfdc3e2e4967276e1a9bd2c87c3b5a6d9c53c7",
-    server_urls = ["https://repo.maven.apache.org/maven2"],
-)
-
-jvm_maven_import_external(
-    name = "org_json4s_json4s_jackson_2_12",
-    artifact = "org.json4s:json4s-jackson_2.12:3.6.1",
-    artifact_sha256 = "83b854a39e69f022ad3d7dd3da664623252dc822ed4ed1117304f39115c88043",
-    server_urls = ["https://repo.maven.apache.org/maven2"],
-)
-
-jvm_maven_import_external(
-    name = "org_json4s_json4s_core_2_12",
-    artifact = "org.json4s:json4s-core_2.12:3.6.1",
-    artifact_sha256 = "e0f481509429a24e295b30ba64f567bad95e8d978d0882ec74e6dab291fcdac0",
-    server_urls = ["https://repo.maven.apache.org/maven2"],
-)
-
-jvm_maven_import_external(
-    name = "org_json4s_json4s_ast_2_12",
-    artifact = "org.json4s:json4s-ast_2.12:3.6.1",
-    artifact_sha256 = "39c7de601df28e32eb0c4e3d684ec65bbf2e59af83c6088cda12688d796f7746",
-    server_urls = ["https://repo.maven.apache.org/maven2"],
+maven_install(
+    name = "rules_proto_grpc_scala_maven",
+    artifacts = MAVEN_ARTIFACTS,
+    repositories = [
+        "https://repo1.maven.org/maven2",
+    ],
 )
 
 #

README.md

@@ -1,55 +1,17 @@
 """Generated definition of android_grpc_compile."""
 
-load("@rules_proto//proto:defs.bzl", "ProtoInfo")
 load(
     "//:defs.bzl",
-    "ProtoLibraryAspectNodeInfo",
     "ProtoPluginInfo",
-    "proto_compile_aspect_attrs",
-    "proto_compile_aspect_impl",
     "proto_compile_attrs",
     "proto_compile_impl",
 )
 
-# Create aspect for android_grpc_compile
-android_grpc_compile_aspect = aspect(
-    implementation = proto_compile_aspect_impl,
-    provides = [ProtoLibraryAspectNodeInfo],
-    attr_aspects = ["deps"],
-    attrs = dict(
-        proto_compile_aspect_attrs,
-        _plugins = attr.label_list(
-            doc = "List of protoc plugins to apply",
-            providers = [ProtoPluginInfo],
-            default = [
-                Label("//android:javalite_plugin"),
-                Label("//android:grpc_javalite_plugin"),
-            ],
-        ),
-        _prefix = attr.string(
-            doc = "String used to disambiguate aspects when generating outputs",
-            default = "android_grpc_compile_aspect",
-        ),
-    ),
-    toolchains = [str(Label("//protobuf:toolchain_type"))],
-)
-
 # Create compile rule
-_rule = rule(
+android_grpc_compile = rule(
     implementation = proto_compile_impl,
     attrs = dict(
         proto_compile_attrs,
-        protos = attr.label_list(
-            mandatory = False,  # TODO: set to true in 4.0.0 when deps removed below
-            providers = [ProtoInfo],
-            doc = "List of labels that provide the ProtoInfo provider (such as proto_library from rules_proto)",
-        ),
-        deps = attr.label_list(
-            mandatory = False,
-            providers = [ProtoInfo, ProtoLibraryAspectNodeInfo],
-            aspects = [android_grpc_compile_aspect],
-            doc = "DEPRECATED: Use protos attr",
-        ),
         _plugins = attr.label_list(
             providers = [ProtoPluginInfo],
             default = [
@@ -61,10 +23,3 @@ _rule = rule(
     ),
     toolchains = [str(Label("//protobuf:toolchain_type"))],
 )
-
-# Create macro for converting attrs and passing to compile
-def android_grpc_compile(**kwargs):
-    _rule(
-        verbose_string = "{}".format(kwargs.get("verbose", 0)),
-        **kwargs
-    )

WORKSPACE

@@ -12,15 +12,15 @@ def android_grpc_library(name, **kwargs):
         **{
             k: v
             for (k, v) in kwargs.items()
-            if k in ["protos" if "protos" in kwargs else "deps"] + proto_compile_attrs.keys()
+            if k in proto_compile_attrs.keys()
         }  # Forward args
     )
 
     # Create android library
     android_library(
         name = name,
         srcs = [name_pb],
-        deps = GRPC_DEPS + (kwargs.get("deps", []) if "protos" in kwargs else []),
+        deps = GRPC_DEPS + kwargs.get("deps", []),
         exports = GRPC_DEPS + kwargs.get("exports", []),
         visibility = kwargs.get("visibility"),
         tags = kwargs.get("tags"),

android/android_grpc_compile.bzl

@@ -1,54 +1,17 @@
 """Generated definition of android_proto_compile."""
 
-load("@rules_proto//proto:defs.bzl", "ProtoInfo")
 load(
     "//:defs.bzl",
-    "ProtoLibraryAspectNodeInfo",
     "ProtoPluginInfo",
-    "proto_compile_aspect_attrs",
-    "proto_compile_aspect_impl",
     "proto_compile_attrs",
     "proto_compile_impl",
 )
 
-# Create aspect for android_proto_compile
-android_proto_compile_aspect = aspect(
-    implementation = proto_compile_aspect_impl,
-    provides = [ProtoLibraryAspectNodeInfo],
-    attr_aspects = ["deps"],
-    attrs = dict(
-        proto_compile_aspect_attrs,
-        _plugins = attr.label_list(
-            doc = "List of protoc plugins to apply",
-            providers = [ProtoPluginInfo],
-            default = [
-                Label("//android:javalite_plugin"),
-            ],
-        ),
-        _prefix = attr.string(
-            doc = "String used to disambiguate aspects when generating outputs",
-            default = "android_proto_compile_aspect",
-        ),
-    ),
-    toolchains = [str(Label("//protobuf:toolchain_type"))],
-)
-
 # Create compile rule
-_rule = rule(
+android_proto_compile = rule(
     implementation = proto_compile_impl,
     attrs = dict(
         proto_compile_attrs,
-        protos = attr.label_list(
-            mandatory = False,  # TODO: set to true in 4.0.0 when deps removed below
-            providers = [ProtoInfo],
-            doc = "List of labels that provide the ProtoInfo provider (such as proto_library from rules_proto)",
-        ),
-        deps = attr.label_list(
-            mandatory = False,
-            providers = [ProtoInfo, ProtoLibraryAspectNodeInfo],
-            aspects = [android_proto_compile_aspect],
-            doc = "DEPRECATED: Use protos attr",
-        ),
         _plugins = attr.label_list(
             providers = [ProtoPluginInfo],
             default = [
@@ -59,10 +22,3 @@ _rule = rule(
     ),
     toolchains = [str(Label("//protobuf:toolchain_type"))],
 )
-
-# Create macro for converting attrs and passing to compile
-def android_proto_compile(**kwargs):
-    _rule(
-        verbose_string = "{}".format(kwargs.get("verbose", 0)),
-        **kwargs
-    )

android/android_grpc_library.bzl

@@ -12,15 +12,15 @@ def android_proto_library(name, **kwargs):
         **{
             k: v
             for (k, v) in kwargs.items()
-            if k in ["protos" if "protos" in kwargs else "deps"] + proto_compile_attrs.keys()
+            if k in proto_compile_attrs.keys()
         }  # Forward args
     )
 
     # Create android library
     android_library(
         name = name,
         srcs = [name_pb],
-        deps = PROTO_DEPS + (kwargs.get("deps", []) if "protos" in kwargs else []),
+        deps = PROTO_DEPS + kwargs.get("deps", []),
         exports = PROTO_DEPS + kwargs.get("exports", []),
         visibility = kwargs.get("visibility"),
         tags = kwargs.get("tags"),

android/android_proto_compile.bzl

@@ -5,8 +5,8 @@ proto_plugin(
     quirks = ["QUIRK_DIRECT_MODE"],
     separate_options_flag = True,
     tool = select({
-        "@bazel_tools//src/conditions:darwin_x86_64": "@protoc_gen_buf_breaking_darwin//file",
-        "@bazel_tools//src/conditions:linux_x86_64": "@protoc_gen_buf_breaking_linux//file",
+        "@bazel_tools//src/conditions:darwin_x86_64": "@protoc_gen_buf_breaking_darwin_x86_64//file",
+        "@bazel_tools//src/conditions:linux_x86_64": "@protoc_gen_buf_breaking_linux_x86_64//file",
     }),
     visibility = ["//visibility:public"],
 )
@@ -16,8 +16,8 @@ proto_plugin(
     quirks = ["QUIRK_DIRECT_MODE"],
     separate_options_flag = True,
     tool = select({
-        "@bazel_tools//src/conditions:darwin_x86_64": "@protoc_gen_buf_lint_darwin//file",
-        "@bazel_tools//src/conditions:linux_x86_64": "@protoc_gen_buf_lint_linux//file",
+        "@bazel_tools//src/conditions:darwin_x86_64": "@protoc_gen_buf_lint_darwin_x86_64//file",
+        "@bazel_tools//src/conditions:linux_x86_64": "@protoc_gen_buf_lint_linux_x86_64//file",
     }),
     visibility = ["//visibility:public"],
 )