Merge pull request #38 from mxcl/tweaks

Tweaks
mxcl · Feb 13, 2019 · a125a87 · a125a87
2 parents e74cc63 + d79844c
commit a125a87
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 20 deletions.
diff --git a/.github/deploy b/.github/deploy
@@ -114,8 +114,10 @@ var defaultSwiftVersion: String {
 
 func podspec(repo: Repo, user: User, pkg: Package) -> (Substring, String) {
     let (owner, name) = { ($0[0], $0[1]) }(slug.split(separator: "/"))
-    let swiftVersion = pkg.swiftLanguageVersions.max() ?? defaultSwiftVersion
-    let sources = pkg.targets.filter{ $0.type == .regular }.compactMap{ $0.path }.first!
+    let swiftVersion = pkg.swiftLanguageVersions.min() ?? defaultSwiftVersion
+    let targets = pkg.targets.filter{ $0.type == .regular }
+    guard targets.count == 1 else { fatal(message: "Too many targets for this script!") }
+    guard let sources = targets[0].path else { fatal(message: "Target has no path!") }
     return (name, """
     Pod::Spec.new do |s|
       s.name = '\(name)'

diff --git a/Package.swift b/Package.swift
@@ -1,7 +1,7 @@
 // swift-tools-version:4.2
 import PackageDescription
 
-let package = Package(
+let pkg = Package(
     name: "Path.swift",
     products: [
         .library(name: "Path", targets: ["Path"]),
@@ -11,3 +11,9 @@ let package = Package(
         .testTarget(name: "PathTests", dependencies: ["Path"]),
     ]
 )
+
+pkg.swiftLanguageVersions = [.v4_2]
+
+#if swift(>=5)
+pkg.swiftLanguageVersions.append(.v5)
+#endif
diff --git a/[email protected] b/[email protected]
diff --git a/[email protected] b/[email protected]
@@ -0,0 +1 @@
+Package.swift