Merge pull request #213 from bustoutsolutions/swift-4

1.3.0 / Swift 4

.jazzy.yaml

@@ -11,7 +11,7 @@ exclude:
 
 copyright: '© 2016 [Bust Out Solutions](http://bustoutsolutions.com) under [open source license](https://github.com/bustoutsolutions/siesta/blob/master/LICENSE).'
 
-swift_version: 3.0.2
+swift_version: 4.0
 
 theme: fullwidth
 
@@ -48,6 +48,7 @@ custom_categories:
     - ResponseTransformer
     - ResponseContentTransformer
     - InputTypeMismatchAction
+    - StandardTransformer
     - JSONResponseTransformer(_:)
     - TextResponseTransformer(_:)
     - ImageResponseTransformer(_:)

.swift-version

@@ -1 +1 @@
-3.0
+4.0

.travis.yml

@@ -5,9 +5,10 @@ branches:
 
 language: objective-c
 os: osx
-osx_image: xcode8.3
+osx_image: xcode9
 env:
   - scheme='Siesta macOS' platform='OS X'
+  - scheme='Siesta iOS'   platform='iOS Simulator' ios_version='11.0'   ios_device='iPhone X'
   - scheme='Siesta iOS'   platform='iOS Simulator' ios_version='10.3.1' ios_device='iPhone SE'
   - scheme='Siesta iOS'   platform='iOS Simulator' ios_version='9.3'    ios_device='iPhone 6'
   - scheme='Siesta iOS'   platform='iOS Simulator' ios_version='8.1'    ios_device='iPhone 4s'
@@ -62,7 +63,7 @@ script: |
 
   # Optional pre-download, because builds are so slow on Travis, and Carthage builds _everything_:
   echo "Downloading prebuilt dependencies"
-  curl https://innig.net/tmp/siesta-deps-swift3.tar.bz2 | bzcat | tar xv
+  curl https://innig.net/tmp/siesta-deps-swift-4.tar.bz2 | bzcat | tar xv
 
   # Uncomment to build with Carthage instead:
   #echo "Building dependencies"

Cartfile.resolved

@@ -1,4 +1,4 @@
-github "Alamofire/Alamofire" "4.4.0"
-github "Quick/Nimble" "v6.1.0"
+github "Alamofire/Alamofire" "4.5.1"
+github "Quick/Nimble" "v7.0.1"
 github "pcantrell/Nocilla" "bd7ec7caa0576f08c00bbbf993a9204f93be16e3"
-github "pcantrell/Quick" "1c2c4056049e52d25fc48171ab62ab9d33821b47"
+github "pcantrell/Quick" "ea7d540048645e84748310854e10c19ad8a1b404"

Docs/security.md

@@ -72,7 +72,7 @@ A more drastic measure is to forcibly cut off all requests that attempt to reach
 ```swift
 service.configure(whenURLMatches: { $0.host != "api.example.com" }) {
   $0.decorateRequests {
-    _ in Resource.failedRequest(
+    _,_ in Resource.failedRequest(
       RequestError(
         userMessage: "Attempted to connect to unauthorized server",
         cause: UnauthorizedServer()))

Examples/GithubBrowser/GithubBrowser.xcodeproj/project.pbxproj

@@ -8,11 +8,12 @@
 
 /* Begin PBXBuildFile section */
 		713AB3CBE73243473E91C834 /* Pods_GithubBrowser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 18CDC2D94A6B11796E5F8136 /* Pods_GithubBrowser.framework */; };
-		DA1B80BD1DDADBA500E8404F /* Siesta+SwiftyJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA1B80BC1DDADBA500E8404F /* Siesta+SwiftyJSON.swift */; };
 		DA2B55621C7D6F8700EB4D67 /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA2B55611C7D6F8700EB4D67 /* User.swift */; };
 		DA2B55641C7D76B500EB4D67 /* Repository.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA2B55631C7D76B500EB4D67 /* Repository.swift */; };
 		DA2B55681C7ED14800EB4D67 /* SiestaTheme.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA2B55671C7ED14700EB4D67 /* SiestaTheme.swift */; };
 		DA2B556A1C7EDE7B00EB4D67 /* LoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA2B55691C7EDE7B00EB4D67 /* LoginViewController.swift */; };
+		DA4F17251F200E870038D78B /* SearchResults.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA4F17241F200E870038D78B /* SearchResults.swift */; };
+		DA6752571F6B8FCE009BE918 /* CommentaryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA6752561F6B8FCE009BE918 /* CommentaryViewController.swift */; };
 		DA7462421B4C768B00406D67 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DA7462401B4C768B00406D67 /* Main.storyboard */; };
 		DA7462441B4C768B00406D67 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DA7462431B4C768B00406D67 /* Assets.xcassets */; };
 		DA7462471B4C768B00406D67 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DA7462451B4C768B00406D67 /* LaunchScreen.storyboard */; };
@@ -28,11 +29,12 @@
 		18CDC2D94A6B11796E5F8136 /* Pods_GithubBrowser.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GithubBrowser.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		A30D9B88A43E86FECB6FED59 /* Pods-GithubBrowser.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GithubBrowser.release.xcconfig"; path = "Pods/Target Support Files/Pods-GithubBrowser/Pods-GithubBrowser.release.xcconfig"; sourceTree = "<group>"; };
 		CC0AB1A69A9C04B0879CFD4C /* Pods-GithubBrowser.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GithubBrowser.debug.xcconfig"; path = "Pods/Target Support Files/Pods-GithubBrowser/Pods-GithubBrowser.debug.xcconfig"; sourceTree = "<group>"; };
-		DA1B80BC1DDADBA500E8404F /* Siesta+SwiftyJSON.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Siesta+SwiftyJSON.swift"; sourceTree = "<group>"; };
 		DA2B55611C7D6F8700EB4D67 /* User.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
 		DA2B55631C7D76B500EB4D67 /* Repository.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Repository.swift; sourceTree = "<group>"; };
 		DA2B55671C7ED14700EB4D67 /* SiestaTheme.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SiestaTheme.swift; sourceTree = "<group>"; };
 		DA2B55691C7EDE7B00EB4D67 /* LoginViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoginViewController.swift; sourceTree = "<group>"; };
+		DA4F17241F200E870038D78B /* SearchResults.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchResults.swift; sourceTree = "<group>"; };
+		DA6752561F6B8FCE009BE918 /* CommentaryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommentaryViewController.swift; sourceTree = "<group>"; };
 		DA7462391B4C768B00406D67 /* GithubBrowser.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GithubBrowser.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		DA7462411B4C768B00406D67 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		DA7462431B4C768B00406D67 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -80,6 +82,7 @@
 			children = (
 				DA2B55611C7D6F8700EB4D67 /* User.swift */,
 				DA2B55631C7D76B500EB4D67 /* Repository.swift */,
+				DA4F17241F200E870038D78B /* SearchResults.swift */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -137,7 +140,6 @@
 			isa = PBXGroup;
 			children = (
 				DAE2F8441B94F10500D2AD96 /* GitHubAPI.swift */,
-				DA1B80BC1DDADBA500E8404F /* Siesta+SwiftyJSON.swift */,
 			);
 			path = API;
 			sourceTree = "<group>";
@@ -151,6 +153,7 @@
 				DA2B55691C7EDE7B00EB4D67 /* LoginViewController.swift */,
 				DAE2F8471B94F10500D2AD96 /* AppDelegate.swift */,
 				DA2B55671C7ED14700EB4D67 /* SiestaTheme.swift */,
+				DA6752561F6B8FCE009BE918 /* CommentaryViewController.swift */,
 			);
 			path = UI;
 			sourceTree = "<group>";
@@ -184,12 +187,12 @@
 		DA7462311B4C768B00406D67 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = "Bust Out Solutions";
 				TargetAttributes = {
 					DA7462381B4C768B00406D67 = {
 						CreatedOnToolsVersion = 7.0;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0900;
 					};
 				};
 			};
@@ -251,12 +254,10 @@
 			inputPaths = (
 				"${SRCROOT}/Pods/Target Support Files/Pods-GithubBrowser/Pods-GithubBrowser-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/Siesta/Siesta.framework",
-				"${BUILT_PRODUCTS_DIR}/SwiftyJSON/SwiftyJSON.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Siesta.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyJSON.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -285,17 +286,18 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				DA4F17251F200E870038D78B /* SearchResults.swift in Sources */,
 				DA2B55641C7D76B500EB4D67 /* Repository.swift in Sources */,
 				DAE2F84D1B94F10500D2AD96 /* RepositoryListViewController.swift in Sources */,
 				DA2B55681C7ED14800EB4D67 /* SiestaTheme.swift in Sources */,
 				DAE2F84E1B94F10500D2AD96 /* UserViewController.swift in Sources */,
 				DAAC4E461D3AAD1B00FB3CE2 /* RepositoryViewController.swift in Sources */,
 				DA2B556A1C7EDE7B00EB4D67 /* LoginViewController.swift in Sources */,
-				DA1B80BD1DDADBA500E8404F /* Siesta+SwiftyJSON.swift in Sources */,
 				DA2B55621C7D6F8700EB4D67 /* User.swift in Sources */,
 				DAE2F84C1B94F10500D2AD96 /* AppDelegate.swift in Sources */,
 				DAE2F84A1B94F10500D2AD96 /* GitHubAPI.swift in Sources */,
 				DAE27A801D3F1EF400D757F9 /* Optional+GithubBrowser.swift in Sources */,
+				DA6752571F6B8FCE009BE918 /* CommentaryViewController.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -329,14 +331,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				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_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -365,6 +373,7 @@
 				OTHER_SWIFT_FLAGS = "-D DEBUG";
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 			};
 			name = Debug;
 		};
@@ -376,14 +385,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				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_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -405,6 +420,7 @@
 				OTHER_SWIFT_FLAGS = "-D DEBUG";
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -418,7 +434,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.bustoutsolutions.GithubBrowser;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -431,7 +447,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.bustoutsolutions.GithubBrowser;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

Examples/GithubBrowser/Podfile

@@ -4,5 +4,4 @@ target 'GithubBrowser' do
   use_frameworks!
 
   pod 'Siesta/UI', path: '../..'
-  pod 'SwiftyJSON'
 end

Examples/GithubBrowser/Podfile.lock

@@ -1,21 +1,18 @@
 PODS:
-  - Siesta/Core (1.2.1)
-  - Siesta/UI (1.2.1):
+  - Siesta/Core (1.3.0)
+  - Siesta/UI (1.3.0):
     - Siesta/Core
-  - SwiftyJSON (3.1.4)
 
 DEPENDENCIES:
   - Siesta/UI (from `../..`)
-  - SwiftyJSON
 
 EXTERNAL SOURCES:
   Siesta:
     :path: ../..
 
 SPEC CHECKSUMS:
-  Siesta: f47c4e6016bc2c249c46f2a70167ff0835dfefe1
-  SwiftyJSON: c2842d878f95482ffceec5709abc3d05680c0220
+  Siesta: 02ebadcf2be602c0a81545533e9fedda2356f51b
 
-PODFILE CHECKSUM: 185541f66e3c53d1269ded59a72f9c99e6a2d105
+PODFILE CHECKSUM: ae415ad9ad375272eab63ab45853da2148a7aa21
 
 COCOAPODS: 1.3.1