Skip to content

Commit 60ceb42

Browse files
eshurakoveshurakov
committedApr 25, 2019
Update to swift 5
1 parent 59bacd7 commit 60ceb42

File tree

5 files changed

+40
-14
lines changed

5 files changed

+40
-14
lines changed
 

‎Log.xcodeproj/project.pbxproj

+22-4
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
isa = PBXProject;
132132
attributes = {
133133
LastSwiftUpdateCheck = 0720;
134-
LastUpgradeCheck = 0800;
134+
LastUpgradeCheck = 1020;
135135
ORGANIZATIONNAME = "Evgeny Shurakov";
136136
TargetAttributes = {
137137
A62ECCED1C5ACC82000A7B38 = {
@@ -145,7 +145,7 @@
145145
};
146146
buildConfigurationList = A62ECCE81C5ACC82000A7B38 /* Build configuration list for PBXProject "Log" */;
147147
compatibilityVersion = "Xcode 3.2";
148-
developmentRegion = English;
148+
developmentRegion = en;
149149
hasScannedForEncodings = 0;
150150
knownRegions = (
151151
en,
@@ -206,14 +206,22 @@
206206
CLANG_CXX_LIBRARY = "libc++";
207207
CLANG_ENABLE_MODULES = YES;
208208
CLANG_ENABLE_OBJC_ARC = YES;
209+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
209210
CLANG_WARN_BOOL_CONVERSION = YES;
211+
CLANG_WARN_COMMA = YES;
210212
CLANG_WARN_CONSTANT_CONVERSION = YES;
213+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
211214
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
212215
CLANG_WARN_EMPTY_BODY = YES;
213216
CLANG_WARN_ENUM_CONVERSION = YES;
214217
CLANG_WARN_INFINITE_RECURSION = YES;
215218
CLANG_WARN_INT_CONVERSION = YES;
219+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
220+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
221+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
216222
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
223+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
224+
CLANG_WARN_STRICT_PROTOTYPES = YES;
217225
CLANG_WARN_SUSPICIOUS_MOVE = YES;
218226
CLANG_WARN_UNREACHABLE_CODE = YES;
219227
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -257,14 +265,22 @@
257265
CLANG_CXX_LIBRARY = "libc++";
258266
CLANG_ENABLE_MODULES = YES;
259267
CLANG_ENABLE_OBJC_ARC = YES;
268+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
260269
CLANG_WARN_BOOL_CONVERSION = YES;
270+
CLANG_WARN_COMMA = YES;
261271
CLANG_WARN_CONSTANT_CONVERSION = YES;
272+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
262273
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
263274
CLANG_WARN_EMPTY_BODY = YES;
264275
CLANG_WARN_ENUM_CONVERSION = YES;
265276
CLANG_WARN_INFINITE_RECURSION = YES;
266277
CLANG_WARN_INT_CONVERSION = YES;
278+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
279+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
280+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
267281
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
282+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
283+
CLANG_WARN_STRICT_PROTOTYPES = YES;
268284
CLANG_WARN_SUSPICIOUS_MOVE = YES;
269285
CLANG_WARN_UNREACHABLE_CODE = YES;
270286
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -309,6 +325,7 @@
309325
PRODUCT_NAME = Log;
310326
SKIP_INSTALL = YES;
311327
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
328+
SWIFT_VERSION = 5.0;
312329
};
313330
name = Debug;
314331
};
@@ -328,6 +345,7 @@
328345
PRODUCT_NAME = Log;
329346
SKIP_INSTALL = YES;
330347
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
348+
SWIFT_VERSION = 5.0;
331349
};
332350
name = Release;
333351
};
@@ -350,7 +368,7 @@
350368
PRODUCT_NAME = Log;
351369
SDKROOT = macosx;
352370
SKIP_INSTALL = YES;
353-
SWIFT_VERSION = 3.0;
371+
SWIFT_VERSION = 5.0;
354372
};
355373
name = Debug;
356374
};
@@ -374,7 +392,7 @@
374392
SDKROOT = macosx;
375393
SKIP_INSTALL = YES;
376394
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
377-
SWIFT_VERSION = 3.0;
395+
SWIFT_VERSION = 5.0;
378396
};
379397
name = Release;
380398
};

‎Log.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎Log.xcodeproj/xcshareddata/xcschemes/Log Mac.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 = "0800"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Log.xcodeproj/xcshareddata/xcschemes/Log iOS.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 = "0800"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Log/Log.swift

+8-8
Original file line numberDiff line numberDiff line change
@@ -37,35 +37,35 @@ public final class Log {
3737
}
3838

3939
public class func d(_ message: @autoclosure () -> String) {
40-
defaultLogger?.d(message)
40+
defaultLogger?.d(message())
4141
}
4242

4343
public class func i(_ message: @autoclosure () -> String) {
44-
defaultLogger?.i(message)
44+
defaultLogger?.i(message())
4545
}
4646

4747
public class func w(_ message: @autoclosure () -> String) {
48-
defaultLogger?.w(message)
48+
defaultLogger?.w(message())
4949
}
5050

5151
public class func e(_ message: @autoclosure () -> String) {
52-
defaultLogger?.e(message)
52+
defaultLogger?.e(message())
5353
}
5454

5555
public func d(_ message: @autoclosure () -> String) {
56-
log(level: .debug, message: message)
56+
log(level: .debug, message: message())
5757
}
5858

5959
public func i(_ message: @autoclosure () -> String) {
60-
log(level: .info, message: message)
60+
log(level: .info, message: message())
6161
}
6262

6363
public func w(_ message: @autoclosure () -> String) {
64-
log(level: .warning, message: message)
64+
log(level: .warning, message: message())
6565
}
6666

6767
public func e(_ message: @autoclosure () -> String) {
68-
log(level: .error, message: message)
68+
log(level: .error, message: message())
6969
}
7070

7171
public func subloggerWithTag(tag: String) -> Log {

0 commit comments

Comments
 (0)
Please sign in to comment.