Use bzlmod (#64)upstream-main

* Use bzlmod

Use the new Bazel module system. This should hopefully help fix the
broken re2 import in SPIRV-Tools.

* Use bazel 7.0.2 in Kokoro

* Ignore root user error

8 files changed, 40 insertions, 36 deletions

diff --git a/.bazelrc b/.bazelrc
new file mode 100644
index 0000000..e8138cb
--- /dev/null
+++ b/.bazelrc
@@ -0,0 +1,2 @@
+# Enable Bzlmod for every Bazel command
+common --enable_bzlmod
diff --git a/.bazelversion b/.bazelversion
new file mode 100644
index 0000000..a8907c0
--- /dev/null
+++ b/.bazelversion
@@ -0,0 +1 @@
+7.0.2
diff --git a/.gitignore b/.gitignore
index 860d44d..52744b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,4 +12,5 @@ third_party/googletest/
 third_party/abseil-cpp/
 third_party/abseil_cpp/
 bazel-*
+MODULE.bazel.lock
 .DS_Store
diff --git a/BUILD.bazel b/BUILD.bazel
index 5819ffe..9faec8a 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -25,7 +25,7 @@ cc_library(
     compatible_with = [
     ],
     deps = [
-        "@com_googlesource_code_re2//:re2",
+        "@re2//:re2",
     ],
 )
 
@@ -60,8 +60,8 @@ cc_test(
     srcs = ["effcee/check_test.cc"],
     deps = [
         ":effcee",
-        "@com_google_googletest//:gtest_main",
-        "@com_google_googletest//:gtest",
+        "@googletest//:gtest_main",
+        "@googletest//:gtest",
     ],
 )
 
@@ -70,8 +70,8 @@ cc_test(
     srcs = ["effcee/cursor_test.cc"],
     deps = [
         ":effcee",
-        "@com_google_googletest//:gtest_main",
-        "@com_google_googletest//:gtest",
+        "@googletest//:gtest_main",
+        "@googletest//:gtest",
     ],
 )
 
@@ -80,8 +80,8 @@ cc_test(
     srcs = ["effcee/diagnostic_test.cc"],
     deps = [
         ":effcee",
-        "@com_google_googletest//:gtest_main",
-        "@com_google_googletest//:gtest",
+        "@googletest//:gtest_main",
+        "@googletest//:gtest",
     ],
 )
 
@@ -90,8 +90,8 @@ cc_test(
     srcs = ["effcee/match_test.cc"],
     deps = [
         ":effcee",
-        "@com_google_googletest//:gtest_main",
-        "@com_google_googletest//:gtest",
+        "@googletest//:gtest_main",
+        "@googletest//:gtest",
     ],
 )
 
@@ -100,8 +100,8 @@ cc_test(
     srcs = ["effcee/options_test.cc"],
     deps = [
         ":effcee",
-        "@com_google_googletest//:gtest_main",
-        "@com_google_googletest//:gtest",
+        "@googletest//:gtest_main",
+        "@googletest//:gtest",
     ],
 )
 
@@ -110,7 +110,7 @@ cc_test(
     srcs = ["effcee/result_test.cc"],
     deps = [
         ":effcee",
-        "@com_google_googletest//:gtest_main",
-        "@com_google_googletest//:gtest",
+        "@googletest//:gtest_main",
+        "@googletest//:gtest",
     ],
 )
diff --git a/MODULE.bazel b/MODULE.bazel
new file mode 100644
index 0000000..22124d9
--- /dev/null
+++ b/MODULE.bazel
@@ -0,0 +1,17 @@
+module(name = "effcee")
+
+bazel_dep(name = "rules_python", version = "0.31.0")
+python = use_extension("@rules_python//python/extensions:python.bzl", "python")
+python.toolchain(
+    configure_coverage_tool = False,
+    ignore_root_user_error = True,
+    python_version = "3.11",
+)
+
+bazel_dep(
+    name = "googletest",
+    version = "1.14.0",
+    dev_dependency = True,
+)
+
+bazel_dep(name = "re2", version = "2024-04-01")
diff --git a/WORKSPACE b/WORKSPACE
deleted file mode 100644
index 5f4df18..0000000
--- a/WORKSPACE
+++ /dev/null
@@ -1,17 +0,0 @@
-workspace(name = "effcee")
-
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-
-http_archive(
-    name = "com_google_googletest",
-    strip_prefix = "googletest-release-1.12.1",
-    urls = ["https://github.com/google/googletest/archive/refs/tags/release-1.12.1.zip"],
-    sha256 = "24564e3b712d3eb30ac9a85d92f7d720f60cc0173730ac166f27dda7fed76cb2"
-)
-
-http_archive(
-    name = "com_googlesource_code_re2",
-    strip_prefix = "re2-2022-12-01",
-    urls = ["https://github.com/google/re2/archive/refs/tags/2022-12-01.zip"],
-    sha256 = "0a6cc63356915057f8fceb4224355507e24591dc84eea5c0241b5f57daa02e6f",
-)
diff --git a/kokoro/macos-clang-release-bazel/build.sh b/kokoro/macos-clang-release-bazel/build.sh
index 0b0f832..5c38e29 100644
--- a/kokoro/macos-clang-release-bazel/build.sh
+++ b/kokoro/macos-clang-release-bazel/build.sh
@@ -32,14 +32,14 @@ git config --global --add safe.directory $SRC
 cd $SRC
 /usr/bin/python3 utils/git-sync-deps
 
-# Get bazel 5.0.0
-gsutil cp gs://bazel/5.0.0/release/bazel-5.0.0-darwin-x86_64 .
-chmod +x bazel-5.0.0-darwin-x86_64
+# Get bazel 7.0.2
+gsutil cp gs://bazel/7.0.2/release/bazel-7.0.2-darwin-x86_64 .
+chmod +x bazel-7.0.2-darwin-x86_64
 
 echo $(date): Build everything...
-./bazel-5.0.0-darwin-x86_64 build --cxxopt=-std=c++17 :all
+./bazel-7.0.2-darwin-x86_64 build --cxxopt=-std=c++17 :all
 echo $(date): Build completed.
 
 echo $(date): Starting bazel test...
-./bazel-5.0.0-darwin-x86_64 test --cxxopt=-std=c++17 :all
+./bazel-7.0.2-darwin-x86_64 test --cxxopt=-std=c++17 :all
 echo $(date): Bazel test completed.
diff --git a/kokoro/scripts/linux/build-docker.sh b/kokoro/scripts/linux/build-docker.sh
index 0559828..c6b1309 100755
--- a/kokoro/scripts/linux/build-docker.sh
+++ b/kokoro/scripts/linux/build-docker.sh
@@ -99,7 +99,7 @@ if [ $TOOL = "cmake" ]; then
   ctest --output-on-failure --timeout 300
   echo $(date): ctest completed.
 elif [ $TOOL = "bazel" ]; then
-  using bazel-5.0.0
+  using bazel-7.0.2
 
   echo $(date): Build everything...
   bazel build --cxxopt=-std=c++17 :all