Merge pull request #23 from evandcoleman/release/0.1.24

force dynamic products
evandcoleman · Sep 21, 2021 · 5fe8f70 · 5fe8f70
2 parents e5bcd64 + 50aa7d9
commit 5fe8f70
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 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.22",
+        version: "0.1.24",
         subcommands: [
             Command.Build.self,
             Command.Upload.self,

diff --git a/Sources/ScipioKit/Models/SwiftPackageFile.swift b/Sources/ScipioKit/Models/SwiftPackageFile.swift
@@ -51,7 +51,7 @@ public struct SwiftPackageFile {
             .sorted { $0.name < $1.name }
 
         products = sortedArtifacts
-            .map { Product(name: $0.name, targets: [$0.name]) }
+            .map { Product(name: $0.name, type: .dynamic, targets: [$0.name]) }
 
         targets = try sortedArtifacts
             .map { name, artifact, target in
@@ -123,16 +123,22 @@ let package = Package(
 }
 
 extension SwiftPackageFile {
+    public enum ProductType: String {
+        case dynamic
+        case `static`
+    }
+
     public struct Product {
         public var name: String
+        public var type: ProductType
         public var targets: [String]
 
         func asString(indenting: String) -> String {
             let targetsString = targets
                 .map { "\"\($0)\"" }
                 .joined(separator: ", ")
 
-            return #"\#(indenting).library(name: "\#(name)", targets: [\#(targetsString)])"#
+            return #"\#(indenting).library(name: "\#(name)", type: .\#(type.rawValue), targets: [\#(targetsString)])"#
         }
     }