various fixes to package

open-portfolio · Jul 6, 2021 · 059d95c · 059d95c
1 parent 9b9e8a3
commit 059d95c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 20 deletions.
diff --git a/CLI/AllocAttribute+dump.swift b/CLI/AllocAttribute+dump.swift
@@ -20,7 +20,7 @@ import Foundation
 import FINporter
 import AllocData
 
-extension AllocAttribute {
+public extension AllocAttribute {
 
     static func dumpTable(attributes: [AllocAttribute]) -> String {
 

diff --git a/CLI/main+schema.swift b/CLI/main+schema.swift
@@ -26,7 +26,7 @@ import SwiftCSV
 extension Finporter {
     struct Schema: ParsableCommand {
         static var configuration = CommandConfiguration(
-            // Command names are automatically generated from the type name
+            // command names are automatically generated from the type name
             // by default; you can specify an override here.
             commandName: "schema",
             abstract: "Describe schema details.",
@@ -42,7 +42,7 @@ extension Finporter {
                 Tracker.self,
             ]
         )
-        // defaultSubcommand: Format.self)
+        // defaultsubcommand: format.self)
     }
 }
 

diff --git a/CLI/main+transform.swift b/CLI/main+transform.swift
@@ -25,6 +25,8 @@ import SwiftCSV
 
 extension Finporter {
     struct Transform: ParsableCommand {
+        init() {
+        }
         static var configuration = CommandConfiguration(
             commandName: "transform",
             abstract: "Transform data in file."

diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.3
+// swift-tools-version:5.4
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 // Copyright 2021 FlowAllocator LLC
@@ -21,40 +21,33 @@ let package = Package(
     name: "FINporter",
     products: [
         .library(name: "FINporter", targets: ["FINporter"]),
-        .executable(name: "finporter", targets: ["FINporterCLI"]),
+        .executable(name: "finporter", targets: ["FINporterCLI"])
     ],
     dependencies: [
-        .package(url: "https://github.com/openalloc/AllocData.git", from: "1.0.0"),
-        .package(url: "https://github.com/reedes/SwiftCSV.git", .upToNextMajor(from: "0.6.1")),
-        .package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMajor(from: "0.4.3")),
-        .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
+        .package(name: "AllocData", url: "https://github.com/openalloc/AllocData.git", from: "1.0.0"),
+        .package(name: "SwiftCSV", url: "https://github.com/reedes/SwiftCSV.git", .upToNextMajor(from: "0.6.1")),
+        .package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMajor(from: "0.4.3"))
     ],
     targets: [
         .target(
             name: "FINporter",
             dependencies: [
-                .product(name: "AllocData", package: "AllocData"),
-                .product(name: "SwiftCSV", package: "SwiftCSV"),
-                .product(name: "Logging", package: "swift-log")
+                "AllocData", "SwiftCSV"
             ],
             path: "Sources"
         ),
-        .target(
+        .executableTarget(
             name: "FINporterCLI",
-            dependencies: [
-                .product(name: "AllocData", package: "AllocData"),
+            dependencies: [ 
                 "FINporter",
-                .product(name: "SwiftCSV", package: "SwiftCSV"),
-                .product(name: "ArgumentParser", package: "swift-argument-parser"),
+                .product(name: "ArgumentParser", package: "swift-argument-parser")
             ],
             path: "CLI"
         ),
         .testTarget(
             name: "FINporterTests",
             dependencies: [
-                .product(name: "AllocData", package: "AllocData"),
-                "FINporter",
-                .product(name: "SwiftCSV", package: "SwiftCSV"),
+                "FINporter"
             ],
             path: "Tests"
         ),