From b392e4aa99e62313d981c57ac29afee4e3d1502b Mon Sep 17 00:00:00 2001 From: Bart Louwers Date: Wed, 7 Aug 2024 11:51:10 +0200 Subject: [PATCH] Bazel updates (#2696) --- .bazelversion | 2 +- MODULE.bazel | 38 +++++++++++++++++++++++++++++++------- WORKSPACE | 20 -------------------- 3 files changed, 32 insertions(+), 28 deletions(-) delete mode 100644 WORKSPACE diff --git a/.bazelversion b/.bazelversion index a3fcc7121..b26a34e47 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -7.1.0 +7.2.1 diff --git a/MODULE.bazel b/MODULE.bazel index 728b691bc..97704d2e9 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -1,12 +1,12 @@ module(name = "maplibre") -bazel_dep(name = "apple_support", version = "1.11.1", repo_name = "build_bazel_apple_support") -bazel_dep(name = "aspect_rules_js", version = "1.34.1") -bazel_dep(name = "bazel_skylib", version = "1.5.0") -bazel_dep(name = "platforms", version = "0.0.8") -bazel_dep(name = "rules_apple", version = "3.1.1", repo_name = "build_bazel_rules_apple") -bazel_dep(name = "rules_swift", version = "1.13.0", repo_name = "build_bazel_rules_swift") -bazel_dep(name = "rules_xcodeproj", version = "1.13.0") +bazel_dep(name = "apple_support", version = "1.16.0", repo_name = "build_bazel_apple_support") +bazel_dep(name = "aspect_rules_js", version = "1.42.3") +bazel_dep(name = "bazel_skylib", version = "1.7.1") +bazel_dep(name = "platforms", version = "0.0.10") +bazel_dep(name = "rules_apple", version = "3.7.0", repo_name = "build_bazel_rules_apple") +bazel_dep(name = "rules_swift", version = "2.1.1", repo_name = "build_bazel_rules_swift") +bazel_dep(name = "rules_xcodeproj", version = "2.5.2") npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm") npm.npm_translate_lock( @@ -36,3 +36,27 @@ http_file( sha256 = "6a218702a5a60bb6358494217cac2836a087355ac092f6b01f089d8b1b2842ca", url = "https://maplibre-native.s3.eu-central-1.amazonaws.com/ios-swift-example-app-resources/pois-nps.mbtiles", ) + +http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") + +http_archive( + name = "glfw", + build_file = "@//vendor:glfw.BUILD", + integrity = "sha256-tewASycS/Qjohh3CcUKPBId1IAot9xnM9XUUO6dJo+k=", + strip_prefix = "glfw-3.4", + urls = ["https://github.com/glfw/glfw/releases/download/3.4/glfw-3.4.zip"], +) + +new_local_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:local.bzl", "new_local_repository") + +new_local_repository( + name = "libuv", + build_file = "@//vendor:libuv.BUILD", + path = "/opt/homebrew/opt/libuv", +) + +darwin_config = use_repo_rule("//platform/darwin:bazel/darwin_config_repository_rule.bzl", "darwin_config") + +darwin_config( + name = "darwin_config", +) diff --git a/WORKSPACE b/WORKSPACE deleted file mode 100644 index e4df7e1b3..000000000 --- a/WORKSPACE +++ /dev/null @@ -1,20 +0,0 @@ -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -load("//platform/darwin:bazel/darwin_config_repository_rule.bzl", "darwin_config") - -http_archive( - name = "glfw", - build_file = "@//vendor:glfw.BUILD", - integrity = "sha256-tewASycS/Qjohh3CcUKPBId1IAot9xnM9XUUO6dJo+k=", - strip_prefix = "glfw-3.4", - url = "https://github.com/glfw/glfw/releases/download/3.4/glfw-3.4.zip", -) - -new_local_repository( - name = "libuv", - build_file = "@//vendor:libuv.BUILD", - path = "/opt/homebrew/opt/libuv", -) - -darwin_config( - name = "darwin_config", -)