From 79afbc31522ce5754eeb6d0db37af057577c357e Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <arostovtsev@google.com>
Date: Fri, 27 Jan 2023 10:34:55 -0500
Subject: [PATCH 1/2] Bump bazel_skylib to 1.4.0 and add
 bazel_skylib_gazelle_plugin-1.4.0

See https://github.com/bazelbuild/bazel-skylib/releases/tag/1.4.0
---
 modules/bazel_skylib/1.4.0/MODULE.bazel       | 12 +++++++++++
 modules/bazel_skylib/1.4.0/presubmit.yml      | 13 ++++++++++++
 modules/bazel_skylib/1.4.0/source.json        |  4 ++++
 modules/bazel_skylib/metadata.json            |  3 ++-
 .../1.4.0/MODULE.bazel                        | 21 +++++++++++++++++++
 .../1.4.0/presubmit.yml                       | 13 ++++++++++++
 .../1.4.0/source.json                         |  4 ++++
 .../bazel_skylib_gazelle_plugin/metadata.json | 16 ++++++++++++++
 8 files changed, 85 insertions(+), 1 deletion(-)
 create mode 100644 modules/bazel_skylib/1.4.0/MODULE.bazel
 create mode 100644 modules/bazel_skylib/1.4.0/presubmit.yml
 create mode 100644 modules/bazel_skylib/1.4.0/source.json
 create mode 100644 modules/bazel_skylib_gazelle_plugin/1.4.0/MODULE.bazel
 create mode 100644 modules/bazel_skylib_gazelle_plugin/1.4.0/presubmit.yml
 create mode 100644 modules/bazel_skylib_gazelle_plugin/1.4.0/source.json
 create mode 100644 modules/bazel_skylib_gazelle_plugin/metadata.json

diff --git a/modules/bazel_skylib/1.4.0/MODULE.bazel b/modules/bazel_skylib/1.4.0/MODULE.bazel
new file mode 100644
index 00000000000..3305bf089ac
--- /dev/null
+++ b/modules/bazel_skylib/1.4.0/MODULE.bazel
@@ -0,0 +1,12 @@
+module(
+    name = "bazel_skylib",
+    compatibility_level = 1,
+    version = "1.4.0",
+)
+
+register_toolchains(
+    "//toolchains/unittest:cmd_toolchain",
+    "//toolchains/unittest:bash_toolchain",
+)
+
+bazel_dep(name = "platforms", version = "0.0.4")
diff --git a/modules/bazel_skylib/1.4.0/presubmit.yml b/modules/bazel_skylib/1.4.0/presubmit.yml
new file mode 100644
index 00000000000..970ed075f54
--- /dev/null
+++ b/modules/bazel_skylib/1.4.0/presubmit.yml
@@ -0,0 +1,13 @@
+matrix:
+  platform:
+  - centos7
+  - debian10
+  - ubuntu2004
+  - macos
+  - windows
+tasks:
+  verify_targets:
+    name: Verify build targets
+    platform: ${{ platform }}
+    build_targets:
+    - '@bazel_skylib//...'
diff --git a/modules/bazel_skylib/1.4.0/source.json b/modules/bazel_skylib/1.4.0/source.json
new file mode 100644
index 00000000000..7af600429d7
--- /dev/null
+++ b/modules/bazel_skylib/1.4.0/source.json
@@ -0,0 +1,4 @@
+{
+    "integrity": "sha256-8kq2ZjlCMvg0900Z4v8UKwrxdGbqDGmj9MJ27nX2784=",
+    "url": "https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.0/bazel-skylib-1.4.0.tar.gz"
+}
diff --git a/modules/bazel_skylib/metadata.json b/modules/bazel_skylib/metadata.json
index b93f2fbd99b..aee0fffcc65 100644
--- a/modules/bazel_skylib/metadata.json
+++ b/modules/bazel_skylib/metadata.json
@@ -14,7 +14,8 @@
         "1.1.1",
         "1.2.0",
         "1.2.1",
-        "1.3.0"
+        "1.3.0",
+	"1.4.0"
     ],
     "yanked_versions": {}
 }
diff --git a/modules/bazel_skylib_gazelle_plugin/1.4.0/MODULE.bazel b/modules/bazel_skylib_gazelle_plugin/1.4.0/MODULE.bazel
new file mode 100644
index 00000000000..8e51543591a
--- /dev/null
+++ b/modules/bazel_skylib_gazelle_plugin/1.4.0/MODULE.bazel
@@ -0,0 +1,21 @@
+module(
+    name = "bazel_skylib_gazelle_plugin",
+    # Keep in sync with @bazel_skylib//:MODULE.bazel and @bazel_skylib//:version.bzl
+    version = "1.4.0",
+    compatibility_level = 1,
+)
+
+# Keep in sync with @bazel_skylib//:MODULE.bazel and @bazel_skylib//:version.bzl
+bazel_dep(name = "bazel_skylib", version = "1.4.0")
+bazel_dep(name = "gazelle", version = "0.28.0", repo_name = "bazel_gazelle")
+bazel_dep(name = "rules_go", version = "0.35.0", repo_name = "io_bazel_rules_go")
+
+# `rules_go` will register a toolchain for us if the user doesn't do so
+
+go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps")
+go_deps.module(
+    path = "github.com/bazelbuild/buildtools",
+    sum = "h1:fmdo+fvvWlhldUcqkhAMpKndSxMN3vH5l7yow5cEaiQ=",
+    version = "v0.0.0-20220531122519-a43aed7014c8",
+)
+use_repo(go_deps, "com_github_bazelbuild_buildtools")
diff --git a/modules/bazel_skylib_gazelle_plugin/1.4.0/presubmit.yml b/modules/bazel_skylib_gazelle_plugin/1.4.0/presubmit.yml
new file mode 100644
index 00000000000..145d1157b81
--- /dev/null
+++ b/modules/bazel_skylib_gazelle_plugin/1.4.0/presubmit.yml
@@ -0,0 +1,13 @@
+matrix:
+  platform:
+  - centos7
+  - debian10
+  - ubuntu2004
+  - macos
+  - windows
+tasks:
+  verify_targets:
+    name: Verify build targets
+    platform: ${{ platform }}
+    build_targets:
+    - '@bazel_skylib_gazelle_plugin//...'
diff --git a/modules/bazel_skylib_gazelle_plugin/1.4.0/source.json b/modules/bazel_skylib_gazelle_plugin/1.4.0/source.json
new file mode 100644
index 00000000000..1ddfd78d5dd
--- /dev/null
+++ b/modules/bazel_skylib_gazelle_plugin/1.4.0/source.json
@@ -0,0 +1,4 @@
+{
+    "integrity": "sha256-BBgiMyhPy2VF02uUJI/igYa02dV0xBMdalEdWusnjEY=",
+    "url": "https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.0/bazel-skylib-gazelle-plugin-1.4.0.tar.gz"
+}
diff --git a/modules/bazel_skylib_gazelle_plugin/metadata.json b/modules/bazel_skylib_gazelle_plugin/metadata.json
new file mode 100644
index 00000000000..92848612092
--- /dev/null
+++ b/modules/bazel_skylib_gazelle_plugin/metadata.json
@@ -0,0 +1,16 @@
+{
+    "homepage": "https://github.com/bazelbuild/bazel-skylib",
+    "maintainers": [
+        {
+            "email": "bazel-dev@googlegroups.com",
+            "name": "The Bazel Team"
+        }
+    ],
+    "repository": [
+        "github:bazelbuild/bazel-skylib"
+    ],
+    "versions": [
+        "1.4.0"
+    ],
+    "yanked_versions": {}
+}

From f1621a28594d4e7f025aecb6c2b183dcd4c0717b Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <arostovtsev@google.com>
Date: Fri, 27 Jan 2023 10:38:41 -0500
Subject: [PATCH 2/2] Use identical MODULE.bazel content to release tarball's

---
 modules/bazel_skylib/1.4.0/MODULE.bazel | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/bazel_skylib/1.4.0/MODULE.bazel b/modules/bazel_skylib/1.4.0/MODULE.bazel
index 3305bf089ac..61c2400fa0a 100644
--- a/modules/bazel_skylib/1.4.0/MODULE.bazel
+++ b/modules/bazel_skylib/1.4.0/MODULE.bazel
@@ -1,7 +1,8 @@
 module(
     name = "bazel_skylib",
-    compatibility_level = 1,
+    # Keep in sync with version.bzl and @bazel_skylib_gazelle_plugin//:MODULE.bazel
     version = "1.4.0",
+    compatibility_level = 1,
 )
 
 register_toolchains(
@@ -10,3 +11,4 @@ register_toolchains(
 )
 
 bazel_dep(name = "platforms", version = "0.0.4")
+