Merge pull request #19 from hsoi/hsoi-swift22

Xcode 7.3 and Swift 2.2 support

Author: jlandon

.travis.yml

@@ -1,4 +1,4 @@
 language: objective-c
-osx_image: xcode7.2
+osx_image: xcode7.3
 script:
     - xcodebuild -project ModelRocket.xcodeproj -scheme ModelRocket -destination "platform=iOS Simulator,name=iPhone 6" test

ModelRocket.xcodeproj/project.pbxproj

@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		8105B6DA1C4F319C0038F86D /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8105B6D11C4F319C0038F86D /* Info.plist */; };
 		8105B6DB1C4F319C0038F86D /* JSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8105B6D21C4F319C0038F86D /* JSON.swift */; };
 		8105B6DC1C4F319C0038F86D /* JSONTransformable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8105B6D31C4F319C0038F86D /* JSONTransformable.swift */; };
 		8105B6DD1C4F319C0038F86D /* Model.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8105B6D41C4F319C0038F86D /* Model.swift */; };
@@ -180,7 +179,7 @@
 			attributes = {
 				LastSwiftMigration = 0700;
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0700;
+				LastUpgradeCheck = 0730;
 				ORGANIZATIONNAME = "Oven Bits";
 				TargetAttributes = {
 					8143C8E01A82BA480077DE22 = {
@@ -215,7 +214,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				8105B6DA1C4F319C0038F86D /* Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -394,10 +392,6 @@
 		8143C8FB1A82BA480077DE22 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(inherited)",
-				);
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -412,10 +406,6 @@
 		8143C8FC1A82BA480077DE22 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(inherited)",
-				);
 				INFOPLIST_FILE = ModelRocketTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.ovenbits.$(PRODUCT_NAME:rfc1034identifier)";

ModelRocket.xcodeproj/xcshareddata/xcschemes/ModelRocket.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0730"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

README.md

@@ -10,9 +10,9 @@ An iOS framework for creating JSON-based models. Written in Swift (because [it t
 
 ## Requirements
 
-- iOS 7.0+
-- Xcode 7
-- Swift 2
+- iOS 8.0+
+- Xcode 7.3
+- Swift 2.2
 
 ## Installation
 

Sources/JSONTransformable.swift

@@ -27,7 +27,7 @@ import UIKit
 #endif
 
 public protocol JSONTransformable {
-    typealias T
+    associatedtype T
 
     /// Extract object from JSON
     static func fromJSON(json: JSON) -> T?