Updated swift version to 4.0 && Updated SwiftyJson to 4.0

Xinguang Wang · Xinguang Wang · commit e37dc85ff932 · 2018-01-16T10:16:15.000+09:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: objective-c
 xcode_project: AlamofireSwiftyJSON.xcodeproj
-osx_image: xcode8.3
-xcode_sdk: iphonesimulator10.0
+osx_image: xcode9.2
+xcode_sdk: iphonesimulator11.0
 xcode_scheme: AlamofireSwiftyJSON
 
 env:
diff --git a/AlamofireSwiftyJSON.xcodeproj/project.pbxproj b/AlamofireSwiftyJSON.xcodeproj/project.pbxproj
@@ -706,6 +706,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -756,6 +757,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -780,7 +782,6 @@
 				PRODUCT_NAME = AlamofireSwiftyJSON;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -800,7 +801,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.kansea.AlamofireSwiftyJSON;
 				PRODUCT_NAME = AlamofireSwiftyJSON;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -812,7 +812,6 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.kansea.AlamofireSwiftyJSONTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -824,7 +823,6 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.kansea.AlamofireSwiftyJSONTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
@@ -847,7 +845,6 @@
 				PRODUCT_NAME = AlamofireSwiftyJSON;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -870,7 +867,6 @@
 				PRODUCT_NAME = AlamofireSwiftyJSON;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
@@ -887,7 +883,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.kansea.AlamofireSwiftyJSON-OSX-Tests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
-				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -904,7 +899,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.kansea.AlamofireSwiftyJSON-OSX-Tests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
-				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
@@ -926,7 +920,6 @@
 				PRODUCT_NAME = AlamofireSwiftyJSON;
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = 4;
 				WATCHOS_DEPLOYMENT_TARGET = 2.2;
 			};
@@ -950,7 +943,6 @@
 				PRODUCT_NAME = AlamofireSwiftyJSON;
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = 4;
 				WATCHOS_DEPLOYMENT_TARGET = 2.2;
 			};
@@ -973,7 +965,6 @@
 				PRODUCT_NAME = AlamofireSwiftyJSON;
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -996,7 +987,6 @@
 				PRODUCT_NAME = AlamofireSwiftyJSON;
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -1012,7 +1002,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.kansea.AlamofireSwiftyJSON-tvOS-Tests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
-				SWIFT_VERSION = 3.0;
 				TVOS_DEPLOYMENT_TARGET = 9.2;
 			};
 			name = Debug;
@@ -1027,7 +1016,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.kansea.AlamofireSwiftyJSON-tvOS-Tests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
-				SWIFT_VERSION = 3.0;
 				TVOS_DEPLOYMENT_TARGET = 9.2;
 			};
 			name = Release;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,14 +3,16 @@ All notable changes to this project will be documented in this file.
 `AlamofireSwiftyJSON` adheres to [Semantic Versioning](http://semver.org/).
 
 #### 1.x Releases
-- `1.0.x` Releases - [1.0.0](#100)
+- `1.0.x` Releases - [1.0.0](#100) | [1.0.1](#101)
 - `0.2.x` Releases - [0.2.0](#020)
 - `0.1.x` Releases - [0.1.0](#010) | [0.1.1](#011)
 
 ---
 
 ## [1.0.0](https://github.com/Xinguang/AlamofireSwiftyJSON/releases/tag/1.0.0)
 Released on June 30, 2017.
+## [1.0.1](https://github.com/Xinguang/AlamofireSwiftyJSON/releases/tag/1.0.1)
+Released on Jan 16, 2018.
 
 #### Added
 - Supports SPM
diff --git a/Package.Swift b/Package.Swift
@@ -3,7 +3,7 @@ let package = Package(
   name: "AlamofireSwiftyJSON",
   dependencies: [
       .Package(url: "https://github.com/Alamofire/Alamofire.git", majorVersion: 4),
-      .Package(url: "https://github.com/SwiftyJSON/SwiftyJSON.git", majorVersion: 3)
+      .Package(url: "https://github.com/SwiftyJSON/SwiftyJSON.git", majorVersion: 4)
   ],
   exclude: ["Tests"]
 )
diff --git a/Source/Info-OSX.plist b/Source/Info-OSX.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.0</string>
+	<string>1.0.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/Source/Info-iOS.plist b/Source/Info-iOS.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.0</string>
+	<string>1.0.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/Source/Info-tvOS.plist b/Source/Info-tvOS.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.0</string>
+	<string>1.0.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/Source/Info-watchOS.plist b/Source/Info-watchOS.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.0</string>
+	<string>1.0.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ let package = Package(`
`3`	`3`	`name: "AlamofireSwiftyJSON",`
`4`	`4`	`dependencies: [`
`5`	`5`	`.Package(url: "https://github.com/Alamofire/Alamofire.git", majorVersion: 4),`
`6`		`- .Package(url: "https://github.com/SwiftyJSON/SwiftyJSON.git", majorVersion: 3)`
	`6`	`+ .Package(url: "https://github.com/SwiftyJSON/SwiftyJSON.git", majorVersion: 4)`
`7`	`7`	`],`
`8`	`8`	`exclude: ["Tests"]`
`9`	`9`	`)`