diff --git a/.swift-version b/.swift-version index 5186d07..bf77d54 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -4.0 +4.2 diff --git a/Arrow.framework.zip b/Arrow.framework.zip index 39bae04..0330f0a 100644 Binary files a/Arrow.framework.zip and b/Arrow.framework.zip differ diff --git a/Arrow.podspec b/Arrow.podspec index 187c898..b553262 100644 --- 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 index 95735e8..b19565c 100644 --- a/Arrow.xcodeproj/project.pbxproj +++ b/Arrow.xcodeproj/project.pbxproj @@ -322,7 +322,7 @@ /* Begin PBXShellScriptBuildPhase section */ 99709F361D310F74002A92D5 /* Run swiftlint */ = { isa = PBXShellScriptBuildPhase; - buildActionMask = 8; + buildActionMask = 12; files = ( ); inputPaths = ( @@ -330,7 +330,7 @@ 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 index 6d30384..1469f46 100644 --- 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 index 5284837..b6ba904 100644 --- a/Source/Info.plist +++ b/Source/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 4.1.0 + 4.2.0 CFBundleSignature ???? CFBundleVersion diff --git a/Source/JSON.swift b/Source/JSON.swift index 8918dd0..b963aae 100644 --- 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]) } }