Merge pull request #147 from ishkawa/feature/xcode73

Xcode 7.3 and Swift 2.2 support for 1.x
ishkawa · Mar 27, 2016 · 5d28976 · 5d28976
2 parents df2b922 + 4ff0ffe
commit 5d28976
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode7.2
+osx_image: xcode7.3
 
 env:
   global:

diff --git a/APIKit.podspec b/APIKit.podspec
@@ -33,5 +33,5 @@ Pod::Spec.new do |s|
     LICENSE
   }
 
-  s.dependency "Result", "~> 1.0.1"
+  s.dependency "Result", "~> 2.0.0"
 end
diff --git a/APIKit.xcodeproj/project.pbxproj b/APIKit.xcodeproj/project.pbxproj
@@ -27,6 +27,16 @@
 		7F7E8F1D1C8AD4B1008A13A9 /* URLEncodedSerialization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F7E8F131C8AD4B1008A13A9 /* URLEncodedSerialization.swift */; };
 /* End PBXBuildFile section */
 
+/* Begin PBXContainerItemProxy section */
+		7F4A73AC1CA839AE002554B1 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 7F45FCD41A94D02C006863BB /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 141F12161C1C9ABE0026D415;
+			remoteInfo = APIKit;
+		};
+/* End PBXContainerItemProxy section */
+
 /* Begin PBXCopyFilesBuildPhase section */
 		141F12351C1C9AC70026D415 /* Copy Frameworks */ = {
 			isa = PBXCopyFilesBuildPhase;
@@ -222,6 +232,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				7F4A73AD1CA839AE002554B1 /* PBXTargetDependency */,
 			);
 			name = Tests;
 			productName = APIKitTests;
@@ -235,7 +246,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0700;
+				LastUpgradeCheck = 0730;
 				ORGANIZATIONNAME = "Yosuke Ishikawa";
 			};
 			buildConfigurationList = 7F45FCD71A94D02C006863BB /* Build configuration list for PBXProject "APIKit" */;
@@ -303,6 +314,14 @@
 		};
 /* End PBXSourcesBuildPhase section */
 
+/* Begin PBXTargetDependency section */
+		7F4A73AD1CA839AE002554B1 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 141F12161C1C9ABE0026D415 /* APIKit */;
+			targetProxy = 7F4A73AC1CA839AE002554B1 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
 /* Begin XCBuildConfiguration section */
 		141F12241C1C9ABE0026D415 /* Debug */ = {
 			isa = XCBuildConfiguration;
@@ -336,6 +355,8 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 141F12101C1C96820026D415 /* Debug.xcconfig */;
 			buildSettings = {
+				ENABLE_TESTABILITY = YES;
+				ONLY_ACTIVE_ARCH = YES;
 			};
 			name = Debug;
 		};

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

diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "antitypical/Result" ~> 1.0.1
+github "antitypical/Result" ~> 2.0.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,2 +1,2 @@
 github "AliSoftware/OHHTTPStubs" "4.6.0"
-github "antitypical/Result" "1.0.1"
+github "antitypical/Result" "2.0.0"
diff --git a/Carthage/Checkouts/Result b/Carthage/Checkouts/Result
diff --git a/Sources/RequestType.swift b/Sources/RequestType.swift
@@ -10,7 +10,7 @@ import Result
 /// - func responseFromObject(object: AnyObject, URLResponse: NSHTTPURLResponse) -> Response?
 public protocol RequestType {
     /// Type represents a model object
-    typealias Response
+    associatedtype Response
 
     /// Configurations of request
     var baseURL: NSURL { get }

diff --git a/Sources/URLEncodedSerialization.swift b/Sources/URLEncodedSerialization.swift
@@ -25,7 +25,7 @@ private func escape(string: String) -> String {
     while index != string.endIndex {
         let startIndex = index
         let endIndex = index.advancedBy(batchSize, limit: string.endIndex)
-        let range = Range(start: startIndex, end: endIndex)
+        let range = startIndex..<endIndex
 
         let substring = string.substringWithRange(range)
 

diff --git a/Tests/APIKit/RequestTypeTests.swift b/Tests/APIKit/RequestTypeTests.swift
@@ -513,7 +513,7 @@ class RequestTypeTests: XCTestCase {
         switch request.buildURLRequest() {
         case .Success(let urlReq):
             XCTAssert(urlReq.HTTPBody != nil)
-             let json = try! NSJSONSerialization.JSONObjectWithData(urlReq.HTTPBody!, options: NSJSONReadingOptions.AllowFragments)
+            let json = try! NSJSONSerialization.JSONObjectWithData(urlReq.HTTPBody!, options: NSJSONReadingOptions.AllowFragments) as! [AnyObject]
             XCTAssert(json.count == 3)
             XCTAssert(json[0]["id"]! == "1")
             XCTAssert(json[1]["id"]! == "2")
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,5 +33,5 @@ Pod::Spec.new do |s| @@
         LICENSE
       }
-      s.dependency "Result", "~> 1.0.1"
+      s.dependency "Result", "~> 2.0.0"
     end
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		github "antitypical/Result" ~> 1.0.1
		github "antitypical/Result" ~> 2.0.0
+1 −0		.gitignore
+28 −10		.travis.yml
+10 −0		Package.swift
+69 −2		README.md
+1 −1		Result.podspec
+10 −9		Result.xcodeproj/project.pbxproj
+1 −1		Result/Info.plist
+39 −12		Result/Result.swift
+12 −6		Result/ResultType.swift
+7 −0		Tests/LinuxMain.swift
+0 −0		Tests/Result/Info.plist
+74 −17		Tests/Result/ResultTests.swift