Migrates to swift 4.2 & Xcode 10 (v4.2.0)

freshOS · Sep 18, 2018 · 8aa14d8 · 8aa14d8
1 parent 02a9d84
commit 8aa14d8
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 12 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.0
+4.2
diff --git a/Arrow.framework.zip b/Arrow.framework.zip
diff --git a/Arrow.podspec b/Arrow.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'Arrow'
-  s.version          = "4.1.0"
+  s.version          = "4.2.0"
   s.summary          = "Elegant JSON Parsing in Swift"
   s.homepage         = "https://github.com/freshOS/Arrow"
   s.license          = { :type => "MIT", :file => "LICENSE" }

diff --git a/Arrow.xcodeproj/project.pbxproj b/Arrow.xcodeproj/project.pbxproj
@@ -322,15 +322,15 @@
 /* Begin PBXShellScriptBuildPhase section */
 		99709F361D310F74002A92D5 /* Run swiftlint */ = {
 			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 8;
+			buildActionMask = 12;
 			files = (
 			);
 			inputPaths = (
 			);
 			name = "Run swiftlint";
 			outputPaths = (
 			);
-			runOnlyForDeploymentPostprocessing = 1;
+			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "if which swiftlint >/dev/null; then\nswiftlint\nelse\necho \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
 		};
@@ -523,7 +523,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -548,7 +548,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";

diff --git a/README.md b/README.md
@@ -240,6 +240,7 @@ if let collection = json.collection {
 - Swift 3 -> version [**3.0.5**](https://github.com/freshOS/Arrow/releases/tag/3.0.5)
 - Swift 4 -> version [**4.0.0**](https://github.com/freshOS/Arrow/releases/tag/4.0.0)
 - Swift 4.1 -> version [**4.1.0**](https://github.com/freshOS/Arrow/releases/tag/4.1.0)
+- Swift 4.2 -> version [**4.2.0**](https://github.com/freshOS/Arrow/releases/tag/4.2.0)
 
 ## Acknoledgments
 This wouldn't exist without [YannickDot](https://github.com/YannickDot), [Damien-nd](https://github.com/damien-nd) and [maxkonovalov](https://github.com/maxkonovalov)

diff --git a/Source/Info.plist b/Source/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.1.0</string>
+	<string>4.2.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/Source/JSON.swift b/Source/JSON.swift
@@ -115,12 +115,10 @@ open class JSON {
     }
 
     open subscript(index: Int) -> JSON? {
-        get {
-            guard let array = data as? [Any], array.count > index else {
-                return nil
-            }
-            return JSON(array[index])
+        guard let array = data as? [Any], array.count > index else {
+            return nil
         }
+        return JSON(array[index])
     }
 }