From d837d6a369c50c31aaeee452a192ad78ba5f161d Mon Sep 17 00:00:00 2001
From: Jan-Erik Rediger <jrediger@mozilla.com>
Date: Mon, 29 May 2023 12:50:03 +0200
Subject: [PATCH] Update Swift dependencies

---
 .../ios/Glean.xcodeproj/project.pbxproj       |  2 +-
 .../xcshareddata/swiftpm/Package.resolved     | 42 +++++++++----------
 .../project.pbxproj                           |  2 +-
 .../xcshareddata/swiftpm/Package.resolved     | 42 +++++++++----------
 4 files changed, 42 insertions(+), 46 deletions(-)

diff --git a/glean-core/ios/Glean.xcodeproj/project.pbxproj b/glean-core/ios/Glean.xcodeproj/project.pbxproj
index 56da221c43..05f25a85d9 100644
--- a/glean-core/ios/Glean.xcodeproj/project.pbxproj
+++ b/glean-core/ios/Glean.xcodeproj/project.pbxproj
@@ -937,7 +937,7 @@
 			repositoryURL = "https://github.com/1024jp/GzipSwift";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 5.1.1;
+				minimumVersion = 6.0.0;
 			};
 		};
 		CD70CF942850D6F900FC2014 /* XCRemoteSwiftPackageReference "OHHTTPStubs" */ = {
diff --git a/glean-core/ios/Glean.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/glean-core/ios/Glean.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 05934cd81a..6b8c800568 100644
--- a/glean-core/ios/Glean.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/glean-core/ios/Glean.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,25 +1,23 @@
 {
-  "object": {
-    "pins" : [
-      {
-        "package": "GzipSwift",
-          "repositoryURL" : "https://github.com/1024jp/GzipSwift",
-          "state" : {
-            "branch": null,
-            "revision" : "7a7f17761c76a932662ab77028a4329f67d645a4",
-            "version" : "5.2.0"
-          }
-      },
-      {
-        "package" : "OHHTTPStubs",
-        "repositoryURL" : "https://github.com/alisoftware/OHHTTPStubs",
-        "state" : {
-          "branch": null,
-          "revision" : "12f19662426d0434d6c330c6974d53e2eb10ecd9",
-          "version" : "9.1.0"
-        }
+  "pins" : [
+    {
+      "identity" : "gzipswift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/1024jp/GzipSwift",
+      "state" : {
+        "revision" : "99cf703b461916279cbbb50068e904df86c37133",
+        "version" : "6.0.0"
       }
-    ]
-  },
-  "version": 1
+    },
+    {
+      "identity" : "ohhttpstubs",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/alisoftware/OHHTTPStubs",
+      "state" : {
+        "revision" : "12f19662426d0434d6c330c6974d53e2eb10ecd9",
+        "version" : "9.1.0"
+      }
+    }
+  ],
+  "version" : 2
 }
diff --git a/samples/ios/app/glean-sample-app.xcodeproj/project.pbxproj b/samples/ios/app/glean-sample-app.xcodeproj/project.pbxproj
index ecbead5024..9776dd52fd 100644
--- a/samples/ios/app/glean-sample-app.xcodeproj/project.pbxproj
+++ b/samples/ios/app/glean-sample-app.xcodeproj/project.pbxproj
@@ -725,7 +725,7 @@
 			repositoryURL = "https://github.com/1024jp/GzipSwift";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 5.1.1;
+				minimumVersion = 6.0.0;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
diff --git a/samples/ios/app/glean-sample-app.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/samples/ios/app/glean-sample-app.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 4a17b011fd..6682ae2b55 100644
--- a/samples/ios/app/glean-sample-app.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/samples/ios/app/glean-sample-app.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,25 +1,23 @@
 {
-  "object": {
-    "pins" : [
-      {
-        "package": "GzipSwift",
-        "repositoryURL" : "https://github.com/1024jp/GzipSwift",
-        "state" : {
-          "branch": null,
-          "revision" : "7a7f17761c76a932662ab77028a4329f67d645a4",
-          "version" : "5.2.0"
-        }
-      },
-      {
-        "package" : "swifter",
-        "repositoryURL" : "https://github.com/httpswift/swifter",
-        "state" : {
-          "branch": null,
-          "revision" : "9483a5d459b45c3ffd059f7b55f9638e268632fd",
-          "version" : "1.5.0"
-        }
+  "pins" : [
+    {
+      "identity" : "gzipswift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/1024jp/GzipSwift",
+      "state" : {
+        "revision" : "99cf703b461916279cbbb50068e904df86c37133",
+        "version" : "6.0.0"
       }
-    ]
-  },
-  "version" : 1
+    },
+    {
+      "identity" : "swifter",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/httpswift/swifter",
+      "state" : {
+        "revision" : "9483a5d459b45c3ffd059f7b55f9638e268632fd",
+        "version" : "1.5.0"
+      }
+    }
+  ],
+  "version" : 2
 }