Skip to content
This repository was archived by the owner on Sep 19, 2024. It is now read-only.

Commit 38252b2

Browse files
committed
Upgrade to Swift 4.2
Fixes mac-cain13/R.swift#412
1 parent 99565c8 commit 38252b2

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

Diff for: Library/UIKit/NibResource+UIKit.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public extension NibResourceType {
1919

2020
- returns: An array containing the top-level objects from the NIB
2121
*/
22-
public func instantiate(withOwner ownerOrNil: Any?, options optionsOrNil: [AnyHashable : Any]? = [:]) -> [Any] {
22+
public func instantiate(withOwner ownerOrNil: Any?, options optionsOrNil: [UINib.OptionsKey : Any]? = [:]) -> [Any] {
2323
return UINib(resource: self).instantiate(withOwner: ownerOrNil, options: optionsOrNil)
2424
}
2525
}

Diff for: R.swift.Library.xcodeproj/project.pbxproj

+8-8
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@
552552
PRODUCT_NAME = Rswift;
553553
SDKROOT = appletvos;
554554
SKIP_INSTALL = YES;
555-
SWIFT_VERSION = 4.0;
555+
SWIFT_VERSION = 4.2;
556556
TARGETED_DEVICE_FAMILY = 3;
557557
TVOS_DEPLOYMENT_TARGET = 9.0;
558558
};
@@ -574,7 +574,7 @@
574574
PRODUCT_NAME = Rswift;
575575
SDKROOT = appletvos;
576576
SKIP_INSTALL = YES;
577-
SWIFT_VERSION = 4.0;
577+
SWIFT_VERSION = 4.2;
578578
TARGETED_DEVICE_FAMILY = 3;
579579
TVOS_DEPLOYMENT_TARGET = 9.0;
580580
};
@@ -588,7 +588,7 @@
588588
PRODUCT_BUNDLE_IDENTIFIER = nl.mathijskadijk.RswiftTests;
589589
PRODUCT_NAME = "$(TARGET_NAME)";
590590
SDKROOT = appletvos;
591-
SWIFT_VERSION = 4.0;
591+
SWIFT_VERSION = 4.2;
592592
TVOS_DEPLOYMENT_TARGET = 9.1;
593593
};
594594
name = Debug;
@@ -601,7 +601,7 @@
601601
PRODUCT_BUNDLE_IDENTIFIER = nl.mathijskadijk.RswiftTests;
602602
PRODUCT_NAME = "$(TARGET_NAME)";
603603
SDKROOT = appletvos;
604-
SWIFT_VERSION = 4.0;
604+
SWIFT_VERSION = 4.2;
605605
TVOS_DEPLOYMENT_TARGET = 9.1;
606606
};
607607
name = Release;
@@ -734,7 +734,7 @@
734734
PRODUCT_NAME = Rswift;
735735
SKIP_INSTALL = YES;
736736
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
737-
SWIFT_VERSION = 4.0;
737+
SWIFT_VERSION = 4.2;
738738
};
739739
name = Debug;
740740
};
@@ -755,7 +755,7 @@
755755
PRODUCT_BUNDLE_IDENTIFIER = nl.mathijskadijk.rswift.library;
756756
PRODUCT_NAME = Rswift;
757757
SKIP_INSTALL = YES;
758-
SWIFT_VERSION = 4.0;
758+
SWIFT_VERSION = 4.2;
759759
};
760760
name = Release;
761761
};
@@ -766,7 +766,7 @@
766766
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
767767
PRODUCT_BUNDLE_IDENTIFIER = nl.mathijskadijk.RswiftTests;
768768
PRODUCT_NAME = "$(TARGET_NAME)";
769-
SWIFT_VERSION = 4.0;
769+
SWIFT_VERSION = 4.2;
770770
};
771771
name = Debug;
772772
};
@@ -777,7 +777,7 @@
777777
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
778778
PRODUCT_BUNDLE_IDENTIFIER = nl.mathijskadijk.RswiftTests;
779779
PRODUCT_NAME = "$(TARGET_NAME)";
780-
SWIFT_VERSION = 4.0;
780+
SWIFT_VERSION = 4.2;
781781
};
782782
name = Release;
783783
};

0 commit comments

Comments
 (0)