Squashed 'apollo-ios/' changes from 5dee1f010..543ed1c70

543ed1c70 Merge 2.0 into main branch (#780)

git-subtree-dir: apollo-ios
git-subtree-split: 543ed1c706060fd8dfb8c2f83dd24ca927a66b97

Author: gh-action-runner

Apollo.podspec

@@ -1,18 +1,14 @@
-// swift-tools-version:5.9
-//
-// The swift-tools-version declares the minimum version of Swift required to build this package.
-// Swift 5.9 is available from Xcode 15.0.
-
+// swift-tools-version:6.1
 
 import PackageDescription
 
 let package = Package(
   name: "Apollo",
   platforms: [
-    .iOS(.v12),
-    .macOS(.v10_14),
-    .tvOS(.v12),
-    .watchOS(.v5),
+    .iOS(.v15),
+    .macOS(.v12),
+    .tvOS(.v15),
+    .watchOS(.v8),
     .visionOS(.v1),
   ],
   products: [
@@ -24,8 +20,7 @@ let package = Package(
     .library(name: "ApolloTestSupport", targets: ["ApolloTestSupport"]),
     .plugin(name: "InstallCLI", targets: ["Install CLI"])
   ],
-  dependencies: [
-  ],
+  dependencies: [],
   targets: [
     .target(
       name: "Apollo",
@@ -35,15 +30,19 @@ let package = Package(
       resources: [
         .copy("Resources/PrivacyInfo.xcprivacy")
       ],
-      swiftSettings: [.enableUpcomingFeature("ExistentialAny")]
+      swiftSettings: [
+        .swiftLanguageMode(.v6)
+      ]
     ),
     .target(
       name: "ApolloAPI",
       dependencies: [],
       resources: [
         .copy("Resources/PrivacyInfo.xcprivacy")
       ],
-      swiftSettings: [.enableUpcomingFeature("ExistentialAny")]
+      swiftSettings: [
+        .swiftLanguageMode(.v6)
+      ]
     ),
     .target(
       name: "ApolloSQLite",
@@ -53,7 +52,9 @@ let package = Package(
       resources: [
         .copy("Resources/PrivacyInfo.xcprivacy")
       ],
-      swiftSettings: [.enableUpcomingFeature("ExistentialAny")]
+      swiftSettings: [
+        .swiftLanguageMode(.v6)
+      ]
     ),
     .target(
       name: "ApolloWebSocket",
@@ -63,15 +64,19 @@ let package = Package(
       resources: [
         .copy("Resources/PrivacyInfo.xcprivacy")
       ],
-      swiftSettings: [.enableUpcomingFeature("ExistentialAny")]
+      swiftSettings: [
+        .swiftLanguageMode(.v6)
+      ]
     ),
     .target(
       name: "ApolloTestSupport",
       dependencies: [
         "Apollo",
         "ApolloAPI"
       ],
-      swiftSettings: [.enableUpcomingFeature("ExistentialAny")]
+      swiftSettings: [
+        .swiftLanguageMode(.v6)
+      ]
     ),
     .plugin(
       name: "Install CLI",
@@ -86,5 +91,6 @@ let package = Package(
       dependencies: [],
       path: "Plugins/InstallCLI"
     )
-  ]
+  ],
+  swiftLanguageModes: [.v6, .v5]
 )

ApolloTestSupport.podspec

@@ -14,9 +14,12 @@ struct InstallCLIPluginCommand: CommandPlugin {
     try dependencies.forEach { dep in
       if dep.package.displayName == "Apollo" {
         let process = Process()
-        let path = try context.tool(named: "sh").path
-        process.executableURL = URL(fileURLWithPath: path.string)
-        process.arguments = ["\(dep.package.directory)/scripts/download-cli.sh", context.package.directory.string]
+        let url = try context.tool(named: "sh").url
+        process.executableURL = URL(fileURLWithPath: url.absoluteString)
+        process.arguments = [
+          "\(dep.package.directoryURL)/scripts/download-cli.sh",
+          context.package.directoryURL.absoluteString
+        ]
         try process.run()
         process.waitUntilExit()
       }
@@ -33,11 +36,11 @@ extension InstallCLIPluginCommand: XcodeCommandPlugin {
   /// 👇 This entry point is called when operating on an Xcode project.
   func performCommand(context: XcodePluginContext, arguments: [String]) throws {
     let process = Process()
-    let toolPath = try context.tool(named: "sh").path
-    process.executableURL = URL(fileURLWithPath: toolPath.string)
+    let toolURL = try context.tool(named: "sh").url
+    process.executableURL = URL(fileURLWithPath: toolURL.absoluteString)
 
     let downloadScriptPath = try downloadScriptPath(context: context)
-    process.arguments = [downloadScriptPath, context.xcodeProject.directory.string]
+    process.arguments = [downloadScriptPath, context.xcodeProject.directoryURL.standardized.relativePath]
 
     try process.run()
     process.waitUntilExit()
@@ -50,15 +53,15 @@ extension InstallCLIPluginCommand: XcodeCommandPlugin {
   private func downloadScriptPath(context: XcodePluginContext) throws -> String {
     let xcodeVersion = try xcodeVersion(context: context)
     let relativeScriptPath = "SourcePackages/checkouts/apollo-ios/scripts/download-cli.sh"
-    let absoluteScriptPath: String
+    let absoluteScriptPath: URL
 
     if xcodeVersion.lexicographicallyPrecedes("16.3") {
-      absoluteScriptPath = "\(context.pluginWorkDirectory)/../../../\(relativeScriptPath)"
+      absoluteScriptPath = context.pluginWorkDirectoryURL.appending(path: "../../../\(relativeScriptPath)")
     } else {
-      absoluteScriptPath = "\(context.pluginWorkDirectory)/../../../../\(relativeScriptPath)"
+      absoluteScriptPath = context.pluginWorkDirectoryURL.appending(path: "../../../../\(relativeScriptPath)")
     }
 
-    return absoluteScriptPath
+    return absoluteScriptPath.standardized.relativePath
   }
 
   /// Used to get a string representation of Xcode in the current toolchain.
@@ -67,8 +70,8 @@ extension InstallCLIPluginCommand: XcodeCommandPlugin {
   /// - Returns: A string representation of the Xcode version.
   private func xcodeVersion(context: XcodePluginContext) throws -> String {
     let process = Process()
-    let toolPath = try context.tool(named: "xcrun").path
-    process.executableURL = URL(fileURLWithPath: toolPath.string)
+    let toolURL = try context.tool(named: "xcrun").url
+    process.executableURL = URL(fileURLWithPath: toolURL.absoluteString)
     process.arguments = ["xcodebuild", "-version"]
 
     let outputPipe = Pipe()

CHANGELOG.md

@@ -26,10 +26,8 @@
   </a>
   <a href="https://swift.org/package-manager/">
     <img src="https://img.shields.io/badge/Swift_Package_Manager-compatible-orange?style=flat-square" alt="Swift Package Manager compatible">
-  </a>
-  <a href="https://cocoapods.org/pods/Apollo">
-    <img src="https://img.shields.io/cocoapods/v/Apollo.svg" alt="CocoaPods compatible">
-  </a>
+  </a>  
+</p>
 
   </div>
 </header>