Merge changes Ibb8c134b,I9dcea5be,Ic88538d9 into stable-3.5 * changes: bazel: Bump to latest 4.x release: 4.2.4 bazel: Move auto-value dep to external_plugin_deps.bzl Add python3 support
diff --git a/.bazelrc b/.bazelrc index 3ae03ff..f9248ea 100644 --- a/.bazelrc +++ b/.bazelrc
@@ -1,2 +1,2 @@ -build --workspace_status_command="python ./tools/workspace_status.py" +build --workspace_status_command="python3 ./tools/workspace_status.py" test --build_tests_only
diff --git a/.bazelversion b/.bazelversion index fcdb2e1..cf78d5b 100644 --- a/.bazelversion +++ b/.bazelversion
@@ -1 +1 @@ -4.0.0 +4.2.4
diff --git a/WORKSPACE b/WORKSPACE index 5e4b7ea..66ad7d0 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -8,7 +8,7 @@ load("//:bazlets.bzl", "load_bazlets") load_bazlets( - commit = "a52e3f381e2fe2a53f7641150ff723171a2dda1e", + commit = "cd9b114339913aad2c9981e387fd151123f40a44", #local_path = "/home/<user>/projects/bazlets", ) @@ -29,22 +29,6 @@ yarn_lock = "//:yarn.lock", ) -load("//tools/bzl:maven_jar.bzl", "maven_jar") - -AUTO_VALUE_VERSION = "1.7.4" - -maven_jar( - name = "auto-value", - artifact = "com.google.auto.value:auto-value:" + AUTO_VALUE_VERSION, - sha1 = "6b126cb218af768339e4d6e95a9b0ae41f74e73d", -) - -maven_jar( - name = "auto-value-annotations", - artifact = "com.google.auto.value:auto-value-annotations:" + AUTO_VALUE_VERSION, - sha1 = "eff48ed53995db2dadf0456426cc1f8700136f86", -) - # Load plugin API load( "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl", @@ -53,3 +37,7 @@ # Release Plugin API gerrit_api() + +load("//:external_plugin_deps.bzl", "external_plugin_deps") + +external_plugin_deps()
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl new file mode 100644 index 0000000..fdf9c1c --- /dev/null +++ b/external_plugin_deps.bzl
@@ -0,0 +1,16 @@ +load("@bazel_tools//tools/build_defs/repo:maven_rules.bzl", "maven_jar") + +def external_plugin_deps(): + AUTO_VALUE_VERSION = "1.7.4" + + maven_jar( + name = "auto-value", + artifact = "com.google.auto.value:auto-value:" + AUTO_VALUE_VERSION, + sha1 = "6b126cb218af768339e4d6e95a9b0ae41f74e73d", + ) + + maven_jar( + name = "auto-value-annotations", + artifact = "com.google.auto.value:auto-value-annotations:" + AUTO_VALUE_VERSION, + sha1 = "eff48ed53995db2dadf0456426cc1f8700136f86", + )
diff --git a/tools/workspace_status.py b/tools/workspace_status.py index d948424..fb5ec6d 100644 --- a/tools/workspace_status.py +++ b/tools/workspace_status.py
@@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This script will be run by bazel when the build process starts to # generate key-value information that represents the status of the