Skip to content

Commit 55f6ebc

Browse files
author
Valery Bashkatov
committed
3.0.0: Migration to Swift 4.1
1 parent 8651616 commit 55f6ebc

5 files changed

Lines changed: 39 additions & 11 deletions

File tree

Extensions.xcodeproj/project.pbxproj

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -157,16 +157,16 @@
157157
isa = PBXProject;
158158
attributes = {
159159
LastSwiftUpdateCheck = 0730;
160-
LastUpgradeCheck = 0810;
160+
LastUpgradeCheck = 0940;
161161
ORGANIZATIONNAME = "Valery Bashkatov";
162162
TargetAttributes = {
163163
83B4D0E61D5B2D04004BAF86 = {
164164
CreatedOnToolsVersion = 7.3.1;
165-
LastSwiftMigration = 0810;
165+
LastSwiftMigration = 0940;
166166
};
167167
83B4D0F01D5B2D05004BAF86 = {
168168
CreatedOnToolsVersion = 7.3.1;
169-
LastSwiftMigration = 0810;
169+
LastSwiftMigration = 0940;
170170
};
171171
};
172172
};
@@ -247,14 +247,22 @@
247247
CLANG_CXX_LIBRARY = "libc++";
248248
CLANG_ENABLE_MODULES = YES;
249249
CLANG_ENABLE_OBJC_ARC = YES;
250+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
250251
CLANG_WARN_BOOL_CONVERSION = YES;
252+
CLANG_WARN_COMMA = YES;
251253
CLANG_WARN_CONSTANT_CONVERSION = YES;
254+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
252255
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
253256
CLANG_WARN_EMPTY_BODY = YES;
254257
CLANG_WARN_ENUM_CONVERSION = YES;
255258
CLANG_WARN_INFINITE_RECURSION = YES;
256259
CLANG_WARN_INT_CONVERSION = YES;
260+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
261+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
262+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
257263
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
264+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
265+
CLANG_WARN_STRICT_PROTOTYPES = YES;
258266
CLANG_WARN_SUSPICIOUS_MOVE = YES;
259267
CLANG_WARN_UNREACHABLE_CODE = YES;
260268
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -298,14 +306,22 @@
298306
CLANG_CXX_LIBRARY = "libc++";
299307
CLANG_ENABLE_MODULES = YES;
300308
CLANG_ENABLE_OBJC_ARC = YES;
309+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
301310
CLANG_WARN_BOOL_CONVERSION = YES;
311+
CLANG_WARN_COMMA = YES;
302312
CLANG_WARN_CONSTANT_CONVERSION = YES;
313+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
303314
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
304315
CLANG_WARN_EMPTY_BODY = YES;
305316
CLANG_WARN_ENUM_CONVERSION = YES;
306317
CLANG_WARN_INFINITE_RECURSION = YES;
307318
CLANG_WARN_INT_CONVERSION = YES;
319+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
320+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
321+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
308322
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
323+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
324+
CLANG_WARN_STRICT_PROTOTYPES = YES;
309325
CLANG_WARN_SUSPICIOUS_MOVE = YES;
310326
CLANG_WARN_UNREACHABLE_CODE = YES;
311327
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -350,7 +366,8 @@
350366
PRODUCT_NAME = "$(TARGET_NAME)";
351367
SKIP_INSTALL = YES;
352368
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
353-
SWIFT_VERSION = 3.0.1;
369+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
370+
SWIFT_VERSION = 4.0;
354371
};
355372
name = Debug;
356373
};
@@ -369,7 +386,8 @@
369386
PRODUCT_BUNDLE_IDENTIFIER = org.bashkatov.valery.Extensions;
370387
PRODUCT_NAME = "$(TARGET_NAME)";
371388
SKIP_INSTALL = YES;
372-
SWIFT_VERSION = 3.0.1;
389+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
390+
SWIFT_VERSION = 4.0;
373391
};
374392
name = Release;
375393
};
@@ -380,7 +398,8 @@
380398
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
381399
PRODUCT_BUNDLE_IDENTIFIER = org.bashkatov.valery.ExtensionsTests;
382400
PRODUCT_NAME = "$(TARGET_NAME)";
383-
SWIFT_VERSION = 3.0.1;
401+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
402+
SWIFT_VERSION = 4.0;
384403
};
385404
name = Debug;
386405
};
@@ -391,7 +410,8 @@
391410
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
392411
PRODUCT_BUNDLE_IDENTIFIER = org.bashkatov.valery.ExtensionsTests;
393412
PRODUCT_NAME = "$(TARGET_NAME)";
394-
SWIFT_VERSION = 3.0.1;
413+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
414+
SWIFT_VERSION = 4.0;
395415
};
396416
name = Release;
397417
};
Lines changed: 8 additions & 0 deletions
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>

Extensions.xcodeproj/xcshareddata/xcschemes/Extensions.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 = "0810"
3+
LastUpgradeVersion = "0940"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ An UIDevice extension for getting the device's full model name, such as iPhone 6
1919

2020
## Requirements
2121
- iOS 9.0+
22-
- Swift 3.0+
22+
- Swift 4.1+
2323

2424
## Installation
2525
### Carthage
2626
To integrate `Extensions` into your project using [Carthage](https://github.com/Carthage/Carthage), specify it in your `Cartfile`:
2727

2828
```
29-
github "valery-bashkatov/Extensions" ~> 2.0.0
29+
github "valery-bashkatov/Extensions" ~> 3.0.0
3030
```
3131
And then follow the [instructions](https://github.com/Carthage/Carthage#if-youre-building-for-ios-tvos-or-watchos) to install the framework.
3232

Sources/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>2.0.0</string>
18+
<string>3.0.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

0 commit comments

Comments
 (0)