Merge 7ceb6c5 into 7c4c770

evandcoleman · Sep 9, 2021 · ced9466 · ced9466
2 parents 7c4c770 + 7ceb6c5
commit ced9466
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/Sources/Scipio/main.swift b/Sources/Scipio/main.swift
@@ -10,7 +10,7 @@ extension Command {
       .init(
         commandName: "Scipio",
         abstract: "A program to pre-build and cache Swift packages",
-        version: "0.1.17",
+        version: "0.1.18",
         subcommands: [
             Command.Build.self,
             Command.Upload.self,

diff --git a/Sources/ScipioKit/Dependency Processors/CocoaPodProcessor.swift b/Sources/ScipioKit/Dependency Processors/CocoaPodProcessor.swift
@@ -186,7 +186,15 @@ private extension CocoaPodDependency {
         var result = "pod '\(name)'"
 
         if let git = git {
-            result += ", :git => '\(git)'"
+            result += ", :git => '\(git.absoluteString)'"
+
+            if let commit = commit {
+                result += ", :commit => '\(commit)'"
+            } else if let branch = branch {
+                result += ", :branch => '\(branch)'"
+            }
+        } else if let podspec = podspec {
+            result += ", :podspec => '\(podspec.absoluteString)'"
         } else if let version = version {
             result += ", '\(version)'"
         } else if let from = from {

diff --git a/Sources/ScipioKit/Models/Dependency.swift b/Sources/ScipioKit/Models/Dependency.swift
@@ -40,6 +40,9 @@ public struct CocoaPodDependency: Dependency {
     public let version: String?
     public let from: String?
     public let git: URL?
+    public let branch: String?
+    public let commit: String?
+    public let podspec: URL?
     public let excludes: [String]?
     public let additionalBuildSettings: [String: String]?
 }