Skip to content

Commit 5783b79

Browse files
committed
Updated to Swft4
1 parent 1c371ca commit 5783b79

4 files changed

Lines changed: 7 additions & 7 deletions

File tree

.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0
1+
4.0

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: objective-c
2-
osx_image: xcode8
2+
osx_image: xcode9
33
script:
44
- set -o pipefail
55
- xcodebuild test -scheme OptionalExtensions-Mac | xcpretty -c

OptionalExtensions.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -822,7 +822,7 @@
822822
PRODUCT_NAME = OptionalExtensions;
823823
SKIP_INSTALL = YES;
824824
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
825-
SWIFT_VERSION = 3.0;
825+
SWIFT_VERSION = 4.0;
826826
};
827827
name = Debug;
828828
};
@@ -841,7 +841,7 @@
841841
PRODUCT_NAME = OptionalExtensions;
842842
SKIP_INSTALL = YES;
843843
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
844-
SWIFT_VERSION = 3.0;
844+
SWIFT_VERSION = 4.0;
845845
};
846846
name = Release;
847847
};

OptionalExtensions/Source/OptionalExtensions.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ public extension Optional {
1212
return map(predicate) == .some(true) ? self : .none
1313
}
1414

15-
func mapNil(_ predicate: (Void) -> Wrapped) -> Optional {
15+
func mapNil(_ predicate: () -> Wrapped) -> Optional {
1616
return self ?? .some(predicate())
1717
}
1818

19-
func flatMapNil(_ predicate: (Void) -> Optional) -> Optional {
19+
func flatMapNil(_ predicate: () -> Optional) -> Optional {
2020
return self ?? predicate()
2121
}
2222

@@ -33,7 +33,7 @@ public extension Optional {
3333
return self
3434
}
3535

36-
func onNone(_ f: (Void) -> Void) -> Optional {
36+
func onNone(_ f: () -> Void) -> Optional {
3737
if isNone { f() }
3838
return self
3939
}

0 commit comments

Comments
 (0)