From 274ce35782dc88a8efcda469f8930d2e9aaffd50 Mon Sep 17 00:00:00 2001 From: Randal Erman Date: Thu, 4 Apr 2019 15:08:13 -0700 Subject: [PATCH] Updates project to Swift 5.0. Updates gitignore to remove xcshareddata. Updates to default language english --- .gitignore | 10 ++++++++++ ELWebService.xcodeproj/project.pbxproj | 20 +++++++++----------- README.md | 2 +- Source/Core/Request.swift | 8 ++++---- Source/Info.plist | 2 +- 5 files changed, 25 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 2b28e39..5e22cf0 100755 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ # Xcode # build/ +DerivedData/ + *.pbxuser !default.pbxuser *.mode1v3 @@ -17,3 +19,11 @@ DerivedData *.ipa *.xcuserstate .DS_Store + + +### Xcode Patch ### +*.xcodeproj/* +!*.xcodeproj/project.pbxproj +!*.xcodeproj/xcshareddata/ +!*.xcworkspace/contents.xcworkspacedata +/*.gcno diff --git a/ELWebService.xcodeproj/project.pbxproj b/ELWebService.xcodeproj/project.pbxproj index 3b26787..84b5da0 100755 --- a/ELWebService.xcodeproj/project.pbxproj +++ b/ELWebService.xcodeproj/project.pbxproj @@ -278,7 +278,7 @@ TargetAttributes = { 17088ED01C5010EA007ADE1B = { CreatedOnToolsVersion = 7.2; - LastSwiftMigration = 0920; + LastSwiftMigration = 1020; }; 179C5C5D1AB079980047169F = { CreatedOnToolsVersion = 6.3; @@ -288,10 +288,11 @@ }; buildConfigurationList = 179C5C581AB079980047169F /* Build configuration list for PBXProject "ELWebService" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 179C5C541AB079980047169F; productRefGroup = 179C5C5F1AB079980047169F /* Products */; @@ -407,8 +408,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "ELWebServiceTests/ELWebServiceTests-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -422,8 +422,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.electrode.ELWebServiceTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "ELWebServiceTests/ELWebServiceTests-Bridging-Header.h"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -555,7 +554,7 @@ PRODUCT_NAME = ELWebService; SKIP_INSTALL = YES; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -576,7 +575,7 @@ PRODUCT_NAME = ELWebService; SKIP_INSTALL = YES; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -712,7 +711,7 @@ PRODUCT_NAME = ELWebService; SKIP_INSTALL = YES; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = QADeployment; }; @@ -727,8 +726,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "ELWebServiceTests/ELWebServiceTests-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = QADeployment; }; diff --git a/README.md b/README.md index a46fecf..b81f5f0 100755 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ ELWebService is an HTTP framework for Swift built on Foundation's `URLSession`. ## Requirements -ELWebService requires Swift 4 and Xcode 9.2. +ELWebService requires Swift 5 and Xcode 10.2. ## Installation diff --git a/Source/Core/Request.swift b/Source/Core/Request.swift index f6c3e89..aa77d0f 100755 --- a/Source/Core/Request.swift +++ b/Source/Core/Request.swift @@ -155,10 +155,10 @@ public struct Request { The HTTP header fields of the request. Each key/value pair represents a HTTP header field value using the key as the field name. */ - internal(set) var headers = [String : String]() + var headers = [String : String]() /// The cache policy of the request. See NSURLRequestCachePolicy. - internal(set) var cachePolicy = NSURLRequest.CachePolicy.useProtocolCachePolicy + var cachePolicy = NSURLRequest.CachePolicy.useProtocolCachePolicy /// The type of parameter encoding to use when encoding request parameters. public var parameterEncoding = ParameterEncoding.percent { @@ -170,13 +170,13 @@ public struct Request { } /// The HTTP `Content-Type` header field value of the request. - internal(set) var contentType: String? { + var contentType: String? { set { headers[Headers.contentType] = newValue } get { return headers[Headers.contentType] } } /// The HTTP `User-Agent` header field value of the request. - internal(set) var userAgent: String? { + var userAgent: String? { set { headers[Headers.userAgent] = newValue } get { return headers[Headers.userAgent] } } diff --git a/Source/Info.plist b/Source/Info.plist index 8980a5a..4e1a045 100755 --- a/Source/Info.plist +++ b/Source/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 6.7.0 + 6.8.0 CFBundleSignature ???? CFBundleVersion