Skip to content

Commit 9549f1d

Browse files
committed
generate version data for root package
1 parent 33fe92c commit 9549f1d

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

Sources/Get/Package.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ extension Package {
1919
guard let origin = repo.origin else { throw Error.NoOrigin(repo.path) }
2020
let manifest = try manifestParser(path: repo.path, url: origin)
2121
let pkg = Package(manifest: manifest, url: origin)
22-
pkg.version = Version(pkg.versionString)!
22+
if let version = Version(pkg.versionString) {
23+
pkg.version = version
24+
}
2325
guard Version(pkg.versionString) != nil else { return nil }
2426
return pkg
2527
}

Sources/Get/get().swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ public func get(manifest: Manifest, manifestParser: (path: String, url: String)
2323

2424
//TODO don't lose the dependency information during the Fetcher process!
2525

26-
let pkgs = try box.recursivelyFetch(manifest.dependencies) + [Package(manifest: manifest, url: manifest.path.parentDirectory)]
26+
let rootPkg = Package(manifest: manifest, url: manifest.path.parentDirectory)
27+
rootPkg.version = Git.Repo(path: rootPkg.path)?.versions.last
28+
29+
let pkgs = try box.recursivelyFetch(manifest.dependencies) + [rootPkg]
2730
for pkg in pkgs {
2831
pkg.dependencies = pkg.manifest.package.dependencies.map{ dep in pkgs.pick{ dep.url == $0.url }! }
2932
}

0 commit comments

Comments
 (0)