diff --git a/.swiftformat b/.swiftformat
new file mode 100644
index 0000000..7def2b7
--- /dev/null
+++ b/.swiftformat
@@ -0,0 +1,14 @@
+# Formatting Options - Mimic Google style
+--indent 2
+--maxwidth 100
+--wrapparameters afterfirst
+
+# Disabled Rules
+
+# Too many of our swift files have simplistic examples. While technically
+# it's correct to remove the unused argument labels, it makes our examples
+# look wrong.
+--disable unusedArguments
+
+# We prefer trailing braces.
+--disable wrapMultilineStatementBraces
diff --git a/Mintfile b/Mintfile
index 5fc5628..640a5ca 100644
--- a/Mintfile
+++ b/Mintfile
@@ -1 +1 @@
-nicklockwood/SwiftFormat@0.51.12
+nicklockwood/SwiftFormat@0.54.0
diff --git a/Package.swift b/Package.swift
index 11ab264..de47032 100644
--- a/Package.swift
+++ b/Package.swift
@@ -35,9 +35,11 @@ let package = Package(
       url: "https://github.com/google/GoogleUtilities.git",
       "8.0.0" ..< "9.0.0"
     ),
+    // TODO: restore OCMock when https://github.com/erikdoe/ocmock/pull/537
+    // gets merged to fix Xcode 15.3 builds.
     .package(
-      url: "https://github.com/erikdoe/ocmock.git",
-      revision: "c5eeaa6dde7c308a5ce48ae4d4530462dd3a1110"
+      url: "https://github.com/paulb777/ocmock.git",
+      revision: "173955e93e6ee6999a10729ab67e4b4efdd1db6d"
     ),
   ],
   targets: [