Rebuilt using Swift Package Manager.

jkolb · Oct 3, 2016 · dec4d5b · dec4d5b
1 parent b15f362
commit dec4d5b
Show file tree

Hide file tree

Showing 12 changed files with 215 additions and 448 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .DS_Store
-xcuserdata
-.build/
+/.build
+/Packages
+/*.xcodeproj
diff --git a/FieryCrucible.xcodeproj/project.pbxproj b/FieryCrucible.xcodeproj/project.pbxproj
diff --git a/FieryCrucible.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/FieryCrucible.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/FieryCrucible.xcodeproj/project.xcworkspace/xcshareddata/FieryCrucible.xccheckout b/FieryCrucible.xcodeproj/project.xcworkspace/xcshareddata/FieryCrucible.xccheckout
diff --git a/FieryCrucible.xcodeproj/xcshareddata/xcschemes/FieryCrucible.xcscheme b/FieryCrucible.xcodeproj/xcshareddata/xcschemes/FieryCrucible.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "9999"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,26 +14,12 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "E53405A91A3020CE00A474C1"
+               BlueprintIdentifier = "______Target_FieryCrucible"
                BuildableName = "FieryCrucible.framework"
                BlueprintName = "FieryCrucible"
                ReferencedContainer = "container:FieryCrucible.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "NO"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "E55D50181D84AD4700860E02"
-               BuildableName = "FieryCrucibleTests.xctest"
-               BlueprintName = "FieryCrucibleTests"
-               ReferencedContainer = "container:FieryCrucible.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
@@ -46,22 +32,13 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "E55D50181D84AD4700860E02"
+               BlueprintIdentifier = "______Target_FieryCrucibleTests"
                BuildableName = "FieryCrucibleTests.xctest"
                BlueprintName = "FieryCrucibleTests"
                ReferencedContainer = "container:FieryCrucible.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "E53405A91A3020CE00A474C1"
-            BuildableName = "FieryCrucible.framework"
-            BlueprintName = "FieryCrucible"
-            ReferencedContainer = "container:FieryCrucible.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </TestAction>
@@ -78,7 +55,7 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "E53405A91A3020CE00A474C1"
+            BlueprintIdentifier = "______Target_FieryCrucible"
             BuildableName = "FieryCrucible.framework"
             BlueprintName = "FieryCrucible"
             ReferencedContainer = "container:FieryCrucible.xcodeproj">
@@ -93,15 +70,6 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "E53405A91A3020CE00A474C1"
-            BuildableName = "FieryCrucible.framework"
-            BlueprintName = "FieryCrucible"
-            ReferencedContainer = "container:FieryCrucible.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

diff --git a/FieryCrucible/FieryCrucible.h b/FieryCrucible/FieryCrucible.h
diff --git a/FieryCrucible/Info.plist b/FieryCrucible/Info.plist
diff --git a/FieryCrucibleTests/Info.plist b/FieryCrucibleTests/Info.plist
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,6 @@
-Copyright (c) 2016 Justin Kolb - http://franticapparatus.net
+The MIT License (MIT)
+
+Copyright (c) 2016 Justin Kolb
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -7,13 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/README.md b/README.md
@@ -7,6 +7,9 @@ A minimalist type safe Swift dependency injector factory. Where all true instanc
 
 #### Changelog
 
+#####Version 2.0.3
+* Rebuild project and directory structure using Swift Package Manager.
+
 #####Version 2.0.2
 * Fix for Carthage building.
 * Skipped 2.0.1 as I forgot to update the README.

diff --git a/Sources/DependencyFactory.swift b/Sources/DependencyFactory.swift
@@ -1,22 +1,26 @@
-// Copyright (c) 2016 Justin Kolb - http://franticapparatus.net
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+/*
+ The MIT License (MIT)
+ 
+ Copyright (c) 2016 Justin Kolb
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ 
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
+ */
 
 private protocol InstanceContainer : class {
     associatedtype InstanceType

diff --git a/Tests/FieryCrucibleTests/FieryCrucibleTests.swift b/Tests/FieryCrucibleTests/FieryCrucibleTests.swift
@@ -1,3 +1,27 @@
+/*
+ The MIT License (MIT)
+ 
+ Copyright (c) 2016 Justin Kolb
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ 
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
+ */
+
 import XCTest
 @testable import FieryCrucible