From 67de1cad7e1d9bd70a30d44b3571b898ba7f04d5 Mon Sep 17 00:00:00 2001 From: Ivo List Date: Thu, 3 Nov 2022 09:02:17 +0100 Subject: [PATCH 1/4] Adding bcr configuration --- .bcr/metadata.template.json | 6 ++++++ .bcr/presubmit.yml | 8 ++++++++ .bcr/source.template.json | 5 +++++ 3 files changed, 19 insertions(+) create mode 100644 .bcr/metadata.template.json create mode 100644 .bcr/presubmit.yml create mode 100644 .bcr/source.template.json diff --git a/.bcr/metadata.template.json b/.bcr/metadata.template.json new file mode 100644 index 00000000..fc7026e7 --- /dev/null +++ b/.bcr/metadata.template.json @@ -0,0 +1,6 @@ +{ + "homepage": "https://github.com/bazelbuild/rules_java", + "maintainers": [], + "versions": [], + "yanked_versions": {} +} diff --git a/.bcr/presubmit.yml b/.bcr/presubmit.yml new file mode 100644 index 00000000..0cbdf61b --- /dev/null +++ b/.bcr/presubmit.yml @@ -0,0 +1,8 @@ +matrix: + platform: ["centos7", "debian10", "macos", "ubuntu2004", "windows"] +tasks: + verify_build_targets: + name: "Verify build targets" + platform: ${{ platform }} + build_targets: + - "@rules_java//..." diff --git a/.bcr/source.template.json b/.bcr/source.template.json new file mode 100644 index 00000000..4f148199 --- /dev/null +++ b/.bcr/source.template.json @@ -0,0 +1,5 @@ +{ + "integrity": "", + "strip_prefix": "{REPO}-{VERSION}", + "url": "https://github.com/{OWNER}/{REPO}/archive/refs/tags/{TAG}.tar.gz" +} From 6420761c11100e12425454cc8d698e3404045043 Mon Sep 17 00:00:00 2001 From: Ivo List Date: Thu, 3 Nov 2022 09:07:31 +0100 Subject: [PATCH 2/4] Bump version to 5.3.2 --- MODULE.bazel | 2 +- java/defs.bzl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index ac03005a..02e77111 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -1,7 +1,7 @@ module( name = "rules_java", compatibility_level = 1, - version = "5.1.0", + version = "5.3.2", ) bazel_dep(name = "platforms", version = "0.0.4") diff --git a/java/defs.bzl b/java/defs.bzl index 1e1ada19..92878f5e 100644 --- a/java/defs.bzl +++ b/java/defs.bzl @@ -18,7 +18,7 @@ load("//java/private:native.bzl", "NativeJavaInfo", "NativeJavaPluginInfo", "nat # Do not touch: This line marks the end of loads; needed for PR importing. _MIGRATION_TAG = "__JAVA_RULES_MIGRATION_DO_NOT_USE_WILL_BREAK__" -version = "5.1.0" +version = "5.3.2" def _add_tags(attrs): if "tags" in attrs and attrs["tags"] != None: From b24d498c3f4219e1a74e65a29084e0eb74162ad3 Mon Sep 17 00:00:00 2001 From: Ivo List Date: Thu, 3 Nov 2022 09:18:30 +0100 Subject: [PATCH 3/4] Add missing files to the distro. --- java/BUILD | 2 +- java/private/BUILD | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/java/BUILD b/java/BUILD index dcd13e04..3d7f1297 100644 --- a/java/BUILD +++ b/java/BUILD @@ -6,7 +6,7 @@ licenses(["notice"]) filegroup( name = "srcs", - srcs = glob(["**"]), + srcs = glob(["**"]) + ["@//java/private:srcs"], visibility = ["@//:__pkg__"], ) diff --git a/java/private/BUILD b/java/private/BUILD index 5f8ce729..2995c971 100644 --- a/java/private/BUILD +++ b/java/private/BUILD @@ -5,5 +5,11 @@ licenses(["notice"]) bzl_library( name = "private", srcs = ["native.bzl"], - visibility = ["//visibility:public"], + visibility = ["@//java:__pkg__"], +) + +filegroup( + name = "srcs", + srcs = glob(["**"]), + visibility = ["@//java:__pkg__"], ) From 97c40d747c8b412e07c96206a68d25a3147ab0f8 Mon Sep 17 00:00:00 2001 From: Ivo List Date: Thu, 3 Nov 2022 09:31:27 +0100 Subject: [PATCH 4/4] Update distro docs --- distro/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/distro/README.md b/distro/README.md index 907948f4..eb57af33 100644 --- a/distro/README.md +++ b/distro/README.md @@ -1,6 +1,7 @@ # Releasing rules_java -1. Update version in [java/defs.bzl](/java/defs.bzl) and merge it +1. Update version in [java/defs.bzl](/java/defs.bzl), + [MODULE.bazel](/MODULE.bazel) and merge it 2. Build the release running `bazel build //distro:rules_java-{version}` 3. Prepare release notes running `bazel build //distro:relnotes` 4. Create a new release on GitHub