Merge branch 'release/2.1'

NextFaze · Oct 10, 2019 · c116f4a · c116f4a
2 parents 211cee7 + ab476e1
commit c116f4a
Show file tree

Hide file tree

Showing 55 changed files with 8,273 additions and 641 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,6 +20,7 @@ xcuserdata/
 ## Other
 *.moved-aside
 *.xcuserstate
+.DS_Store
 
 ## Obj-C/Swift specific
 *.hmap

diff --git a/.swift-version b/.swift-version
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@
 # * https://github.com/supermarin/xcpretty#usage
 
 language: objective-c # still specify this even though we are using swift - appears to tell travis which Xcode version to use
-osx_image: xcode9.1
+osx_image: xcode10.3
 #cache: cocoapods
 podfile: Example/Podfile
 before_install:

diff --git a/Example/FazeKit.xcodeproj/project.pbxproj b/Example/FazeKit.xcodeproj/project.pbxproj
@@ -19,6 +19,9 @@
 		C2B9A0321DD29F9100AF4E04 /* DateAdditionsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2B9A0301DD2941C00AF4E04 /* DateAdditionsTests.swift */; };
 		C2B9A0381DD2DAE500AF4E04 /* CollectionAdditionsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2B9A0361DD2DAB500AF4E04 /* CollectionAdditionsTests.swift */; };
 		C2E94BAE1D62CDD5007A7A4C /* ProcessInfoAdditionsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2E94BAD1D62CDD5007A7A4C /* ProcessInfoAdditionsTests.swift */; };
+		C2FE1897234EBEDD007027FB /* DisposableTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2FE1896234EBEDD007027FB /* DisposableTests.swift */; };
+		C2FE189C234FE303007027FB /* AnyAdditionsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2FE189A234FE2CB007027FB /* AnyAdditionsTests.swift */; };
+		C2FE189F234FE558007027FB /* CodableAdditionsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2FE189D234FE51F007027FB /* CodableAdditionsTests.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -52,6 +55,9 @@
 		C2B9A0301DD2941C00AF4E04 /* DateAdditionsTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DateAdditionsTests.swift; sourceTree = "<group>"; };
 		C2B9A0361DD2DAB500AF4E04 /* CollectionAdditionsTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CollectionAdditionsTests.swift; sourceTree = "<group>"; };
 		C2E94BAD1D62CDD5007A7A4C /* ProcessInfoAdditionsTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProcessInfoAdditionsTests.swift; sourceTree = "<group>"; };
+		C2FE1896234EBEDD007027FB /* DisposableTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DisposableTests.swift; sourceTree = "<group>"; };
+		C2FE189A234FE2CB007027FB /* AnyAdditionsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnyAdditionsTests.swift; sourceTree = "<group>"; };
+		C2FE189D234FE51F007027FB /* CodableAdditionsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodableAdditionsTests.swift; sourceTree = "<group>"; };
 		C5F04A4E1B4661BFB20EEE1D /* Pods_FazeKit_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FazeKit_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		E2A7D960882894C1CF4EB4D0 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
 		FAD6E5E790BC646CAF8A952D /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
@@ -131,8 +137,11 @@
 		607FACE81AFB9204008FA782 /* Tests */ = {
 			isa = PBXGroup;
 			children = (
+				C2FE189A234FE2CB007027FB /* AnyAdditionsTests.swift */,
+				C2FE189D234FE51F007027FB /* CodableAdditionsTests.swift */,
 				C2B9A0361DD2DAB500AF4E04 /* CollectionAdditionsTests.swift */,
 				C2B9A0301DD2941C00AF4E04 /* DateAdditionsTests.swift */,
+				C2FE1896234EBEDD007027FB /* DisposableTests.swift */,
 				C20FAFE01DD42E7D009E5C3F /* MulticastTests.swift */,
 				C2E94BAD1D62CDD5007A7A4C /* ProcessInfoAdditionsTests.swift */,
 				7CDA2BC91FE872FE00CBA532 /* StringAdditionsTests.swift */,
@@ -182,8 +191,7 @@
 				607FACCC1AFB9204008FA782 /* Sources */,
 				607FACCD1AFB9204008FA782 /* Frameworks */,
 				607FACCE1AFB9204008FA782 /* Resources */,
-				49D409882B8D935E07C3CCC4 /* [CP] Embed Pods Frameworks */,
-				FF71D563070DA01636A3EC01 /* [CP] Copy Pods Resources */,
+				830A05DE10DC69D5C28B56E5 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -202,8 +210,7 @@
 				607FACE11AFB9204008FA782 /* Sources */,
 				607FACE21AFB9204008FA782 /* Frameworks */,
 				607FACE31AFB9204008FA782 /* Resources */,
-				FA1F98F171BBB36483C55CE0 /* [CP] Embed Pods Frameworks */,
-				FF1A9E7E9CFB4BE43A1EC3BD /* [CP] Copy Pods Resources */,
+				B8647D25B6CD077EB79366A7 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -243,6 +250,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -283,28 +291,16 @@
 			files = (
 			);
 			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-FazeKit_Example-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
-			showEnvVarsInLog = 0;
-		};
-		49D409882B8D935E07C3CCC4 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FazeKit_Example/Pods-FazeKit_Example-frameworks.sh\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 		622A6E81CCDC59501C088EB6 /* [CP] Check Pods Manifest.lock */ = {
@@ -313,58 +309,52 @@
 			files = (
 			);
 			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-FazeKit_Tests-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		FA1F98F171BBB36483C55CE0 /* [CP] Embed Pods Frameworks */ = {
+		830A05DE10DC69D5C28B56E5 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-FazeKit_Example/Pods-FazeKit_Example-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/FazeKit/FazeKit.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FazeKit.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FazeKit_Tests/Pods-FazeKit_Tests-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FazeKit_Example/Pods-FazeKit_Example-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		FF1A9E7E9CFB4BE43A1EC3BD /* [CP] Copy Pods Resources */ = {
+		B8647D25B6CD077EB79366A7 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-FazeKit_Tests/Pods-FazeKit_Tests-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/FazeKit/FazeKit.framework",
 			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FazeKit_Tests/Pods-FazeKit_Tests-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		FF71D563070DA01636A3EC01 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
+			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FazeKit.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FazeKit_Example/Pods-FazeKit_Example-resources.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FazeKit_Tests/Pods-FazeKit_Tests-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -385,8 +375,11 @@
 			files = (
 				C2E94BAE1D62CDD5007A7A4C /* ProcessInfoAdditionsTests.swift in Sources */,
 				607FACEC1AFB9204008FA782 /* UIViewAdditionsTests.swift in Sources */,
+				C2FE1897234EBEDD007027FB /* DisposableTests.swift in Sources */,
 				C2B9A0321DD29F9100AF4E04 /* DateAdditionsTests.swift in Sources */,
+				C2FE189C234FE303007027FB /* AnyAdditionsTests.swift in Sources */,
 				C20FAFE21DD42EAA009E5C3F /* MulticastTests.swift in Sources */,
+				C2FE189F234FE558007027FB /* CodableAdditionsTests.swift in Sources */,
 				7CDA2BCA1FE872FE00CBA532 /* StringAdditionsTests.swift in Sources */,
 				C2B9A0381DD2DAE500AF4E04 /* CollectionAdditionsTests.swift in Sources */,
 			);
@@ -508,7 +501,7 @@
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.nextfaze.FazeKit-Example";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -524,7 +517,7 @@
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.nextfaze.FazeKit-Example";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -545,7 +538,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -562,7 +555,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

diff --git a/Example/FazeKit.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Example/FazeKit.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?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>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Example/FazeKit/MenuViewController.swift b/Example/FazeKit/MenuViewController.swift
@@ -42,7 +42,7 @@ class MenuViewController: UIViewController, UITableViewDataSource, UITableViewDe
         self.navigationController?.navigationBar.isOpaque = true
         self.navigationController?.navigationBar.barTintColor = UIColor(hexString: "#ee4136")
         self.navigationController?.navigationBar.tintColor = UIColor.white
-        self.navigationController?.navigationBar.titleTextAttributes = [NSForegroundColorAttributeName: UIColor.white]
+        self.navigationController?.navigationBar.titleTextAttributes = [.foregroundColor: UIColor.white]
 
         self.tableView.dataSource = self
         self.tableView.delegate = self

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - FazeKit (1.0.0)
+  - FazeKit (2.0)
 
 DEPENDENCIES:
   - FazeKit (from `../`)
@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  FazeKit: c05d214c9a6e52c4de760e31706cc034004bb64e
+  FazeKit: 64b216cf1d7b419e0fb279ccea9357198ef5df70
 
 PODFILE CHECKSUM: fa12f807dae8d93a6a5a1166a5439a23410201c1
 
-COCOAPODS: 1.1.1
+COCOAPODS: 1.8.0
diff --git a/Example/Pods/Local Podspecs/FazeKit.podspec.json b/Example/Pods/Local Podspecs/FazeKit.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock