Merge pull request #15 from khaptonstall/feature/reoganize-spm-files

Feature/Reorganize SPM files

.gitignore

@@ -34,42 +34,18 @@ DerivedData/
 timeline.xctimeline
 playground.xcworkspace
 
-# Swift Package Manager
-#
-# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
-# Packages/
-# Package.pins
-# Package.resolved
-# *.xcodeproj
-#
+## Swift Package Manager
+Packages/
+Package.pins
+Package.resolved
+*.xcodeproj
+
 # Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
 # hence it is not needed unless you have added a package configuration file to your project
-# .swiftpm
+.swiftpm
 
 .build/
 
-# CocoaPods
-#
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-#
-# Pods/
-#
-# Add this line if you want to avoid checking in source code from the Xcode workspace
-# *.xcworkspace
-
-# Carthage
-#
-# Add this line if you want to avoid checking in source code from Carthage dependencies.
-# Carthage/Checkouts
-
-Carthage/Build/
-
-# Accio dependency management
-Dependencies/
-.accio/
-
 # fastlane
 #
 # It is recommended to not store the screenshots in the git repo.
@@ -82,9 +58,3 @@ fastlane/Preview.html
 fastlane/screenshots/**/*.png
 fastlane/test_output
 
-# Code Injection
-#
-# After new code Injection tools there's a generated folder /iOSInjectionProject
-# https://github.com/johnno1962/injectionforxcode
-
-iOSInjectionProject/

ACFTCalculator/.swiftpm/xcode/xcshareddata/xcschemes/ACFTCalculator.xcscheme → ACFTCalculator.xcworkspace/xcshareddata/xcschemes/ACFTCalculator.xcscheme

@@ -6,20 +6,6 @@
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "ACFTCalculator_ACFTCalculator"
-               BuildableName = "ACFTCalculator_ACFTCalculator"
-               BlueprintName = "ACFTCalculator_ACFTCalculator"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"
@@ -34,38 +20,13 @@
                ReferencedContainer = "container:">
             </BuildableReference>
          </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "ACFTCalculatorTests"
-               BuildableName = "ACFTCalculatorTests"
-               BlueprintName = "ACFTCalculatorTests"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES"
-      onlyGenerateCoverageForSpecifiedTargets = "YES">
-      <CodeCoverageTargets>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "ACFTCalculator"
-            BuildableName = "ACFTCalculator"
-            BlueprintName = "ACFTCalculator"
-            ReferencedContainer = "container:">
-         </BuildableReference>
-      </CodeCoverageTargets>
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -99,9 +60,9 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "ACFTCalculator_ACFTCalculator"
-            BuildableName = "ACFTCalculator_ACFTCalculator"
-            BlueprintName = "ACFTCalculator_ACFTCalculator"
+            BlueprintIdentifier = "ACFTCalculator"
+            BuildableName = "ACFTCalculator"
+            BlueprintName = "ACFTCalculator"
             ReferencedContainer = "container:">
          </BuildableReference>
       </MacroExpansion>

ACFTCalculator/Package.swift → Package.swift

@@ -9,13 +9,14 @@ let package = Package(
         .iOS(.v14),
         .tvOS(.v14),
         .macOS(.v11),
-        .watchOS(.v6)
+        .watchOS(.v6),
     ],
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.
         .library(
             name: "ACFTCalculator",
-            targets: ["ACFTCalculator"]),
+            targets: ["ACFTCalculator"]
+        ),
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
@@ -27,9 +28,11 @@ let package = Package(
         .target(
             name: "ACFTCalculator",
             dependencies: [],
-            resources: [.process("Resources/ACFTScoringStandards.csv")]),
+            resources: [.process("Resources/ACFTScoringStandards.csv")]
+        ),
         .testTarget(
             name: "ACFTCalculatorTests",
-            dependencies: ["ACFTCalculator"]),
+            dependencies: ["ACFTCalculator"]
+        ),
     ]
 )