Skip to content

Commit 8985ce7

Browse files
authored
Merge pull request #15 from mddub/swift-4
Swift 4 updates
2 parents e09c16f + f51aa33 commit 8985ce7

File tree

4 files changed

+24
-10
lines changed

4 files changed

+24
-10
lines changed

ShareClient.xcodeproj/project.pbxproj

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -146,16 +146,16 @@
146146
isa = PBXProject;
147147
attributes = {
148148
LastSwiftUpdateCheck = 0730;
149-
LastUpgradeCheck = 0830;
149+
LastUpgradeCheck = 0900;
150150
ORGANIZATIONNAME = "Mark Wilson";
151151
TargetAttributes = {
152152
432B0E871CDFC3C50045347B = {
153153
CreatedOnToolsVersion = 7.3.1;
154-
LastSwiftMigration = 0800;
154+
LastSwiftMigration = 0900;
155155
};
156156
432B0E911CDFC3C50045347B = {
157157
CreatedOnToolsVersion = 7.3.1;
158-
LastSwiftMigration = 0800;
158+
LastSwiftMigration = 0900;
159159
};
160160
};
161161
};
@@ -231,14 +231,20 @@
231231
CLANG_CXX_LIBRARY = "libc++";
232232
CLANG_ENABLE_MODULES = YES;
233233
CLANG_ENABLE_OBJC_ARC = YES;
234+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
234235
CLANG_WARN_BOOL_CONVERSION = YES;
236+
CLANG_WARN_COMMA = YES;
235237
CLANG_WARN_CONSTANT_CONVERSION = YES;
236238
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
237239
CLANG_WARN_EMPTY_BODY = YES;
238240
CLANG_WARN_ENUM_CONVERSION = YES;
239241
CLANG_WARN_INFINITE_RECURSION = YES;
240242
CLANG_WARN_INT_CONVERSION = YES;
243+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
244+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
241245
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
246+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
247+
CLANG_WARN_STRICT_PROTOTYPES = YES;
242248
CLANG_WARN_SUSPICIOUS_MOVE = YES;
243249
CLANG_WARN_UNREACHABLE_CODE = YES;
244250
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -282,14 +288,20 @@
282288
CLANG_CXX_LIBRARY = "libc++";
283289
CLANG_ENABLE_MODULES = YES;
284290
CLANG_ENABLE_OBJC_ARC = YES;
291+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
285292
CLANG_WARN_BOOL_CONVERSION = YES;
293+
CLANG_WARN_COMMA = YES;
286294
CLANG_WARN_CONSTANT_CONVERSION = YES;
287295
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
288296
CLANG_WARN_EMPTY_BODY = YES;
289297
CLANG_WARN_ENUM_CONVERSION = YES;
290298
CLANG_WARN_INFINITE_RECURSION = YES;
291299
CLANG_WARN_INT_CONVERSION = YES;
300+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
301+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
292302
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
303+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
304+
CLANG_WARN_STRICT_PROTOTYPES = YES;
293305
CLANG_WARN_SUSPICIOUS_MOVE = YES;
294306
CLANG_WARN_UNREACHABLE_CODE = YES;
295307
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -334,7 +346,7 @@
334346
PRODUCT_NAME = "$(TARGET_NAME)";
335347
SKIP_INSTALL = YES;
336348
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
337-
SWIFT_VERSION = 3.0;
349+
SWIFT_VERSION = 4.0;
338350
};
339351
name = Debug;
340352
};
@@ -353,7 +365,7 @@
353365
PRODUCT_BUNDLE_IDENTIFIER = com.mddub.ShareClient;
354366
PRODUCT_NAME = "$(TARGET_NAME)";
355367
SKIP_INSTALL = YES;
356-
SWIFT_VERSION = 3.0;
368+
SWIFT_VERSION = 4.0;
357369
};
358370
name = Release;
359371
};
@@ -364,7 +376,7 @@
364376
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
365377
PRODUCT_BUNDLE_IDENTIFIER = com.mddub.ShareClientTests;
366378
PRODUCT_NAME = "$(TARGET_NAME)";
367-
SWIFT_VERSION = 3.0;
379+
SWIFT_VERSION = 4.0;
368380
};
369381
name = Debug;
370382
};
@@ -375,7 +387,7 @@
375387
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
376388
PRODUCT_BUNDLE_IDENTIFIER = com.mddub.ShareClientTests;
377389
PRODUCT_NAME = "$(TARGET_NAME)";
378-
SWIFT_VERSION = 3.0;
390+
SWIFT_VERSION = 4.0;
379391
};
380392
name = Release;
381393
};

ShareClient.xcodeproj/xcshareddata/xcschemes/ShareClient.xcscheme

Lines changed: 3 additions & 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 = "0830"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
<TestableReference
@@ -55,6 +56,7 @@
5556
buildConfiguration = "Debug"
5657
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5758
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59+
language = ""
5860
launchStyle = "0"
5961
useCustomWorkingDirectory = "NO"
6062
ignoresPersistentStateOnLaunch = "NO"

ShareClient/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>0.4.0</string>
18+
<string>0.4.1</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

ShareClientTests/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>0.4.0</string>
18+
<string>0.4.1</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

0 commit comments

Comments
 (0)