Merge branch 'stable-2.15' into stable-2.16 * stable-2.15: Upgrade bazlets to latest stable-2.15 to build with 2.15.19 API Upgrade bazlets to latest stable-2.14 to build with 2.14.21 API Change-Id: I91203e3625aac694c4cf897d6e469d9e665f76dd
diff --git a/.bazelversion b/.bazelversion index 9084fa2..fd2a018 100644 --- a/.bazelversion +++ b/.bazelversion
@@ -1 +1 @@ -1.1.0 +3.1.0
diff --git a/WORKSPACE b/WORKSPACE index c718333..56dd2ff 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -3,7 +3,7 @@ load("//:bazlets.bzl", "load_bazlets") load_bazlets( - commit = "9af263722b7eafe99af079d6ef7cf1de23e6f8d7", + commit = "fff6f20bb2eceaf872a8acf8ad51471c25a82d38", #local_path = "/home/<user>/projects/bazlets", )
diff --git a/src/main/resources/Documentation/build.md b/src/main/resources/Documentation/build.md index 213ebe6..b69f2d7 100644 --- a/src/main/resources/Documentation/build.md +++ b/src/main/resources/Documentation/build.md
@@ -50,15 +50,6 @@ bazel build plugins/@PLUGIN@ ``` -Note that due to a [known issue in Bazel][bazelissue], if the plugin -has previously been built in standalone mode, it is necessary to clean -the workspace before building in-tree: - -``` - cd plugins/@PLUGIN@ - bazel clean --expunge -``` - The output is created in ``` @@ -79,4 +70,3 @@ [Back to @PLUGIN@ documentation index][index] [index]: index.html -[bazelissue]: https://github.com/bazelbuild/bazel/issues/2797
diff --git a/tools/BUILD b/tools/BUILD new file mode 100644 index 0000000..1fa2160 --- /dev/null +++ b/tools/BUILD
@@ -0,0 +1 @@ +# Empty file - bazel treat directories with BUILD file as a package \ No newline at end of file