Skip to content

Commit 6c673fe

Browse files
committed
Update to Swift 4.2
1 parent 59e12b7 commit 6c673fe

File tree

3 files changed

+32
-7
lines changed

3 files changed

+32
-7
lines changed

EmojiKit.xcodeproj/project.pbxproj

+29-4
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,12 @@
102102
2FD740891C3440BA0059751B /* Project object */ = {
103103
isa = PBXProject;
104104
attributes = {
105-
LastUpgradeCheck = 0720;
105+
LastUpgradeCheck = 1010;
106106
ORGANIZATIONNAME = "Dastronics Inc.";
107107
TargetAttributes = {
108108
2FD740911C3440BA0059751B = {
109109
CreatedOnToolsVersion = 7.2;
110-
LastSwiftMigration = 0820;
110+
LastSwiftMigration = 1010;
111111
};
112112
};
113113
};
@@ -161,13 +161,23 @@
161161
CLANG_CXX_LIBRARY = "libc++";
162162
CLANG_ENABLE_MODULES = YES;
163163
CLANG_ENABLE_OBJC_ARC = YES;
164+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
164165
CLANG_WARN_BOOL_CONVERSION = YES;
166+
CLANG_WARN_COMMA = YES;
165167
CLANG_WARN_CONSTANT_CONVERSION = YES;
168+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
166169
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
167170
CLANG_WARN_EMPTY_BODY = YES;
168171
CLANG_WARN_ENUM_CONVERSION = YES;
172+
CLANG_WARN_INFINITE_RECURSION = YES;
169173
CLANG_WARN_INT_CONVERSION = YES;
174+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
175+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
176+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
170177
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
178+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
179+
CLANG_WARN_STRICT_PROTOTYPES = YES;
180+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
171181
CLANG_WARN_UNREACHABLE_CODE = YES;
172182
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
173183
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -209,13 +219,23 @@
209219
CLANG_CXX_LIBRARY = "libc++";
210220
CLANG_ENABLE_MODULES = YES;
211221
CLANG_ENABLE_OBJC_ARC = YES;
222+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
212223
CLANG_WARN_BOOL_CONVERSION = YES;
224+
CLANG_WARN_COMMA = YES;
213225
CLANG_WARN_CONSTANT_CONVERSION = YES;
226+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
214227
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
215228
CLANG_WARN_EMPTY_BODY = YES;
216229
CLANG_WARN_ENUM_CONVERSION = YES;
230+
CLANG_WARN_INFINITE_RECURSION = YES;
217231
CLANG_WARN_INT_CONVERSION = YES;
232+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
233+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
234+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
218235
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
236+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
237+
CLANG_WARN_STRICT_PROTOTYPES = YES;
238+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
219239
CLANG_WARN_UNREACHABLE_CODE = YES;
220240
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
221241
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -235,6 +255,7 @@
235255
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
236256
MTL_ENABLE_DEBUG_INFO = NO;
237257
SDKROOT = iphoneos;
258+
SWIFT_COMPILATION_MODE = wholemodule;
238259
TARGETED_DEVICE_FAMILY = "1,2";
239260
VALIDATE_PRODUCT = YES;
240261
VERSIONING_SYSTEM = "apple-generic";
@@ -247,6 +268,7 @@
247268
buildSettings = {
248269
APPLICATION_EXTENSION_API_ONLY = YES;
249270
CLANG_ENABLE_MODULES = YES;
271+
CODE_SIGN_IDENTITY = "";
250272
DEFINES_MODULE = YES;
251273
DYLIB_COMPATIBILITY_VERSION = 1;
252274
DYLIB_CURRENT_VERSION = 1;
@@ -259,7 +281,8 @@
259281
PRODUCT_NAME = "$(TARGET_NAME)";
260282
SKIP_INSTALL = YES;
261283
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
262-
SWIFT_VERSION = 3.0;
284+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
285+
SWIFT_VERSION = 4.2;
263286
};
264287
name = Debug;
265288
};
@@ -268,6 +291,7 @@
268291
buildSettings = {
269292
APPLICATION_EXTENSION_API_ONLY = YES;
270293
CLANG_ENABLE_MODULES = YES;
294+
CODE_SIGN_IDENTITY = "";
271295
DEFINES_MODULE = YES;
272296
DYLIB_COMPATIBILITY_VERSION = 1;
273297
DYLIB_CURRENT_VERSION = 1;
@@ -279,7 +303,8 @@
279303
PRODUCT_BUNDLE_IDENTIFIER = com.dastronics.EmojiKit;
280304
PRODUCT_NAME = "$(TARGET_NAME)";
281305
SKIP_INSTALL = YES;
282-
SWIFT_VERSION = 3.0;
306+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
307+
SWIFT_VERSION = 4.2;
283308
};
284309
name = Release;
285310
};

EmojiKit.xcodeproj/xcshareddata/xcschemes/EmojiKit.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0720"
3+
LastUpgradeVersion = "1010"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

EmojiKit/EmojiFetcher.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ private let AllEmojiArray: [Emoji] = {
1414
let jsonObject = try? JSONSerialization.jsonObject(with: data, options: []),
1515
let jsonDictionaries = jsonObject as? [JSONDictionary] else { return [] }
1616

17-
return jsonDictionaries.flatMap { Emoji(dictionary: $0) }
17+
return jsonDictionaries.compactMap { Emoji(dictionary: $0) }
1818
}()
1919

2020
private let AllEmojiDictionary: [String: Emoji] = {
@@ -116,7 +116,7 @@ private final class EmojiFetchOperation: Operation {
116116

117117
var validResult = false
118118

119-
let emojiNameWords = emoji.name.characters.split{$0 == " "}.map(String.init)
119+
let emojiNameWords = emoji.name.split{$0 == " "}.map(String.init)
120120

121121
for emojiNameWord in emojiNameWords {
122122
if emojiNameWord.hasPrefix(lowercaseSearchString) {

0 commit comments

Comments
 (0)