Update for hopefully Swift 3 final.

Package manager support. API clean up. Added tests.
jkolb · Sep 10, 2016 · ac1da5c · ac1da5c
1 parent 1d44d02
commit ac1da5c
Show file tree

Hide file tree

Showing 10 changed files with 443 additions and 49 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 .DS_Store
 xcuserdata
+.build/
diff --git a/FieryCrucible.xcodeproj/project.pbxproj b/FieryCrucible.xcodeproj/project.pbxproj
@@ -8,14 +8,29 @@
 
 /* Begin PBXBuildFile section */
 		E53405B01A3020CE00A474C1 /* FieryCrucible.h in Headers */ = {isa = PBXBuildFile; fileRef = E53405AF1A3020CE00A474C1 /* FieryCrucible.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		E5A928C81A32C0B60071875D /* DependencyFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = E5A928C71A32C0B60071875D /* DependencyFactory.swift */; };
+		E55D501E1D84AD4700860E02 /* FieryCrucible.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E53405AA1A3020CE00A474C1 /* FieryCrucible.framework */; };
+		E55D50251D84AD8800860E02 /* DependencyFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = E55D50241D84AD8800860E02 /* DependencyFactory.swift */; };
+		E55D50271D84AD9C00860E02 /* FieryCrucibleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E55D50261D84AD9C00860E02 /* FieryCrucibleTests.swift */; };
 /* End PBXBuildFile section */
 
+/* Begin PBXContainerItemProxy section */
+		E55D501F1D84AD4700860E02 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = E53405A11A3020CE00A474C1 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = E53405A91A3020CE00A474C1;
+			remoteInfo = FieryCrucible;
+		};
+/* End PBXContainerItemProxy section */
+
 /* Begin PBXFileReference section */
 		E53405AA1A3020CE00A474C1 /* FieryCrucible.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FieryCrucible.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		E53405AE1A3020CE00A474C1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		E53405AF1A3020CE00A474C1 /* FieryCrucible.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FieryCrucible.h; sourceTree = "<group>"; };
-		E5A928C71A32C0B60071875D /* DependencyFactory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DependencyFactory.swift; sourceTree = "<group>"; };
+		E55D50191D84AD4700860E02 /* FieryCrucibleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FieryCrucibleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		E55D501D1D84AD4700860E02 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		E55D50241D84AD8800860E02 /* DependencyFactory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DependencyFactory.swift; path = Sources/DependencyFactory.swift; sourceTree = SOURCE_ROOT; };
+		E55D50261D84AD9C00860E02 /* FieryCrucibleTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FieryCrucibleTests.swift; path = Tests/FieryCrucibleTests/FieryCrucibleTests.swift; sourceTree = SOURCE_ROOT; };
 		E5F98A491C5B13300072BAF8 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
 		E5F98A4B1C5B13370072BAF8 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -28,6 +43,14 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		E55D50161D84AD4700860E02 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				E55D501E1D84AD4700860E02 /* FieryCrucible.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
@@ -37,6 +60,7 @@
 				E5F98A4B1C5B13370072BAF8 /* README.md */,
 				E5F98A491C5B13300072BAF8 /* LICENSE */,
 				E53405AC1A3020CE00A474C1 /* FieryCrucible */,
+				E55D501A1D84AD4700860E02 /* FieryCrucibleTests */,
 				E53405AB1A3020CE00A474C1 /* Products */,
 			);
 			sourceTree = "<group>";
@@ -45,6 +69,7 @@
 			isa = PBXGroup;
 			children = (
 				E53405AA1A3020CE00A474C1 /* FieryCrucible.framework */,
+				E55D50191D84AD4700860E02 /* FieryCrucibleTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -53,7 +78,7 @@
 			isa = PBXGroup;
 			children = (
 				E53405AF1A3020CE00A474C1 /* FieryCrucible.h */,
-				E5A928C71A32C0B60071875D /* DependencyFactory.swift */,
+				E55D50241D84AD8800860E02 /* DependencyFactory.swift */,
 				E53405AD1A3020CE00A474C1 /* Supporting Files */,
 			);
 			path = FieryCrucible;
@@ -67,6 +92,15 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
+		E55D501A1D84AD4700860E02 /* FieryCrucibleTests */ = {
+			isa = PBXGroup;
+			children = (
+				E55D50261D84AD9C00860E02 /* FieryCrucibleTests.swift */,
+				E55D501D1D84AD4700860E02 /* Info.plist */,
+			);
+			path = FieryCrucibleTests;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -99,20 +133,44 @@
 			productReference = E53405AA1A3020CE00A474C1 /* FieryCrucible.framework */;
 			productType = "com.apple.product-type.framework";
 		};
+		E55D50181D84AD4700860E02 /* FieryCrucibleTests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = E55D50231D84AD4700860E02 /* Build configuration list for PBXNativeTarget "FieryCrucibleTests" */;
+			buildPhases = (
+				E55D50151D84AD4700860E02 /* Sources */,
+				E55D50161D84AD4700860E02 /* Frameworks */,
+				E55D50171D84AD4700860E02 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				E55D50201D84AD4700860E02 /* PBXTargetDependency */,
+			);
+			name = FieryCrucibleTests;
+			productName = FieryCrucibleTests;
+			productReference = E55D50191D84AD4700860E02 /* FieryCrucibleTests.xctest */;
+			productType = "com.apple.product-type.bundle.unit-test";
+		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
 		E53405A11A3020CE00A474C1 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0700;
+				LastSwiftUpdateCheck = 0800;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = "Justin Kolb";
 				TargetAttributes = {
 					E53405A91A3020CE00A474C1 = {
 						CreatedOnToolsVersion = 6.1.1;
 						LastSwiftMigration = 0800;
 					};
+					E55D50181D84AD4700860E02 = {
+						CreatedOnToolsVersion = 8.0;
+						DevelopmentTeam = 3M27LW784R;
+						LastSwiftMigration = 0800;
+						ProvisioningStyle = Automatic;
+					};
 				};
 			};
 			buildConfigurationList = E53405A41A3020CE00A474C1 /* Build configuration list for PBXProject "FieryCrucible" */;
@@ -128,6 +186,7 @@
 			projectRoot = "";
 			targets = (
 				E53405A91A3020CE00A474C1 /* FieryCrucible */,
+				E55D50181D84AD4700860E02 /* FieryCrucibleTests */,
 			);
 		};
 /* End PBXProject section */
@@ -140,19 +199,42 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		E55D50171D84AD4700860E02 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
 		E53405A51A3020CE00A474C1 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E5A928C81A32C0B60071875D /* DependencyFactory.swift in Sources */,
+				E55D50251D84AD8800860E02 /* DependencyFactory.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		E55D50151D84AD4700860E02 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				E55D50271D84AD9C00860E02 /* FieryCrucibleTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 
+/* Begin PBXTargetDependency section */
+		E55D50201D84AD4700860E02 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = E53405A91A3020CE00A474C1 /* FieryCrucible */;
+			targetProxy = E55D501F1D84AD4700860E02 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
 /* Begin XCBuildConfiguration section */
 		E53405BE1A3020CF00A474C1 /* Debug */ = {
 			isa = XCBuildConfiguration;
@@ -167,8 +249,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -178,6 +262,7 @@
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -214,8 +299,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -224,6 +311,7 @@
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -244,6 +332,8 @@
 		E53405C11A3020CF00A474C1 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_MODULES = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -254,13 +344,16 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.franticapparatus.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
 		E53405C21A3020CF00A474C1 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_MODULES = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -275,6 +368,51 @@
 			};
 			name = Release;
 		};
+		E55D50211D84AD4700860E02 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_SUSPICIOUS_MOVES = YES;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEVELOPMENT_TEAM = 3M27LW784R;
+				GCC_NO_COMMON_BLOCKS = YES;
+				INFOPLIST_FILE = FieryCrucibleTests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = com.franticapparatus.FieryCrucibleTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
+			};
+			name = Debug;
+		};
+		E55D50221D84AD4700860E02 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_SUSPICIOUS_MOVES = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = 3M27LW784R;
+				GCC_NO_COMMON_BLOCKS = YES;
+				INFOPLIST_FILE = FieryCrucibleTests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = com.franticapparatus.FieryCrucibleTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
+			};
+			name = Release;
+		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
@@ -296,6 +434,14 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		E55D50231D84AD4700860E02 /* Build configuration list for PBXNativeTarget "FieryCrucibleTests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				E55D50211D84AD4700860E02 /* Debug */,
+				E55D50221D84AD4700860E02 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+		};
 /* End XCConfigurationList section */
 	};
 	rootObject = E53405A11A3020CE00A474C1 /* Project object */;

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 = "0700"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -28,7 +28,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "E53405B41A3020CF00A474C1"
+               BlueprintIdentifier = "E55D50181D84AD4700860E02"
                BuildableName = "FieryCrucibleTests.xctest"
                BlueprintName = "FieryCrucibleTests"
                ReferencedContainer = "container:FieryCrucible.xcodeproj">
@@ -42,6 +42,16 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "E55D50181D84AD4700860E02"
+               BuildableName = "FieryCrucibleTests.xctest"
+               BlueprintName = "FieryCrucibleTests"
+               ReferencedContainer = "container:FieryCrucible.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference

diff --git a/FieryCrucible/Info.plist b/FieryCrucible/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.2</string>
+	<string>2.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.2</string>
+	<string>2.0.0</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

diff --git a/FieryCrucibleTests/Info.plist b/FieryCrucibleTests/Info.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/Package.swift b/Package.swift
@@ -0,0 +1,5 @@
+import PackageDescription
+
+let package = Package(
+    name: "FieryCrucible"
+)