Merge pull request #13 from shibapm/optimise_get_swift_tool_version

Get swift tool version only once
shibapm · Oct 14, 2019 · 62e9e0c · 62e9e0c
2 parents 4d02d13 + 9ef1405
commit 62e9e0c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,6 +14,12 @@ matrix:
       script:
         - swift build
         - swift run package-config-example --verbose
+
+    - os: osx
+      osx_image: xcode11
+      script:
+        - swift build
+        - swift run package-config-example --verbose
 
     - os: linux
       language: generic

diff --git a/Sources/PackageConfig/Package.swift b/Sources/PackageConfig/Package.swift
@@ -118,15 +118,16 @@ enum Package {
 
         let latestVersion = versions.sorted().last!
         var spmVersionDir = latestVersion
+        let swiftToolsVersion = getSwiftToolsVersion()
 
-        if let swiftToolsVersion = getSwiftToolsVersion(), versions.contains(swiftToolsVersion) {
+        if let swiftToolsVersion = swiftToolsVersion, versions.contains(swiftToolsVersion) {
             spmVersionDir = swiftToolsVersion
         }
 
         let libraryPathSPM = swiftPMDir + "/" + spmVersionDir
 
         debugLog("Using SPM version: \(libraryPathSPM)")
-        return ["-L", libraryPathSPM, "-I", libraryPathSPM, "-lPackageDescription", "-package-description-version", getSwiftToolsVersion() ?? "5"]
+        return ["-L", libraryPathSPM, "-I", libraryPathSPM, "-lPackageDescription", "-package-description-version", swiftToolsVersion ?? "5"]
     }
 
     private static func getSwiftToolsVersion() -> String? {