[Bazel 6.3.2] Update to Bazel 6.3.2

bazel-xcode · Sep 20, 2023 · b69d93c · b69d93c
1 parent e9bbf68
commit b69d93c
Show file tree

Hide file tree

Showing 26 changed files with 173 additions and 171 deletions.
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-5.1.0
+6.3.2
diff --git a/BUILD b/BUILD
@@ -59,7 +59,8 @@ swift_library(
     name = "PodToBUILDTestsLib",
     srcs = glob(["Tests/PodToBUILDTests/*.swift"]),
     deps = [":RepoToolsCore", "@podtobuild-SwiftCheck//:SwiftCheck"],
-    data = glob(["Examples/**/*.podspec.json"])
+    data = glob(["Examples/**/*.podspec.json"]),
+    testonly = True
 )
 
 macos_unit_test(

diff --git a/Examples/AmazonIVSPlayer/WORKSPACE b/Examples/AmazonIVSPlayer/WORKSPACE
@@ -5,12 +5,10 @@ http_archive(
     urls = ["https://note-this-is-overridden"],
 )
 
-load("@rules_pods//BazelExtensions:workspace.bzl", "new_pod_repository")
-
 http_archive(
     name = "build_bazel_rules_apple",
-    sha256 = "12865e5944f09d16364aa78050366aca9dc35a32a018fa35f5950238b08bf744",
-    url = "https://github.com/bazelbuild/rules_apple/releases/download/0.34.2/rules_apple.0.34.2.tar.gz",
+    sha256 = "f94e6dddf74739ef5cb30f000e13a2a613f6ebfa5e63588305a71fce8a8a9911",
+    url = "https://github.com/bazelbuild/rules_apple/releases/download/1.1.3/rules_apple.1.1.3.tar.gz"
 )
 
 load(
@@ -20,24 +18,23 @@ load(
 
 apple_rules_dependencies()
 
-load(
-    "@build_bazel_apple_support//lib:repositories.bzl",
-    "apple_support_dependencies",
-)
-
-apple_support_dependencies()
-
 load(
     "@build_bazel_rules_swift//swift:repositories.bzl",
     "swift_rules_dependencies",
 )
 
 swift_rules_dependencies()
 
-
 load(
     "@build_bazel_rules_swift//swift:extras.bzl",
     "swift_rules_extra_dependencies",
 )
 
-swift_rules_extra_dependencies()
+swift_rules_extra_dependencies()
+
+load(
+    "@build_bazel_apple_support//lib:repositories.bzl",
+    "apple_support_dependencies",
+)
+
+apple_support_dependencies()
diff --git a/Examples/ArcSplitting/.bazelversion b/Examples/ArcSplitting/.bazelversion
@@ -1 +1 @@
-4.0.0
+6.3.2
diff --git a/Examples/ArcSplitting/WORKSPACE b/Examples/ArcSplitting/WORKSPACE
@@ -7,8 +7,8 @@ http_archive(
 
 http_archive(
     name = "build_bazel_rules_apple",
-    sha256 = "a41a75c291c69676b9974458ceee09aea60cee0e1ee282e27cdc90b679dfd30f",
-    url = "https://github.com/bazelbuild/rules_apple/releases/download/0.21.2/rules_apple.0.21.2.tar.gz",
+    sha256 = "f94e6dddf74739ef5cb30f000e13a2a613f6ebfa5e63588305a71fce8a8a9911",
+    url = "https://github.com/bazelbuild/rules_apple/releases/download/1.1.3/rules_apple.1.1.3.tar.gz"
 )
 
 load(
@@ -19,22 +19,22 @@ load(
 apple_rules_dependencies()
 
 load(
-    "@build_bazel_apple_support//lib:repositories.bzl",
-    "apple_support_dependencies",
+    "@build_bazel_rules_swift//swift:repositories.bzl",
+    "swift_rules_dependencies",
 )
 
-apple_support_dependencies()
+swift_rules_dependencies()
 
 load(
-    "@build_bazel_rules_swift//swift:repositories.bzl",
-    "swift_rules_dependencies",
+    "@build_bazel_rules_swift//swift:extras.bzl",
+    "swift_rules_extra_dependencies",
 )
 
-swift_rules_dependencies()
+swift_rules_extra_dependencies()
 
 load(
-    "@com_google_protobuf//:protobuf_deps.bzl",
-    "protobuf_deps",
+    "@build_bazel_apple_support//lib:repositories.bzl",
+    "apple_support_dependencies",
 )
 
-protobuf_deps()
+apple_support_dependencies()
diff --git a/Examples/BasiciOS/.bazelversion b/Examples/BasiciOS/.bazelversion
@@ -1 +1 @@
-5.1.0
+6.3.2
diff --git a/Examples/BasiciOS/WORKSPACE b/Examples/BasiciOS/WORKSPACE
@@ -9,8 +9,8 @@ load("@rules_pods//BazelExtensions:workspace.bzl", "new_pod_repository")
 
 http_archive(
     name = "build_bazel_rules_apple",
-    sha256 = "77e8bf6fda706f420a55874ae6ee4df0c9d95da6c7838228b26910fc82eea5a2",
-    url = "https://github.com/bazelbuild/rules_apple/releases/download/0.32.0/rules_apple.0.32.0.tar.gz",
+    sha256 = "f94e6dddf74739ef5cb30f000e13a2a613f6ebfa5e63588305a71fce8a8a9911",
+    url = "https://github.com/bazelbuild/rules_apple/releases/download/1.1.3/rules_apple.1.1.3.tar.gz"
 )
 
 load(
@@ -21,18 +21,23 @@ load(
 apple_rules_dependencies()
 
 load(
-    "@build_bazel_apple_support//lib:repositories.bzl",
-    "apple_support_dependencies",
+    "@build_bazel_rules_swift//swift:repositories.bzl",
+    "swift_rules_dependencies",
 )
 
-apple_support_dependencies()
+swift_rules_dependencies()
 
 load(
-    "@build_bazel_rules_swift//swift:repositories.bzl",
-    "swift_rules_dependencies",
+    "@build_bazel_rules_swift//swift:extras.bzl",
+    "swift_rules_extra_dependencies",
 )
 
-swift_rules_dependencies()
+swift_rules_extra_dependencies()
+
+load(
+    "@build_bazel_apple_support//lib:repositories.bzl",
+    "apple_support_dependencies",
+)
 
 new_pod_repository(
     name = "SlackTextViewController",

diff --git a/Examples/ChildPodspec/.bazelversion b/Examples/ChildPodspec/.bazelversion
@@ -1 +1 @@
-4.0.0
+6.3.2
diff --git a/Examples/ChildPodspec/WORKSPACE b/Examples/ChildPodspec/WORKSPACE
@@ -7,8 +7,8 @@ http_archive(
 
 http_archive(
     name = "build_bazel_rules_apple",
-    sha256 = "a41a75c291c69676b9974458ceee09aea60cee0e1ee282e27cdc90b679dfd30f",
-    url = "https://github.com/bazelbuild/rules_apple/releases/download/0.21.2/rules_apple.0.21.2.tar.gz",
+    sha256 = "f94e6dddf74739ef5cb30f000e13a2a613f6ebfa5e63588305a71fce8a8a9911",
+    url = "https://github.com/bazelbuild/rules_apple/releases/download/1.1.3/rules_apple.1.1.3.tar.gz"
 )
 
 load(
@@ -18,13 +18,6 @@ load(
 
 apple_rules_dependencies()
 
-load(
-    "@build_bazel_apple_support//lib:repositories.bzl",
-    "apple_support_dependencies",
-)
-
-apple_support_dependencies()
-
 load(
     "@build_bazel_rules_swift//swift:repositories.bzl",
     "swift_rules_dependencies",
@@ -33,9 +26,15 @@ load(
 swift_rules_dependencies()
 
 load(
-    "@com_google_protobuf//:protobuf_deps.bzl",
-    "protobuf_deps",
+    "@build_bazel_rules_swift//swift:extras.bzl",
+    "swift_rules_extra_dependencies",
 )
 
-protobuf_deps()
+swift_rules_extra_dependencies()
 
+load(
+    "@build_bazel_apple_support//lib:repositories.bzl",
+    "apple_support_dependencies",
+)
+
+apple_support_dependencies()
diff --git a/Examples/FBSDK/.bazelversion b/Examples/FBSDK/.bazelversion
@@ -1 +1 @@
-4.0.0
+6.3.2
diff --git a/Examples/FBSDK/WORKSPACE b/Examples/FBSDK/WORKSPACE
@@ -7,21 +7,8 @@ http_archive(
 
 http_archive(
     name = "build_bazel_rules_apple",
-    sha256 = "77e8bf6fda706f420a55874ae6ee4df0c9d95da6c7838228b26910fc82eea5a2",
-    url = "https://github.com/bazelbuild/rules_apple/releases/download/0.32.0/rules_apple.0.32.0.tar.gz",
-)
-
-http_archive(
-    name = "build_bazel_rules_swift",
-    url = "https://github.com/bazelbuild/rules_swift/releases/download/0.24.0/rules_swift.0.24.0.tar.gz",
-    sha256 = "4f167e5dbb49b082c5b7f49ee688630d69fb96f15c84c448faa2e97a5780dbbc",
-)
-
-http_archive(
-    name = "com_google_protobuf",
-    urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v3.19.1/protobuf-all-3.19.1.tar.gz"],
-    sha256 = "80631d5a18d51daa3a1336e340001ad4937e926762f21144c62d26fe2a8d71fe",
-    strip_prefix = "protobuf-3.19.1",
+    sha256 = "f94e6dddf74739ef5cb30f000e13a2a613f6ebfa5e63588305a71fce8a8a9911",
+    url = "https://github.com/bazelbuild/rules_apple/releases/download/1.1.3/rules_apple.1.1.3.tar.gz"
 )
 
 load(
@@ -32,22 +19,22 @@ load(
 apple_rules_dependencies()
 
 load(
-    "@build_bazel_apple_support//lib:repositories.bzl",
-    "apple_support_dependencies",
+    "@build_bazel_rules_swift//swift:repositories.bzl",
+    "swift_rules_dependencies",
 )
 
-apple_support_dependencies()
+swift_rules_dependencies()
 
 load(
-    "@build_bazel_rules_swift//swift:repositories.bzl",
-    "swift_rules_dependencies",
+    "@build_bazel_rules_swift//swift:extras.bzl",
+    "swift_rules_extra_dependencies",
 )
 
-swift_rules_dependencies()
+swift_rules_extra_dependencies()
 
 load(
-    "@com_google_protobuf//:protobuf_deps.bzl",
-    "protobuf_deps",
+    "@build_bazel_apple_support//lib:repositories.bzl",
+    "apple_support_dependencies",
 )
 
-protobuf_deps()
+apple_support_dependencies()
diff --git a/Examples/PINRemoteImage/.bazelversion b/Examples/PINRemoteImage/.bazelversion
@@ -1 +1 @@
-4.0.0
+6.3.2
diff --git a/Examples/PINRemoteImage/WORKSPACE b/Examples/PINRemoteImage/WORKSPACE
@@ -7,8 +7,8 @@ http_archive(
 
 http_archive(
     name = "build_bazel_rules_apple",
-    sha256 = "a41a75c291c69676b9974458ceee09aea60cee0e1ee282e27cdc90b679dfd30f",
-    url = "https://github.com/bazelbuild/rules_apple/releases/download/0.21.2/rules_apple.0.21.2.tar.gz",
+    sha256 = "f94e6dddf74739ef5cb30f000e13a2a613f6ebfa5e63588305a71fce8a8a9911",
+    url = "https://github.com/bazelbuild/rules_apple/releases/download/1.1.3/rules_apple.1.1.3.tar.gz"
 )
 
 load(
@@ -19,22 +19,22 @@ load(
 apple_rules_dependencies()
 
 load(
-    "@build_bazel_apple_support//lib:repositories.bzl",
-    "apple_support_dependencies",
+    "@build_bazel_rules_swift//swift:repositories.bzl",
+    "swift_rules_dependencies",
 )
 
-apple_support_dependencies()
+swift_rules_dependencies()
 
 load(
-    "@build_bazel_rules_swift//swift:repositories.bzl",
-    "swift_rules_dependencies",
+    "@build_bazel_rules_swift//swift:extras.bzl",
+    "swift_rules_extra_dependencies",
 )
 
-swift_rules_dependencies()
+swift_rules_extra_dependencies()
 
 load(
-    "@com_google_protobuf//:protobuf_deps.bzl",
-    "protobuf_deps",
+    "@build_bazel_apple_support//lib:repositories.bzl",
+    "apple_support_dependencies",
 )
 
-protobuf_deps()
+apple_support_dependencies()
diff --git a/Examples/React/.bazelversion b/Examples/React/.bazelversion
@@ -1 +1 @@
-5.1.0
+6.3.2
diff --git a/Examples/React/WORKSPACE b/Examples/React/WORKSPACE
@@ -7,8 +7,8 @@ http_archive(
 
 http_archive(
     name = "build_bazel_rules_apple",
-    sha256 = "77e8bf6fda706f420a55874ae6ee4df0c9d95da6c7838228b26910fc82eea5a2",
-    url = "https://github.com/bazelbuild/rules_apple/releases/download/0.32.0/rules_apple.0.32.0.tar.gz",
+    sha256 = "f94e6dddf74739ef5cb30f000e13a2a613f6ebfa5e63588305a71fce8a8a9911",
+    url = "https://github.com/bazelbuild/rules_apple/releases/download/1.1.3/rules_apple.1.1.3.tar.gz"
 )
 
 load(
@@ -19,15 +19,22 @@ load(
 apple_rules_dependencies()
 
 load(
-    "@build_bazel_apple_support//lib:repositories.bzl",
-    "apple_support_dependencies",
+    "@build_bazel_rules_swift//swift:repositories.bzl",
+    "swift_rules_dependencies",
 )
 
-apple_support_dependencies()
+swift_rules_dependencies()
 
 load(
-    "@build_bazel_rules_swift//swift:repositories.bzl",
-    "swift_rules_dependencies",
+    "@build_bazel_rules_swift//swift:extras.bzl",
+    "swift_rules_extra_dependencies",
 )
 
-swift_rules_dependencies()
+swift_rules_extra_dependencies()
+
+load(
+    "@build_bazel_apple_support//lib:repositories.bzl",
+    "apple_support_dependencies",
+)
+
+apple_support_dependencies()
diff --git a/Examples/SnapSDK/.bazelversion b/Examples/SnapSDK/.bazelversion
@@ -1 +1 @@
-4.0.0
+6.3.2
diff --git a/Examples/SnapSDK/WORKSPACE b/Examples/SnapSDK/WORKSPACE
@@ -5,12 +5,10 @@ http_archive(
     urls = ["https://note-this-is-overridden"],
 )
 
-load("@rules_pods//BazelExtensions:workspace.bzl", "new_pod_repository")
-
 http_archive(
     name = "build_bazel_rules_apple",
-    sha256 = "a41a75c291c69676b9974458ceee09aea60cee0e1ee282e27cdc90b679dfd30f",
-    url = "https://github.com/bazelbuild/rules_apple/releases/download/0.21.2/rules_apple.0.21.2.tar.gz",
+    sha256 = "f94e6dddf74739ef5cb30f000e13a2a613f6ebfa5e63588305a71fce8a8a9911",
+    url = "https://github.com/bazelbuild/rules_apple/releases/download/1.1.3/rules_apple.1.1.3.tar.gz"
 )
 
 load(
@@ -21,22 +19,22 @@ load(
 apple_rules_dependencies()
 
 load(
-    "@build_bazel_apple_support//lib:repositories.bzl",
-    "apple_support_dependencies",
+    "@build_bazel_rules_swift//swift:repositories.bzl",
+    "swift_rules_dependencies",
 )
 
-apple_support_dependencies()
+swift_rules_dependencies()
 
 load(
-    "@build_bazel_rules_swift//swift:repositories.bzl",
-    "swift_rules_dependencies",
+    "@build_bazel_rules_swift//swift:extras.bzl",
+    "swift_rules_extra_dependencies",
 )
 
-swift_rules_dependencies()
+swift_rules_extra_dependencies()
 
 load(
-    "@com_google_protobuf//:protobuf_deps.bzl",
-    "protobuf_deps",
+    "@build_bazel_apple_support//lib:repositories.bzl",
+    "apple_support_dependencies",
 )
 
-protobuf_deps()
+apple_support_dependencies()
diff --git a/Examples/SwiftSubspec/.bazelversion b/Examples/SwiftSubspec/.bazelversion
@@ -1 +1 @@
-4.0.0
+6.3.2