devlucky · piercifani · Sep 16, 2016 · Sep 16, 2016 · Sep 16, 2016 · Sep 16, 2016
diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,6 @@ env:
     - FASTLANE_LANE=ci_commit
 
 before_install:
-  - gem uninstall json -v 2.0.1 # workaround for Fastlane conflict https://github.com/travis-ci/travis-ci/issues/6325
   - gem update fastlane
   - gem install danger --no-ri --no-doc
   - gem install danger-swiftlint --no-ri --no-doc
@@ -18,14 +17,14 @@ before_script:
 
 matrix:
   include:
-    - osx_image: xcode7.3
-      env: FASTLANE_ENV=ios83
-    - osx_image: xcode7.3
+    - osx_image: xcode8.0
+      env: FASTLANE_ENV=ios100
+    - osx_image: xcode8.0
       env: FASTLANE_ENV=tvos
-    - osx_image: xcode7.3
-      env: FASTLANE_ENV=osx1011
-    - osx_image: xcode7.3
-      env: FASTLANE_ENV=ios93 KKP_CODECOV=true
+    - osx_image: xcode8.0
+      env: FASTLANE_ENV=osx1012
+    - osx_image: xcode8.0
+      env: FASTLANE_ENV=ios100 KKP_CODECOV=true
       after_success:
         - bash <(curl -s https://codecov.io/bash) -J 'Kakapo'
 

diff --git a/Kakapo.podspec b/Kakapo.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "Kakapo"
-  s.version          = "0.1.0"
+  s.version          = "0.1.1"
   s.summary          = "Dynamically Mock server behaviors and responses."
 
   s.description      = <<-DESC 

diff --git a/Kakapo.xcodeproj/project.pbxproj b/Kakapo.xcodeproj/project.pbxproj
@@ -517,7 +517,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0730;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = devlucky;
 				TargetAttributes = {
 					DE76E1281D0DC5FA009721A4 = {
@@ -537,9 +537,11 @@
 					};
 					DE76E16E1D0DC671009721A4 = {
 						CreatedOnToolsVersion = 7.3;
+						LastSwiftMigration = 0800;
 					};
 					DE76E1771D0DC672009721A4 = {
 						CreatedOnToolsVersion = 7.3;
+						LastSwiftMigration = 0800;
 					};
 				};
 			};
@@ -976,8 +978,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";
@@ -1022,8 +1026,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";
@@ -1042,6 +1048,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -1052,6 +1059,7 @@
 			buildSettings = {
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1077,6 +1085,7 @@
 			buildSettings = {
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1100,6 +1109,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1124,6 +1134,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1147,6 +1158,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 822EBBB73B6B4117D229CDF1 /* Pods-Kakapo tvOSTests.debug.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				INFOPLIST_FILE = Tests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.devlucky.Kakapo-tvOSTests";
@@ -1160,6 +1172,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = E357918ACA29146B64834E63 /* Pods-Kakapo tvOSTests.release.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				INFOPLIST_FILE = Tests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.devlucky.Kakapo-tvOSTests";
@@ -1173,7 +1186,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "-";
+				CODE_SIGN_IDENTITY = "";
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
@@ -1199,7 +1212,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "-";
+				CODE_SIGN_IDENTITY = "";
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
@@ -1224,6 +1237,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = C9E9EAD776E83C0F5785A0DB /* Pods-Kakapo macOSTests.debug.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
 				INFOPLIST_FILE = Tests/Info.plist;
@@ -1239,6 +1253,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = EC9701EC992A6D8D7A349FE0 /* Pods-Kakapo macOSTests.release.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
 				INFOPLIST_FILE = Tests/Info.plist;
@@ -1254,6 +1269,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1267,6 +1283,7 @@
 				PRODUCT_NAME = Kakapo;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 2.3;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -1276,6 +1293,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1288,6 +1306,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.devlucky.Kakapo-iOS";
 				PRODUCT_NAME = Kakapo;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 2.3;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -1297,23 +1316,27 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = DFC29110721D31BE30199824 /* Pods-Kakapo iOSTests.debug.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				INFOPLIST_FILE = Tests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.devlucky.Kakapo-iOSTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 2.3;
 			};
 			name = Debug;
 		};
 		DE76E1851D0DC672009721A4 /* Release */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = EC34C9368B0957EEB74A515E /* Pods-Kakapo iOSTests.release.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				INFOPLIST_FILE = Tests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.devlucky.Kakapo-iOSTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 2.3;
 			};
 			name = Release;
 		};

diff --git a/Kakapo.xcodeproj/xcshareddata/xcschemes/Kakapo iOS.xcscheme b/Kakapo.xcodeproj/xcshareddata/xcschemes/Kakapo iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Kakapo.xcodeproj/xcshareddata/xcschemes/Kakapo macOS.xcscheme b/Kakapo.xcodeproj/xcshareddata/xcschemes/Kakapo macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Kakapo.xcodeproj/xcshareddata/xcschemes/Kakapo tvOS.xcscheme b/Kakapo.xcodeproj/xcshareddata/xcschemes/Kakapo tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Kakapo.xcodeproj/xcshareddata/xcschemes/Kakapo watchOS.xcscheme b/Kakapo.xcodeproj/xcshareddata/xcschemes/Kakapo watchOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Podfile b/Podfile
@@ -3,8 +3,8 @@ use_frameworks!
 def testing_pods
     pod 'Quick', '~> 0.9'
     pod 'Nimble', '~> 4.0'
-    pod 'SwiftyJSON', '~> 2.3'
-    pod 'Alamofire'
+    pod 'SwiftyJSON', :git => 'https://github.com/TheSufferfest/SwiftyJSON.git', :branch => 'master'
+    pod 'Alamofire', '~> 3.5.0'
     pod 'AFNetworking'
 end
 
@@ -22,3 +22,11 @@ target 'Kakapo macOSTests' do
 	platform :osx, '10.11'
     testing_pods
 end
+
+post_install do |installer|
+    installer.pods_project.targets.each do |target|
+        target.build_configurations.each do |configuration|
+            configuration.build_settings['SWIFT_VERSION'] = "2.3"
+        end
+    end
+end
diff --git a/Podfile.lock b/Podfile.lock
@@ -14,25 +14,35 @@ PODS:
   - AFNetworking/Serialization (3.1.0)
   - AFNetworking/UIKit (3.1.0):
     - AFNetworking/NSURLSession
-  - Alamofire (3.4.1)
+  - Alamofire (3.5.0)
   - Nimble (4.1.0)
   - Quick (0.9.2)
   - SwiftyJSON (2.3.2)
 
 DEPENDENCIES:
   - AFNetworking
-  - Alamofire
+  - Alamofire (~> 3.5.0)
   - Nimble (~> 4.0)
   - Quick (~> 0.9)
-  - SwiftyJSON (~> 2.3)
+  - SwiftyJSON (from `https://github.com/TheSufferfest/SwiftyJSON.git`, branch `master`)
+
+EXTERNAL SOURCES:
+  SwiftyJSON:
+    :branch: master
+    :git: https://github.com/TheSufferfest/SwiftyJSON.git
+
+CHECKOUT OPTIONS:
+  SwiftyJSON:
+    :commit: 213aa0e6f7322f395b22163e2dd6f15e4c05f06d
+    :git: https://github.com/TheSufferfest/SwiftyJSON.git
 
 SPEC CHECKSUMS:
   AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
-  Alamofire: 01a82e2f6c0f860ade35534c8dd88be61bdef40c
+  Alamofire: b70a7352335f8ea5babd0a923eb7e8eacc67b877
   Nimble: 97a0a4cae5124c117115634b2d055d8c97d0af19
   Quick: 18d057bc66451eedd5d1c8dc99ba2a5db6e60226
   SwiftyJSON: 04ccea08915aa0109039157c7974cf0298da292a
 
-PODFILE CHECKSUM: 4bdc2bbe30c600044533e77410c93b5eca78320c
+PODFILE CHECKSUM: 6f41f3711013efae99900027141f77b3d87f56cd
 
 COCOAPODS: 1.0.1
diff --git a/Pods/Alamofire/README.md b/Pods/Alamofire/README.md