Skip to content

Commit 8aa14d8

Browse files
committed
Migrates to swift 4.2 & Xcode 10 (v4.2.0)
1 parent 02a9d84 commit 8aa14d8

File tree

7 files changed

+11
-12
lines changed

7 files changed

+11
-12
lines changed

.swift-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0
1+
4.2

Arrow.framework.zip

-67.9 KB
Binary file not shown.

Arrow.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'Arrow'
3-
s.version = "4.1.0"
3+
s.version = "4.2.0"
44
s.summary = "Elegant JSON Parsing in Swift"
55
s.homepage = "https://github.com/freshOS/Arrow"
66
s.license = { :type => "MIT", :file => "LICENSE" }

Arrow.xcodeproj/project.pbxproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -322,15 +322,15 @@
322322
/* Begin PBXShellScriptBuildPhase section */
323323
99709F361D310F74002A92D5 /* Run swiftlint */ = {
324324
isa = PBXShellScriptBuildPhase;
325-
buildActionMask = 8;
325+
buildActionMask = 12;
326326
files = (
327327
);
328328
inputPaths = (
329329
);
330330
name = "Run swiftlint";
331331
outputPaths = (
332332
);
333-
runOnlyForDeploymentPostprocessing = 1;
333+
runOnlyForDeploymentPostprocessing = 0;
334334
shellPath = /bin/sh;
335335
shellScript = "if which swiftlint >/dev/null; then\nswiftlint\nelse\necho \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
336336
};
@@ -523,7 +523,7 @@
523523
SKIP_INSTALL = YES;
524524
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
525525
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
526-
SWIFT_VERSION = 4.0;
526+
SWIFT_VERSION = 4.2;
527527
TARGETED_DEVICE_FAMILY = "1,2";
528528
VERSIONING_SYSTEM = "apple-generic";
529529
VERSION_INFO_PREFIX = "";
@@ -548,7 +548,7 @@
548548
SKIP_INSTALL = YES;
549549
SWIFT_OPTIMIZATION_LEVEL = "-O";
550550
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
551-
SWIFT_VERSION = 4.0;
551+
SWIFT_VERSION = 4.2;
552552
TARGETED_DEVICE_FAMILY = "1,2";
553553
VERSIONING_SYSTEM = "apple-generic";
554554
VERSION_INFO_PREFIX = "";

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@ if let collection = json.collection {
240240
- Swift 3 -> version [**3.0.5**](https://github.com/freshOS/Arrow/releases/tag/3.0.5)
241241
- Swift 4 -> version [**4.0.0**](https://github.com/freshOS/Arrow/releases/tag/4.0.0)
242242
- Swift 4.1 -> version [**4.1.0**](https://github.com/freshOS/Arrow/releases/tag/4.1.0)
243+
- Swift 4.2 -> version [**4.2.0**](https://github.com/freshOS/Arrow/releases/tag/4.2.0)
243244

244245
## Acknoledgments
245246
This wouldn't exist without [YannickDot](https://github.com/YannickDot), [Damien-nd](https://github.com/damien-nd) and [maxkonovalov](https://github.com/maxkonovalov)

Source/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>4.1.0</string>
18+
<string>4.2.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

Source/JSON.swift

+3-5
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,10 @@ open class JSON {
115115
}
116116

117117
open subscript(index: Int) -> JSON? {
118-
get {
119-
guard let array = data as? [Any], array.count > index else {
120-
return nil
121-
}
122-
return JSON(array[index])
118+
guard let array = data as? [Any], array.count > index else {
119+
return nil
123120
}
121+
return JSON(array[index])
124122
}
125123
}
126124

0 commit comments

Comments
 (0)