diff --git a/.bazelversion b/.bazelversion
index 40c341b..6aba2b2 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-3.6.0
+4.2.0
diff --git a/.gitignore b/.gitignore
index 03671ac..4be9efd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /bazel-*
 /Examples/bazel-*
 /.vscode
+.build
diff --git a/Examples/BazelXCBBuildService/Package.resolved b/Examples/BazelXCBBuildService/Package.resolved
index 1700e65..5eb8dcb 100644
--- a/Examples/BazelXCBBuildService/Package.resolved
+++ b/Examples/BazelXCBBuildService/Package.resolved
@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/apple/swift-log.git",
         "state": {
           "branch": null,
-          "revision": "74d7b91ceebc85daf387ebb206003f78813f71aa",
-          "version": "1.2.0"
+          "revision": "5d66f7ba25daf4f94100e7022febf3c75e37a6c7",
+          "version": "1.4.2"
         }
       },
       {
@@ -15,8 +15,8 @@
         "repositoryURL": "https://github.com/apple/swift-nio.git",
         "state": {
           "branch": null,
-          "revision": "c5fa0b456524cd73dc3ddbb263d4f46c20b86ca3",
-          "version": "2.17.0"
+          "revision": "6aa9347d9bc5bbfe6a84983aec955c17ffea96ef",
+          "version": "2.33.0"
         }
       },
       {
diff --git a/Examples/BazelXCBBuildService/Package.swift b/Examples/BazelXCBBuildService/Package.swift
index ba9a6ea..7ea77bb 100644
--- a/Examples/BazelXCBBuildService/Package.swift
+++ b/Examples/BazelXCBBuildService/Package.swift
@@ -9,8 +9,8 @@ let package = Package(
         .executable(name: "BazelXCBBuildService", targets: ["BazelXCBBuildService"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
-        .package(url: "https://github.com/apple/swift-nio.git", from: "2.17.0"),
+        .package(url: "https://github.com/apple/swift-log.git", from: "1.4.2"),
+        .package(url: "https://github.com/apple/swift-nio.git", from: "2.33.0"),
         .package(url: "https://github.com/apple/swift-protobuf.git", from: "1.9.0"),
         // XCBBuildServiceProxy lives up two levels from here
         .package(path: "../../"),
diff --git a/Examples/WORKSPACE b/Examples/WORKSPACE
index dc967d2..9c79a55 100644
--- a/Examples/WORKSPACE
+++ b/Examples/WORKSPACE
@@ -6,20 +6,20 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "build_bazel_apple_support",
-    sha256 = "36d60bce680446ab534b141c47f2aef6b9c598267ef3450b7d74b9d81e1fd6bd",
-    url = "https://github.com/bazelbuild/apple_support/releases/download/0.9.0/apple_support.0.9.0.tar.gz",
+    sha256 = "76df040ade90836ff5543888d64616e7ba6c3a7b33b916aa3a4b68f342d1b447",
+    url = "https://github.com/bazelbuild/apple_support/releases/download/0.11.0/apple_support.0.11.0.tar.gz",
 )
 
 http_archive(
     name = "build_bazel_rules_apple",
-    sha256 = "55f4dc1c9bf21bb87442665f4618cff1f1343537a2bd89252078b987dcd9c382",
-    url = "https://github.com/bazelbuild/rules_apple/releases/download/0.20.0/rules_apple.0.20.0.tar.gz",
+    sha256 = "0052d452af7742c8f3a4e0929763388a66403de363775db7e90adecb2ba4944b",
+    url = "https://github.com/bazelbuild/rules_apple/releases/download/0.31.3/rules_apple.0.31.3.tar.gz",
 )
 
 http_archive(
     name = "build_bazel_rules_swift",
-    sha256 = "d2f38c33dc82cf3160c59342203d31a030e53ebe8f4c7365add7a549223f9c62",
-    url = "https://github.com/bazelbuild/rules_swift/releases/download/0.15.0/rules_swift.0.15.0.tar.gz",
+    sha256 = "653e8756001616500b110fd156694de7899278bb7480aba22b2f156438a1d810",
+    url = "https://github.com/bazelbuild/rules_swift/releases/download/0.22.0/rules_swift.0.22.0.tar.gz",
 )
 
 load("@build_bazel_apple_support//lib:repositories.bzl", "apple_support_dependencies")
diff --git a/Package.swift b/Package.swift
index f7f4d69..2a1650a 100644
--- a/Package.swift
+++ b/Package.swift
@@ -17,7 +17,7 @@ let package = Package(
     dependencies: [
         // Make sure to update the versions used in the `repositories.bzl` file if you change them here
         .package(url: "https://github.com/apple/swift-log", .exact("1.4.2")),
-        .package(url: "https://github.com/apple/swift-nio", .exact("2.30.0")),
+        .package(url: "https://github.com/apple/swift-nio", .exact("2.33.0")),
     ],
     targets: [
         .target(
diff --git a/external/com_github_apple_swift_nio.BUILD b/external/com_github_apple_swift_nio.BUILD
index e87c71d..5bdefad 100644
--- a/external/com_github_apple_swift_nio.BUILD
+++ b/external/com_github_apple_swift_nio.BUILD
@@ -10,6 +10,40 @@ swift_library(
         ":CNIODarwin",
         ":CNIOLinux",
         ":NIOConcurrencyHelpers",
+        ":NIOCore",
+        ":NIOEmbedded",
+        ":NIOPosix",
+    ],
+)
+
+swift_library(
+    name = "NIOEmbedded",
+    srcs = glob(["Sources/NIOEmbedded/**/*.swift"]),
+    deps = [
+      ":_NIODataStructures",
+      ":NIOCore",
+    ],
+)
+
+swift_library(
+    name = "_NIODataStructures",
+    srcs = glob(["Sources/_NIODataStructures/**/*.swift"]),
+    deps = [],
+)
+
+swift_library(
+    name = "NIOPosix",
+    srcs = glob(["Sources/NIOPosix/**/*.swift"]),
+    deps = [
+      ":NIOCore",
+    ],
+)
+
+swift_library(
+    name = "NIOCore",
+    srcs = glob(["Sources/NIOCore/**/*.swift"]),
+    deps = [
+      ":NIOConcurrencyHelpers",
     ],
 )
 
@@ -44,6 +78,7 @@ objc_library(
         "Sources/CNIODarwin/include/**/*.h",
     ]),
     includes = ["Sources/CNIODarwin/include"],
+    defines = ["__APPLE_USE_RFC_3542"],
 )
 
 objc_library(
diff --git a/repositories.bzl b/repositories.bzl
index 2a19e49..8f72301 100644
--- a/repositories.bzl
+++ b/repositories.bzl
@@ -22,9 +22,9 @@ def xcbbuildserviceproxy_dependencies():
         http_archive,
         build_file = "@com_github_target_xcbbuildserviceproxy//:external/com_github_apple_swift_nio.BUILD",
         name = "com_github_apple_swift_nio",
-        sha256 = "40b115e77e8af3ffbe84be344c30c0964763e318e1d3dfe0a80da0e2ae17d614",
-        strip_prefix = "swift-nio-2.30.0",
+        sha256 = "4a654952046a46ad8f09d359e6c02e7fa04ab09f492ae35f5d6d7c769f3f008a",
+        strip_prefix = "swift-nio-2.33.0",
         urls = [
-            "https://github.com/apple/swift-nio/archive/2.30.0.tar.gz",
+            "https://github.com/apple/swift-nio/archive/2.33.0.tar.gz",
         ],
     )