Unify grpc-swift dependency between packages (#664)

ArielDemarco · web-flow · commit 0249cd4efa6b · 2025-01-06T09:39:33.000-08:00
* Unify GRPC dependency between package

* Adding Package.resolved
diff --git a/Package.resolved b/Package.resolved
@@ -5,8 +5,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/grpc/grpc-swift.git",
       "state" : {
-        "revision" : "6a90b7e77e29f9bda6c2b3a4165a40d6c02cfda1",
-        "version" : "1.23.0"
+        "revision" : "8c5e99d0255c373e0330730d191a3423c57373fb",
+        "version" : "1.24.2"
       }
     },
     {
@@ -68,17 +68,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-nio.git",
       "state" : {
-        "revision" : "9428f62793696d9a0cc1f26a63f63bb31da0516d",
-        "version" : "2.66.0"
+        "revision" : "dca6594f65308c761a9c409e09fbf35f48d50d34",
+        "version" : "2.77.0"
       }
     },
     {
       "identity" : "swift-nio-extras",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-nio-extras.git",
       "state" : {
-        "revision" : "a3b640d7dc567225db7c94386a6e71aded1bfa63",
-        "version" : "1.22.0"
+        "revision" : "2e9746cfc57554f70b650b021b6ae4738abef3e6",
+        "version" : "1.24.1"
       }
     },
     {
@@ -113,17 +113,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-protobuf.git",
       "state" : {
-        "revision" : "9f0c76544701845ad98716f3f6a774a892152bcb",
-        "version" : "1.26.0"
+        "revision" : "ebc7251dd5b37f627c93698e4374084d98409633",
+        "version" : "1.28.2"
       }
     },
     {
       "identity" : "swift-system",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-system.git",
       "state" : {
-        "revision" : "f9266c85189c2751589a50ea5aec72799797e471",
-        "version" : "1.3.0"
+        "revision" : "c8a44d836fe7913603e246acab7c528c2e780168",
+        "version" : "1.4.0"
       }
     },
     {
diff --git a/Package.swift b/Package.swift
@@ -39,7 +39,7 @@ let package = Package(
         .package(url: "https://github.com/undefinedlabs/opentracing-objc", exact: "0.5.2"),
         .package(url: "https://github.com/undefinedlabs/Thrift-Swift", exact: "1.1.1"),
         .package(url: "https://github.com/apple/swift-nio.git", exact: "2.0.0"),
-        .package(url: "https://github.com/grpc/grpc-swift.git", exact: "1.0.0"),
+        .package(url: "https://github.com/grpc/grpc-swift.git", exact: "1.24.2"),
         .package(url: "https://github.com/apple/swift-protobuf.git", exact: "1.20.2"),
         .package(url: "https://github.com/apple/swift-log.git", exact: "1.4.4"),
         .package(url: "https://github.com/apple/swift-metrics.git", exact: "2.1.1"),
diff --git a/Package@swift-5.6.swift b/Package@swift-5.6.swift
@@ -40,7 +40,7 @@ let package = Package(
         .package(url: "https://github.com/undefinedlabs/opentracing-objc", from: "0.5.2"),
         .package(url: "https://github.com/undefinedlabs/Thrift-Swift", from: "1.1.1"),
         .package(url: "https://github.com/apple/swift-nio.git", from: "2.0.0"),
-        .package(url: "https://github.com/grpc/grpc-swift.git", from: "1.0.0"),
+        .package(url: "https://github.com/grpc/grpc-swift.git", exact: "1.24.2"),
         .package(url: "https://github.com/apple/swift-protobuf.git", from: "1.20.2"),
         .package(url: "https://github.com/apple/swift-log.git", from: "1.4.4"),
         .package(url: "https://github.com/apple/swift-metrics.git", from: "2.1.1"),
diff --git a/Package@swift-5.9.swift b/Package@swift-5.9.swift
@@ -29,7 +29,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/apple/swift-nio.git", from: "2.0.0"),
-        .package(url: "https://github.com/grpc/grpc-swift.git", from: "1.0.0"),
+        .package(url: "https://github.com/grpc/grpc-swift.git", exact: "1.24.2"),
         .package(url: "https://github.com/apple/swift-protobuf.git", from: "1.20.2"),
         .package(url: "https://github.com/apple/swift-log.git", from: "1.4.4"),
         .package(url: "https://github.com/apple/swift-metrics.git", from: "2.1.1"),

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@`
`5`	`5`	`"kind" : "remoteSourceControl",`
`6`	`6`	`"location" : "https://github.com/grpc/grpc-swift.git",`
`7`	`7`	`"state" : {`
`8`		`- "revision" : "6a90b7e77e29f9bda6c2b3a4165a40d6c02cfda1",`
`9`		`- "version" : "1.23.0"`
	`8`	`+ "revision" : "8c5e99d0255c373e0330730d191a3423c57373fb",`
	`9`	`+ "version" : "1.24.2"`
`10`	`10`	`}`
`11`	`11`	`},`
`12`	`12`	`{`
`@@ -68,17 +68,17 @@`
`68`	`68`	`"kind" : "remoteSourceControl",`
`69`	`69`	`"location" : "https://github.com/apple/swift-nio.git",`
`70`	`70`	`"state" : {`
`71`		`- "revision" : "9428f62793696d9a0cc1f26a63f63bb31da0516d",`
`72`		`- "version" : "2.66.0"`
	`71`	`+ "revision" : "dca6594f65308c761a9c409e09fbf35f48d50d34",`
	`72`	`+ "version" : "2.77.0"`
`73`	`73`	`}`
`74`	`74`	`},`
`75`	`75`	`{`
`76`	`76`	`"identity" : "swift-nio-extras",`
`77`	`77`	`"kind" : "remoteSourceControl",`
`78`	`78`	`"location" : "https://github.com/apple/swift-nio-extras.git",`
`79`	`79`	`"state" : {`
`80`		`- "revision" : "a3b640d7dc567225db7c94386a6e71aded1bfa63",`
`81`		`- "version" : "1.22.0"`
	`80`	`+ "revision" : "2e9746cfc57554f70b650b021b6ae4738abef3e6",`
	`81`	`+ "version" : "1.24.1"`
`82`	`82`	`}`
`83`	`83`	`},`
`84`	`84`	`{`
`@@ -113,17 +113,17 @@`
`113`	`113`	`"kind" : "remoteSourceControl",`
`114`	`114`	`"location" : "https://github.com/apple/swift-protobuf.git",`
`115`	`115`	`"state" : {`
`116`		`- "revision" : "9f0c76544701845ad98716f3f6a774a892152bcb",`
`117`		`- "version" : "1.26.0"`
	`116`	`+ "revision" : "ebc7251dd5b37f627c93698e4374084d98409633",`
	`117`	`+ "version" : "1.28.2"`
`118`	`118`	`}`
`119`	`119`	`},`
`120`	`120`	`{`
`121`	`121`	`"identity" : "swift-system",`
`122`	`122`	`"kind" : "remoteSourceControl",`
`123`	`123`	`"location" : "https://github.com/apple/swift-system.git",`
`124`	`124`	`"state" : {`
`125`		`- "revision" : "f9266c85189c2751589a50ea5aec72799797e471",`
`126`		`- "version" : "1.3.0"`
	`125`	`+ "revision" : "c8a44d836fe7913603e246acab7c528c2e780168",`
	`126`	`+ "version" : "1.4.0"`
`127`	`127`	`}`
`128`	`128`	`},`
`129`	`129`	`{`