Replaced swiftLanguageVersions with swiftLanguageModes for Swift 6 on…

…wards
justeattakeaway · Sep 27, 2024 · 5cc1bef · 5cc1bef
1 parent 351fae7
commit 5cc1bef
Show file tree

Hide file tree

Showing 7 changed files with 109 additions and 5 deletions.
diff --git a/Example/Packages/Example.json b/Example/Packages/Example.json
@@ -4,7 +4,7 @@
     ".iOS(.v15)",
     ".macOS(.v13)"
   ],
-  "swiftToolsVersion": "5.10",
+  "swiftToolsVersion": "6.0",
   "swiftLanguageVersions": [
     "5.10",
     "6.0"
@@ -69,4 +69,4 @@
       "path": "../LocalXCFramework.xcframework"
     }
   ]
-}
+}
diff --git a/Example/Packages/Example.yaml b/Example/Packages/Example.yaml
@@ -2,7 +2,7 @@ name: Example
 platforms:
   - ".iOS(.v15)"
   - ".macOS(.v13)"
-swiftToolsVersion: '5.10'
+swiftToolsVersion: '6.0'
 swiftLanguageVersions:
   - '5.10'
   - '6.0'

diff --git a/Example/Packages/Package.swift b/Example/Packages/Package.swift
@@ -0,0 +1,75 @@
+// swift-tools-version: 6.0
+
+// This file was automatically generated by PackageGenerator and untracked
+// PLEASE DO NOT EDIT MANUALLY
+
+import PackageDescription
+
+let package = Package(
+    name: "Example",
+    defaultLocalization: "en",
+    platforms: [
+        .iOS(.v15),
+        .macOS(.v13),
+    ],
+    products: [
+        .library(
+            name: "Example",
+            targets: ["Example"]
+        ),
+    ],
+    dependencies: [
+        .package(
+            path: "../MyFrameworks"
+        ),
+        .package(
+            url: "https://github.com/DependencyA",
+            exact: "1.0.0"
+        ),
+        .package(
+            url: "https://github.com/DependencyB",
+            exact: "2.0.0"
+        ),
+        .package(
+            url: "https://github.com/DependencyC",
+            revision: "abcde1235kjh"
+        ),
+    ],
+    targets: [
+        .target(
+            name: "Example",
+            dependencies: [
+                .product(name: "RemoteDependencyA", package: "RemoteDependencyA"),
+                .target(name: "LocalXCFramework"),
+            ],
+            path: "Framework/Sources",
+            resources: [
+                .process("Resources")
+            ],
+            plugins: [
+            ]
+        ),
+        .testTarget(
+            name: "UnitTests",
+            dependencies: [
+                .byName(name: "Example"),
+                .product(name: "RemoteDependencyB", package: "RemoteDependencyB"),
+                .target(name: "LocalXCFramework"),
+            ],
+            path: "Tests/Sources",
+            resources: [
+                .process("Resources")
+            ],
+            plugins: [
+            ]
+        ),
+        .binaryTarget(
+            name: "LocalXCFramework",
+            path: "../LocalXCFramework.xcframework"
+        ),
+    ],
+    swiftLanguageModes: [
+        .version("5.10"),
+        .version("6.0"),
+    ]
+)
diff --git a/Package.resolved b/Package.resolved
@@ -27,6 +27,15 @@
         "version" : "1.0.1"
       }
     },
+    {
+      "identity" : "semver.swift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/glwithu06/Semver.swift.git",
+      "state" : {
+        "revision" : "53073d00185c49d5bdedc13e3697f5eb760fc2ad",
+        "version" : "1.2.0"
+      }
+    },
     {
       "identity" : "shellout",
       "kind" : "remoteSourceControl",

diff --git a/Package.swift b/Package.swift
@@ -13,7 +13,8 @@ let package = Package(
         .package(url: "https://github.com/apple/swift-argument-parser", from: "1.1.2"),
         .package(url: "https://github.com/SwiftGen/StencilSwiftKit", from: "2.8.0"),
         .package(url: "https://github.com/JohnSundell/ShellOut", from: "2.3.0"),
-        .package(url: "https://github.com/jpsim/Yams.git", from: "5.0.6")
+        .package(url: "https://github.com/jpsim/Yams.git", from: "5.0.6"),
+        .package(url: "https://github.com/glwithu06/Semver.swift.git", from: "1.2.0")
     ],
     targets: [
         .executableTarget(
@@ -22,7 +23,8 @@ let package = Package(
                 .product(name: "ArgumentParser", package: "swift-argument-parser"),
                 .product(name: "ShellOut", package: "ShellOut"),
                 .product(name: "StencilSwiftKit", package: "StencilSwiftKit"),
-                .product(name: "Yams", package: "Yams")
+                .product(name: "Yams", package: "Yams"),
+                .product(name: "Semver", package: "Semver.swift")
             ],
             path: "Sources"),
         .testTarget(

diff --git a/Sources/Core/Spec+Context.swift b/Sources/Core/Spec+Context.swift
@@ -1,6 +1,7 @@
 //  Spec+Context.swift
 
 import Foundation
+import Semver
 
 extension Spec.Product {
     func makeContext() -> [String: Any] {
@@ -33,6 +34,14 @@ extension Spec.RemoteDependency {
 }
 
 extension Spec {
+    var swiftToolsVersionMajor: Int? {
+        guard let swiftToolsVersionString = swiftToolsVersion else { return nil }
+        if let swiftToolsVersion = try? Semver(string: swiftToolsVersionString) {
+            return Int(swiftToolsVersion.major)
+        }
+        return nil
+    }
+
     func makeContext() -> [String: Any] {
         let values: [String: Any?] = [
             "package_name": name,
@@ -44,6 +53,7 @@ extension Spec {
             "local_binary_targets": localBinaryTargets,
             "remote_binary_targets": remoteBinaryTargets,
             "swift_tools_version": swiftToolsVersion,
+            "swift_tools_version_major": swiftToolsVersionMajor,
             "swift_versions": swiftLanguageVersions
         ]
         return values.compactMapValues { $0 }

diff --git a/Templates/Package.stencil b/Templates/Package.stencil
@@ -121,7 +121,15 @@ let package = Package(
 {% endfor %}
 {% if swift_versions %}
     ],
+    {% if swift_tools_version_major %}
+        {% if swift_tools_version_major >= 6 %}
+    swiftLanguageModes: [
+        {% else %}
     swiftLanguageVersions: [
+        {% endif %}
+    {% else %}
+    swiftLanguageVersions: [
+    {% endif %}
     {% for swift_version in swift_versions %}
         .version("{{ swift_version }}"),
     {% endfor %}