Skip to content

Commit f498e44

Browse files
objecthubobjecthub
committed
Support Swift 4.2.
1 parent 938fb33 commit f498e44

File tree

6 files changed

+37
-14
lines changed

6 files changed

+37
-14
lines changed

‎CommandLineKit.xcodeproj/project.pbxproj

+28-6
Original file line numberDiff line numberDiff line change
@@ -276,18 +276,19 @@
276276
isa = PBXProject;
277277
attributes = {
278278
LastSwiftUpdateCheck = 0930;
279-
LastUpgradeCheck = 0930;
279+
LastUpgradeCheck = 1000;
280280
ORGANIZATIONNAME = "Matthias Zenger";
281281
TargetAttributes = {
282282
CC7A60E6207A62A5007376A0 = {
283283
CreatedOnToolsVersion = 9.3;
284284
};
285285
CCFC2AD2207A636B00EDDADD = {
286286
CreatedOnToolsVersion = 9.3;
287-
LastSwiftMigration = 0930;
287+
LastSwiftMigration = 1000;
288288
};
289289
CCFC2AEB207A69B900EDDADD = {
290290
CreatedOnToolsVersion = 9.3;
291+
LastSwiftMigration = 1000;
291292
};
292293
};
293294
};
@@ -393,13 +394,23 @@
393394
CLANG_CXX_LIBRARY = "libc++";
394395
CLANG_ENABLE_MODULES = YES;
395396
CLANG_ENABLE_OBJC_ARC = YES;
397+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
396398
CLANG_WARN_BOOL_CONVERSION = YES;
399+
CLANG_WARN_COMMA = YES;
397400
CLANG_WARN_CONSTANT_CONVERSION = YES;
401+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
398402
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
399403
CLANG_WARN_EMPTY_BODY = YES;
400404
CLANG_WARN_ENUM_CONVERSION = YES;
405+
CLANG_WARN_INFINITE_RECURSION = YES;
401406
CLANG_WARN_INT_CONVERSION = YES;
407+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
408+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
409+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
402410
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
411+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
412+
CLANG_WARN_STRICT_PROTOTYPES = YES;
413+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
403414
CLANG_WARN_UNREACHABLE_CODE = YES;
404415
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
405416
CODE_SIGN_IDENTITY = "-";
@@ -436,13 +447,23 @@
436447
CLANG_CXX_LIBRARY = "libc++";
437448
CLANG_ENABLE_MODULES = YES;
438449
CLANG_ENABLE_OBJC_ARC = YES;
450+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
439451
CLANG_WARN_BOOL_CONVERSION = YES;
452+
CLANG_WARN_COMMA = YES;
440453
CLANG_WARN_CONSTANT_CONVERSION = YES;
454+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
441455
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
442456
CLANG_WARN_EMPTY_BODY = YES;
443457
CLANG_WARN_ENUM_CONVERSION = YES;
458+
CLANG_WARN_INFINITE_RECURSION = YES;
444459
CLANG_WARN_INT_CONVERSION = YES;
460+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
461+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
462+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
445463
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
464+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
465+
CLANG_WARN_STRICT_PROTOTYPES = YES;
466+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
446467
CLANG_WARN_UNREACHABLE_CODE = YES;
447468
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
448469
CODE_SIGN_IDENTITY = "-";
@@ -461,6 +482,7 @@
461482
MACOSX_DEPLOYMENT_TARGET = 10.11;
462483
MTL_ENABLE_DEBUG_INFO = NO;
463484
SDKROOT = macosx;
485+
SWIFT_COMPILATION_MODE = wholemodule;
464486
};
465487
name = Release;
466488
};
@@ -543,7 +565,7 @@
543565
SKIP_INSTALL = YES;
544566
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
545567
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
546-
SWIFT_VERSION = 4.0;
568+
SWIFT_VERSION = 4.2;
547569
VERSIONING_SYSTEM = "apple-generic";
548570
VERSION_INFO_PREFIX = "";
549571
};
@@ -592,7 +614,7 @@
592614
SKIP_INSTALL = YES;
593615
SWIFT_COMPILATION_MODE = wholemodule;
594616
SWIFT_OPTIMIZATION_LEVEL = "-O";
595-
SWIFT_VERSION = 4.0;
617+
SWIFT_VERSION = 4.2;
596618
VERSIONING_SYSTEM = "apple-generic";
597619
VERSION_INFO_PREFIX = "";
598620
};
@@ -632,7 +654,7 @@
632654
PRODUCT_NAME = "$(TARGET_NAME)";
633655
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
634656
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
635-
SWIFT_VERSION = 4.0;
657+
SWIFT_VERSION = 4.2;
636658
};
637659
name = Debug;
638660
};
@@ -670,7 +692,7 @@
670692
PRODUCT_NAME = "$(TARGET_NAME)";
671693
SWIFT_COMPILATION_MODE = wholemodule;
672694
SWIFT_OPTIMIZATION_LEVEL = "-O";
673-
SWIFT_VERSION = 4.0;
695+
SWIFT_VERSION = 4.2;
674696
};
675697
name = Release;
676698
};

‎CommandLineKit.xcodeproj/xcshareddata/xcschemes/CommandLineKit.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 = "0930"
3+
LastUpgradeVersion = "1000"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎CommandLineKit.xcodeproj/xcshareddata/xcschemes/CommandLineKitDemo.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 = "0930"
3+
LastUpgradeVersion = "1000"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Package.swift

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:4.1
1+
// swift-tools-version:4.2
22
//
33
// Package.swift
44
// CommandLineKit
@@ -42,6 +42,7 @@ import PackageDescription
4242

4343
let package = Package(
4444
name: "CommandLineKit",
45+
swiftLanguageVersions: [4],
4546
products: [
4647
.library(name: "CommandLineKit", targets: ["CommandLineKit"]),
4748
.executable(name: "CommandLineKitDemo", targets: ["CommandLineKitDemo"])

‎README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
[![Platform: macOS](https://img.shields.io/badge/Platform-macOS-blue.svg?style=flat)](https://developer.apple.com/osx/)
44
[![Platform: Linux](https://img.shields.io/badge/Platform-Linux-blue.svg?style=flat)](https://www.ubuntu.com/)
5-
[![Language: Swift 4.1](https://img.shields.io/badge/Language-Swift%204.1-green.svg?style=flat)](https://developer.apple.com/swift/)
6-
[![IDE: Xcode 9.3](https://img.shields.io/badge/IDE-Xcode%209.3-orange.svg?style=flat)](https://developer.apple.com/xcode/)
5+
[![Language: Swift 4.2](https://img.shields.io/badge/Language-Swift%204.2-green.svg?style=flat)](https://developer.apple.com/swift/)
6+
[![IDE: Xcode 10.0](https://img.shields.io/badge/IDE-Xcode%2010.0-orange.svg?style=flat)](https://developer.apple.com/xcode/)
77
[![Carthage: compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
88
[![License: BSD](https://img.shields.io/badge/License-BSD-lightgrey.svg?style=flat)](https://developers.google.com/open-source/licenses/bsd)
99

@@ -197,7 +197,7 @@ if let ln = LineReader() {
197197

198198
## Requirements
199199

200-
- [Xcode 9.3](https://developer.apple.com/xcode/)
201-
- [Swift 4.1](https://developer.apple.com/swift/)
200+
- [Xcode 10.0](https://developer.apple.com/xcode/)
201+
- [Swift 4.2](https://developer.apple.com/swift/)
202202
- [Carthage](https://github.com/Carthage/Carthage)
203203
- [Swift Package Manager](https://swift.org/package-manager/)

‎Sources/CommandLineKit/Info.plist

+1-1
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.2.1</string>
18+
<string>0.2.2</string>
1919
<key>CFBundleVersion</key>
2020
<string>$(CURRENT_PROJECT_VERSION)</string>
2121
<key>NSHumanReadableCopyright</key>

0 commit comments

Comments
 (0)