Replaced swiftLanguageVersions with swiftLanguageModes for Swift 6 on…

…wards (#8) --------- Co-authored-by: Antonio Strijdom <[email protected]>
justeattakeaway · Sep 30, 2024 · f156353 · f156353
1 parent 351fae7
commit f156353
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 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/Sources/Core/Spec+Context.swift b/Sources/Core/Spec+Context.swift
@@ -33,6 +33,14 @@ extension Spec.RemoteDependency {
 }
 
 extension Spec {
+    var swiftToolsVersionMajor: Int? {
+        guard let swiftToolsVersionString = swiftToolsVersion else { return nil }
+        if let majorString = swiftToolsVersionString.components(separatedBy: ".").first {
+            return Int(majorString)
+        }
+        return nil
+    }
+
     func makeContext() -> [String: Any] {
         let values: [String: Any?] = [
             "package_name": name,
@@ -44,6 +52,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 %}