Skip to content

Commit c42a483

Browse files
Vkt0rVkt0r
authored
Merge pull request #462 from httpswift/xcode12-swift5
Xcode 12 compatibility
2 parents 17429fd + 91b11ce commit c42a483

File tree

19 files changed

+50
-50
lines changed

19 files changed

+50
-50
lines changed

‎.github/workflows/macos-tests.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ jobs:
1212
LANG: en_US.UTF-8
1313

1414
steps:
15+
- uses: maxim-lobanov/[email protected]
16+
with:
17+
xcode-version: 12.0
1518
- uses: actions/checkout@v2
1619
- name: Create Test Result Directory
1720
run: |

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,16 @@ All notable changes to this project will be documented in this file. Changes not
1818
1919
# [Unreleased]
2020

21+
## Removed
22+
23+
- Support for the iOS 8 deployment target. ([#462](https://github.com/httpswift/swifter/pull/462)) by [@Vkt0r](https://github.com/Vkt0r)
24+
2125
## Added
2226

2327
- Add the `trailing_whitespace` rule in Swiftlint and autocorrect all the source files. ([#421](https://github.com/httpswift/swifter/pull/421)) by [@Vkt0r](https://github.com/Vkt0r)
2428
- Update the project for Xcode 11.1. ([#438](https://github.com/httpswift/swifter/pull/438)) by [@Vkt0r](https://github.com/Vkt0r)
2529
- Add optional 'Content-Type' to Data HttpResponse. ([#450](https://github.com/httpswift/swifter/pull/450)) by [@SoftwareEngineerChris](https://github.com/SoftwareEngineerChris)
30+
- Support Xcode 12 and Swift 5+. ([#462](https://github.com/httpswift/swifter/pull/462)) by [@Vkt0r](https://github.com/Vkt0r)
2631

2732
## Changed
2833

‎XCode/Sources/HttpResponse.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public enum HttpResponse {
8585
case movedTemporarily(String)
8686
case badRequest(HttpResponseBody?), unauthorized, forbidden, notFound
8787
case internalServerError
88-
case raw(Int, String, [String:String]?, ((HttpResponseBodyWriter) throws -> Void)? )
88+
case raw(Int, String, [String: String]?, ((HttpResponseBodyWriter) throws -> Void)? )
8989

9090
public var statusCode: Int {
9191
switch self {

‎XCode/Sources/HttpServer.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ open class HttpServer: HttpServerIO {
1212
public static let VERSION: String = {
1313

1414
#if os(Linux)
15-
return "1.4.7"
15+
return "1.5.0"
1616
#else
1717
let bundle = Bundle(for: HttpServer.self)
1818
guard let version = bundle.infoDictionary?["CFBundleShortVersionString"] as? String else { return "Unspecified" }

‎XCode/Sources/HttpServerIO.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ open class HttpServerIO {
130130
}
131131
} catch {
132132
print("Failed to send response: \(error)")
133-
break
134133
}
135134
if let session = response.socketSession() {
136135
delegate?.socketConnectionReceived(socket)

‎XCode/Swifter.xcodeproj/project.pbxproj‎

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,7 @@
629629
isa = PBXProject;
630630
attributes = {
631631
LastSwiftUpdateCheck = 1010;
632-
LastUpgradeCheck = 1110;
632+
LastUpgradeCheck = 1200;
633633
ORGANIZATIONNAME = "Damian Kołakowski";
634634
TargetAttributes = {
635635
043660C121FED34100497989 = {
@@ -1078,6 +1078,7 @@
10781078
buildSettings = {
10791079
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
10801080
"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
1081+
CURRENT_PROJECT_VERSION = 1.5.0;
10811082
DEBUG_INFORMATION_FORMAT = dwarf;
10821083
DEFINES_MODULE = YES;
10831084
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1087,6 +1088,7 @@
10871088
INFOPLIST_FILE = SwiftertvOS/Info.plist;
10881089
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
10891090
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1091+
MARKETING_VERSION = 1.5.0;
10901092
MTL_ENABLE_DEBUG_INFO = YES;
10911093
PRODUCT_BUNDLE_IDENTIFIER = pl.kolakowski.SwiftertvOS;
10921094
PRODUCT_MODULE_NAME = Swifter;
@@ -1107,6 +1109,7 @@
11071109
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
11081110
"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
11091111
COPY_PHASE_STRIP = NO;
1112+
CURRENT_PROJECT_VERSION = 1.5.0;
11101113
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
11111114
DEFINES_MODULE = YES;
11121115
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1116,6 +1119,7 @@
11161119
INFOPLIST_FILE = SwiftertvOS/Info.plist;
11171120
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
11181121
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1122+
MARKETING_VERSION = 1.5.0;
11191123
MTL_ENABLE_DEBUG_INFO = NO;
11201124
PRODUCT_BUNDLE_IDENTIFIER = pl.kolakowski.SwiftertvOS;
11211125
PRODUCT_MODULE_NAME = Swifter;
@@ -1135,6 +1139,7 @@
11351139
buildSettings = {
11361140
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
11371141
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
1142+
CURRENT_PROJECT_VERSION = 1.5.0;
11381143
DEBUG_INFORMATION_FORMAT = dwarf;
11391144
DEFINES_MODULE = YES;
11401145
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1143,8 +1148,9 @@
11431148
GCC_NO_COMMON_BLOCKS = YES;
11441149
INFOPLIST_FILE = SwifteriOS/Info.plist;
11451150
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1146-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1151+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
11471152
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1153+
MARKETING_VERSION = 1.5.0;
11481154
MTL_ENABLE_DEBUG_INFO = YES;
11491155
PRODUCT_BUNDLE_IDENTIFIER = pl.kolakowski.SwifteriOS;
11501156
PRODUCT_NAME = Swifter;
@@ -1162,6 +1168,7 @@
11621168
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
11631169
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
11641170
COPY_PHASE_STRIP = NO;
1171+
CURRENT_PROJECT_VERSION = 1.5.0;
11651172
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
11661173
DEFINES_MODULE = YES;
11671174
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1170,8 +1177,9 @@
11701177
GCC_NO_COMMON_BLOCKS = YES;
11711178
INFOPLIST_FILE = SwifteriOS/Info.plist;
11721179
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1173-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1180+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
11741181
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1182+
MARKETING_VERSION = 1.5.0;
11751183
MTL_ENABLE_DEBUG_INFO = NO;
11761184
PRODUCT_BUNDLE_IDENTIFIER = pl.kolakowski.SwifteriOS;
11771185
PRODUCT_NAME = Swifter;
@@ -1189,6 +1197,7 @@
11891197
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
11901198
CODE_SIGN_IDENTITY = "";
11911199
COMBINE_HIDPI_IMAGES = YES;
1200+
CURRENT_PROJECT_VERSION = 1.5.0;
11921201
DEBUG_INFORMATION_FORMAT = dwarf;
11931202
DEFINES_MODULE = YES;
11941203
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1199,6 +1208,7 @@
11991208
INFOPLIST_FILE = SwifterMac/Info.plist;
12001209
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
12011210
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
1211+
MARKETING_VERSION = 1.5.0;
12021212
MTL_ENABLE_DEBUG_INFO = YES;
12031213
PRODUCT_BUNDLE_IDENTIFIER = pl.kolakowski.SwifterMac;
12041214
PRODUCT_NAME = Swifter;
@@ -1217,6 +1227,7 @@
12171227
CODE_SIGN_IDENTITY = "";
12181228
COMBINE_HIDPI_IMAGES = YES;
12191229
COPY_PHASE_STRIP = NO;
1230+
CURRENT_PROJECT_VERSION = 1.5.0;
12201231
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
12211232
DEFINES_MODULE = YES;
12221233
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1227,6 +1238,7 @@
12271238
INFOPLIST_FILE = SwifterMac/Info.plist;
12281239
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
12291240
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
1241+
MARKETING_VERSION = 1.5.0;
12301242
MTL_ENABLE_DEBUG_INFO = NO;
12311243
PRODUCT_BUNDLE_IDENTIFIER = pl.kolakowski.SwifterMac;
12321244
PRODUCT_NAME = Swifter;
@@ -1263,14 +1275,15 @@
12631275
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
12641276
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
12651277
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1278+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
12661279
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
12671280
CLANG_WARN_STRICT_PROTOTYPES = YES;
12681281
CLANG_WARN_SUSPICIOUS_MOVE = YES;
12691282
CLANG_WARN_UNREACHABLE_CODE = YES;
12701283
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
12711284
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
12721285
COPY_PHASE_STRIP = NO;
1273-
CURRENT_PROJECT_VERSION = 1.4.7;
1286+
CURRENT_PROJECT_VERSION = 1.5.0;
12741287
ENABLE_STRICT_OBJC_MSGSEND = YES;
12751288
ENABLE_TESTABILITY = YES;
12761289
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -1288,7 +1301,7 @@
12881301
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
12891302
GCC_WARN_UNUSED_FUNCTION = YES;
12901303
GCC_WARN_UNUSED_VARIABLE = YES;
1291-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1304+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
12921305
MACOSX_DEPLOYMENT_TARGET = 10.10;
12931306
METAL_ENABLE_DEBUG_INFO = YES;
12941307
ONLY_ACTIVE_ARCH = YES;
@@ -1325,14 +1338,15 @@
13251338
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
13261339
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
13271340
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1341+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
13281342
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
13291343
CLANG_WARN_STRICT_PROTOTYPES = YES;
13301344
CLANG_WARN_SUSPICIOUS_MOVE = YES;
13311345
CLANG_WARN_UNREACHABLE_CODE = YES;
13321346
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
13331347
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
13341348
COPY_PHASE_STRIP = YES;
1335-
CURRENT_PROJECT_VERSION = 1.4.7;
1349+
CURRENT_PROJECT_VERSION = 1.5.0;
13361350
ENABLE_NS_ASSERTIONS = NO;
13371351
ENABLE_STRICT_OBJC_MSGSEND = YES;
13381352
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -1343,7 +1357,7 @@
13431357
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
13441358
GCC_WARN_UNUSED_FUNCTION = YES;
13451359
GCC_WARN_UNUSED_VARIABLE = YES;
1346-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1360+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
13471361
MACOSX_DEPLOYMENT_TARGET = 10.10;
13481362
METAL_ENABLE_DEBUG_INFO = NO;
13491363
ONLY_ACTIVE_ARCH = NO;
@@ -1361,9 +1375,11 @@
13611375
buildSettings = {
13621376
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
13631377
CLANG_ENABLE_MODULES = YES;
1378+
CURRENT_PROJECT_VERSION = 1.5.0;
13641379
INFOPLIST_FILE = "$(SRCROOT)/SwifterSampleiOS/Info.plist";
13651380
IPHONEOS_DEPLOYMENT_TARGET = 10.12;
13661381
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
1382+
MARKETING_VERSION = 1.5.0;
13671383
PRODUCT_BUNDLE_IDENTIFIER = "pl.kolakowski.${PRODUCT_NAME:rfc1034identifier}";
13681384
PRODUCT_MODULE_NAME = "$(PRODUCT_NAME:c99extidentifier)";
13691385
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
@@ -1381,9 +1397,11 @@
13811397
buildSettings = {
13821398
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
13831399
CLANG_ENABLE_MODULES = YES;
1400+
CURRENT_PROJECT_VERSION = 1.5.0;
13841401
INFOPLIST_FILE = "$(SRCROOT)/SwifterSampleiOS/Info.plist";
13851402
IPHONEOS_DEPLOYMENT_TARGET = 10.12;
13861403
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
1404+
MARKETING_VERSION = 1.5.0;
13871405
PRODUCT_BUNDLE_IDENTIFIER = "pl.kolakowski.${PRODUCT_NAME:rfc1034identifier}";
13881406
PRODUCT_MODULE_NAME = "$(PRODUCT_NAME:c99extidentifier)";
13891407
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";

‎XCode/Swifter.xcodeproj/xcshareddata/xcschemes/SwifterMac.xcscheme‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1110"
3+
LastUpgradeVersion = "1200"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,15 +27,6 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30-
<MacroExpansion>
31-
<BuildableReference
32-
BuildableIdentifier = "primary"
33-
BlueprintIdentifier = "7AE893FA1C0512C400A29F63"
34-
BuildableName = "Swifter.framework"
35-
BlueprintName = "SwifterMac"
36-
ReferencedContainer = "container:Swifter.xcodeproj">
37-
</BuildableReference>
38-
</MacroExpansion>
3930
<Testables>
4031
<TestableReference
4132
skipped = "NO">

‎XCode/Swifter.xcodeproj/xcshareddata/xcschemes/SwifterSampleOSX.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 = "1110"
3+
LastUpgradeVersion = "1200"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎XCode/Swifter.xcodeproj/xcshareddata/xcschemes/SwifteriOS.xcscheme‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1110"
3+
LastUpgradeVersion = "1200"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,15 +27,6 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30-
<MacroExpansion>
31-
<BuildableReference
32-
BuildableIdentifier = "primary"
33-
BlueprintIdentifier = "7AE893E61C05127900A29F63"
34-
BuildableName = "Swifter.framework"
35-
BlueprintName = "SwifteriOS"
36-
ReferencedContainer = "container:Swifter.xcodeproj">
37-
</BuildableReference>
38-
</MacroExpansion>
3930
<Testables>
4031
<TestableReference
4132
skipped = "NO">

‎XCode/Swifter.xcodeproj/xcshareddata/xcschemes/SwifteriOSTests.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 = "1110"
3+
LastUpgradeVersion = "1200"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)