diff --git a/WORKSPACE b/WORKSPACE
index 4d8f944355..03291663a6 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -2,12 +2,15 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file"
 
 http_archive(
     name = "bazel_features",
-    sha256 = "9fcb3d7cbe908772462aaa52f02b857a225910d30daa3c252f670e3af6d8036d",
-    strip_prefix = "bazel_features-1.0.0",
-    url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.0.0/bazel_features-v1.0.0.tar.gz",
+    sha256 = "0f23d75c7623d6dba1fd30513a94860447de87c8824570521fcc966eda3151c2",
+    strip_prefix = "bazel_features-1.4.1",
+    url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.4.1/bazel_features-v1.4.1.tar.gz",
+)
+
+local_repository(
+    name = "rules_xcodeproj",
+    path = "build-system/bazel-rules/rules_xcodeproj",
 )
-load("@bazel_features//:deps.bzl", "bazel_features_deps")
-bazel_features_deps()
 
 local_repository(
     name = "build_bazel_rules_apple",
@@ -24,11 +27,30 @@ local_repository(
     path = "build-system/bazel-rules/apple_support",
 )
 
-local_repository(
-    name = "rules_xcodeproj",
-    path = "build-system/bazel-rules/rules_xcodeproj",
+http_file(
+    name = "cmake_tar_gz",
+    urls = ["https://github.com/Kitware/CMake/releases/download/v3.23.1/cmake-3.23.1-macos-universal.tar.gz"],
+    sha256 = "f794ed92ccb4e9b6619a77328f313497d7decf8fb7e047ba35a348b838e0e1e2",
 )
 
+http_archive(
+    name = "appcenter_sdk",
+    urls = ["https://github.com/microsoft/appcenter-sdk-apple/releases/download/4.1.1/AppCenter-SDK-Apple-4.1.1.zip"],
+    sha256 = "032907801dc7784744a1ca8fd40d3eecc34a2e27a93a4b3993f617cca204a9f3",
+    build_file = "@//third-party/AppCenter:AppCenter.BUILD",
+)
+
+load(
+    "@rules_xcodeproj//xcodeproj:repositories.bzl",
+    "xcodeproj_rules_dependencies",
+)
+
+xcodeproj_rules_dependencies()
+
+load("@bazel_features//:deps.bzl", "bazel_features_deps")
+
+bazel_features_deps()
+
 load(
     "@build_bazel_rules_apple//apple:repositories.bzl",
     "apple_rules_dependencies",
@@ -43,6 +65,13 @@ load(
 
 swift_rules_dependencies()
 
+load(
+    "@build_bazel_rules_swift//swift:extras.bzl",
+    "swift_rules_extra_dependencies",
+)
+
+swift_rules_extra_dependencies()
+
 load(
     "@build_bazel_apple_support//lib:repositories.bzl",
     "apple_support_dependencies",
@@ -50,32 +79,11 @@ load(
 
 apple_support_dependencies()
 
-load(
-    "@rules_xcodeproj//xcodeproj:repositories.bzl",
-    "xcodeproj_rules_dependencies",
-)
-
-xcodeproj_rules_dependencies()
-
 load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
 
 bazel_skylib_workspace()
 
-http_file(
-    name = "cmake_tar_gz",
-    urls = ["https://github.com/Kitware/CMake/releases/download/v3.23.1/cmake-3.23.1-macos-universal.tar.gz"],
-    sha256 = "f794ed92ccb4e9b6619a77328f313497d7decf8fb7e047ba35a348b838e0e1e2",
-)
-
-http_archive(
-    name = "appcenter_sdk",
-    urls = ["https://github.com/microsoft/appcenter-sdk-apple/releases/download/4.1.1/AppCenter-SDK-Apple-4.1.1.zip"],
-    sha256 = "032907801dc7784744a1ca8fd40d3eecc34a2e27a93a4b3993f617cca204a9f3",
-    build_file = "@//third-party/AppCenter:AppCenter.BUILD",
-)
-
 load("@build_bazel_rules_apple//apple:apple.bzl", "provisioning_profile_repository")
-
 provisioning_profile_repository(
     name = "local_provisioning_profiles",
 )
diff --git a/build-system/bazel-rules/rules_xcodeproj b/build-system/bazel-rules/rules_xcodeproj
index facad43379..48c3af2361 160000
--- a/build-system/bazel-rules/rules_xcodeproj
+++ b/build-system/bazel-rules/rules_xcodeproj
@@ -1 +1 @@
-Subproject commit facad433796cf2e71a523d0cd09a29a96b9b4890
+Subproject commit 48c3af236127cc0ba78b2664fa9b868f2471ca2c