Merge pull request #25 from nonsensery/fix-major-minor-dependency

mxcl · mxcl · commit f6b6da9f862e · 2015-12-04T13:32:49.000-08:00
Fix "minor" version dependency pinning
diff --git a/Sources/PackageDescription/Package.swift b/Sources/PackageDescription/Package.swift
@@ -33,7 +33,7 @@ public final class Package {
             return Dependency(url, Version(majorVersion, 0, 0)..<Version(majorVersion + 1, 0, 0))
         }
         public class func Package(url url: String, majorVersion: Int, minor: Int) -> Dependency {
-            return Dependency(url, Version(majorVersion, minor, 0)..<Version(majorVersion + 1, 0, 0))
+            return Dependency(url, Version(majorVersion, minor, 0)..<Version(majorVersion, minor + 1, 0))
         }
         public class func Package(url url: String, _ version: Version) -> Dependency {
             return Dependency(url, version...version)

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public final class Package {`
`33`	`33`	`return Dependency(url, Version(majorVersion, 0, 0)..<Version(majorVersion + 1, 0, 0))`
`34`	`34`	`}`
`35`	`35`	`public class func Package(url url: String, majorVersion: Int, minor: Int) -> Dependency {`
`36`		`- return Dependency(url, Version(majorVersion, minor, 0)..<Version(majorVersion + 1, 0, 0))`
	`36`	`+ return Dependency(url, Version(majorVersion, minor, 0)..<Version(majorVersion, minor + 1, 0))`
`37`	`37`	`}`
`38`	`38`	`public class func Package(url url: String, _ version: Version) -> Dependency {`
`39`	`39`	`return Dependency(url, version...version)`