Skip to content

Commit 88a69ce

Browse files
authored
Merge pull request #20 from numen31337/master
Updating to Swift 5.0
2 parents b316a86 + 0a20b78 commit 88a69ce

4 files changed

Lines changed: 11 additions & 10 deletions

File tree

.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.2
1+
5.0

KeyboardLayoutGuide/KeyboardLayoutGuide.xcodeproj/project.pbxproj

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
isa = PBXProject;
147147
attributes = {
148148
LastSwiftUpdateCheck = 0900;
149-
LastUpgradeCheck = 0900;
149+
LastUpgradeCheck = 1020;
150150
ORGANIZATIONNAME = freshos;
151151
TargetAttributes = {
152152
9902DE0A1FBB24A5009E0D48 = {
@@ -167,6 +167,7 @@
167167
hasScannedForEncodings = 0;
168168
knownRegions = (
169169
en,
170+
Base,
170171
);
171172
mainGroup = 9902DE011FBB24A5009E0D48;
172173
productRefGroup = 9902DE0C1FBB24A5009E0D48 /* Products */;
@@ -238,13 +239,15 @@
238239
CLANG_WARN_BOOL_CONVERSION = YES;
239240
CLANG_WARN_COMMA = YES;
240241
CLANG_WARN_CONSTANT_CONVERSION = YES;
242+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
241243
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
242244
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
243245
CLANG_WARN_EMPTY_BODY = YES;
244246
CLANG_WARN_ENUM_CONVERSION = YES;
245247
CLANG_WARN_INFINITE_RECURSION = YES;
246248
CLANG_WARN_INT_CONVERSION = YES;
247249
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
250+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
248251
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
249252
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
250253
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -279,7 +282,7 @@
279282
SDKROOT = iphoneos;
280283
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
281284
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
282-
SWIFT_VERSION = 4.2;
285+
SWIFT_VERSION = 5.0;
283286
VERSIONING_SYSTEM = "apple-generic";
284287
VERSION_INFO_PREFIX = "";
285288
};
@@ -299,13 +302,15 @@
299302
CLANG_WARN_BOOL_CONVERSION = YES;
300303
CLANG_WARN_COMMA = YES;
301304
CLANG_WARN_CONSTANT_CONVERSION = YES;
305+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
302306
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
303307
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
304308
CLANG_WARN_EMPTY_BODY = YES;
305309
CLANG_WARN_ENUM_CONVERSION = YES;
306310
CLANG_WARN_INFINITE_RECURSION = YES;
307311
CLANG_WARN_INT_CONVERSION = YES;
308312
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
313+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
309314
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
310315
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
311316
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -332,7 +337,7 @@
332337
MTL_ENABLE_DEBUG_INFO = NO;
333338
SDKROOT = iphoneos;
334339
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
335-
SWIFT_VERSION = 4.2;
340+
SWIFT_VERSION = 5.0;
336341
VALIDATE_PRODUCT = YES;
337342
VERSIONING_SYSTEM = "apple-generic";
338343
VERSION_INFO_PREFIX = "";
@@ -357,7 +362,6 @@
357362
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
358363
SKIP_INSTALL = YES;
359364
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
360-
SWIFT_VERSION = 4.2;
361365
TARGETED_DEVICE_FAMILY = "1,2";
362366
};
363367
name = Debug;
@@ -379,7 +383,6 @@
379383
PRODUCT_BUNDLE_IDENTIFIER = com.freshos.KeyboardLayoutGuide;
380384
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
381385
SKIP_INSTALL = YES;
382-
SWIFT_VERSION = 4.2;
383386
TARGETED_DEVICE_FAMILY = "1,2";
384387
};
385388
name = Release;
@@ -393,7 +396,6 @@
393396
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
394397
PRODUCT_BUNDLE_IDENTIFIER = com.freshos.KeyboardLayoutGuideTests;
395398
PRODUCT_NAME = "$(TARGET_NAME)";
396-
SWIFT_VERSION = 4.2;
397399
TARGETED_DEVICE_FAMILY = "1,2";
398400
};
399401
name = Debug;
@@ -407,7 +409,6 @@
407409
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
408410
PRODUCT_BUNDLE_IDENTIFIER = com.freshos.KeyboardLayoutGuideTests;
409411
PRODUCT_NAME = "$(TARGET_NAME)";
410-
SWIFT_VERSION = 4.2;
411412
TARGETED_DEVICE_FAMILY = "1,2";
412413
};
413414
name = Release;

KeyboardLayoutGuide/KeyboardLayoutGuide.xcodeproj/xcshareddata/xcschemes/KeyboardLayoutGuide.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1000"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

KeyboardLayoutGuide/KeyboardLayoutGuide/Keyboard+LayoutGuide.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public extension UIView {
2121

2222
/// A layout guide representing the inset for the keyboard.
2323
/// Use this layout guide’s top anchor to create constraints pinning to the top of the keyboard.
24-
public var keyboardLayoutGuide: KeyboardLayoutGuide {
24+
var keyboardLayoutGuide: KeyboardLayoutGuide {
2525
get {
2626
if let obj = objc_getAssociatedObject(self, &AssociatedKeys.keyboardLayoutGuide) as? KeyboardLayoutGuide {
2727
return obj

0 commit comments

Comments
 (0)