From 6a56f9812082c4d61c22a48e12f96752fa3ccee7 Mon Sep 17 00:00:00 2001 From: Victor Sigler Date: Mon, 4 Nov 2019 23:25:51 -0500 Subject: [PATCH] Update the project for Xcode 11.1 * Update the `Gemfile` dependencies * Update the Xcode version in the `config.yml` file --- .circleci/config.yml | 6 +- .gitignore | 1 + CHANGELOG.md | 1 + Gemfile.lock | 34 ++++---- XCode/Swifter.xcodeproj/project.pbxproj | 20 ++--- .../xcschemes/SwifterMac.xcscheme | 24 +++--- .../xcschemes/SwifterSampleOSX.xcscheme | 78 +++++++++++++++++++ .../xcschemes/SwifteriOS.xcscheme | 24 +++--- .../xcschemes/SwifteriOSTests.xcscheme | 6 +- .../xcschemes/SwiftermacOSTests.xcscheme | 6 +- .../xcschemes/SwiftertvOS.xcscheme | 24 +++--- .../xcschemes/SwiftertvOSTests.xcscheme | 6 +- 12 files changed, 144 insertions(+), 86 deletions(-) create mode 100644 XCode/Swifter.xcodeproj/xcshareddata/xcschemes/SwifterSampleOSX.xcscheme diff --git a/.circleci/config.yml b/.circleci/config.yml index 45fcee64..1e100656 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,12 +4,12 @@ jobs: Danger: macos: - xcode: 10.2.0 + xcode: 11.1.0 steps: - checkout - run: name: Set Ruby Version - command: echo "ruby-2.4" > ~/.ruby-version + command: echo "ruby-2.5.6" > ~/.ruby-version - restore_cache: key: 1-gems-{{ checksum "Gemfile.lock" }} - run: @@ -31,7 +31,7 @@ jobs: TEST_REPORTS: /tmp/test-results LANG: en_US.UTF-8 macos: - xcode: 10.2.0 + xcode: 11.1.0 steps: - checkout - run: diff --git a/.gitignore b/.gitignore index 5803dbf8..239c7866 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ DerivedData .build/ Packages/ +/XCode/.DS_Store diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d4f9ddc..3694c5dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ All notable changes to this project will be documented in this file. Changes not ## Added - 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) +- Update the project for Xcode 11.1. ([#438](https://github.com/httpswift/swifter/pull/438)) by [@Vkt0r](https://github.com/Vkt0r) ## Changed diff --git a/Gemfile.lock b/Gemfile.lock index c01e6ec4..4dbb0fe3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,9 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) - claide (1.0.2) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + claide (1.0.3) claide-plugins (0.9.2) cork nap @@ -11,46 +11,46 @@ GEM colored2 (3.1.2) cork (0.3.0) colored2 (~> 3.1) - danger (6.0.6) + danger (6.1.0) claide (~> 1.0) claide-plugins (>= 0.9.2) colored2 (~> 3.1) cork (~> 0.1) faraday (~> 0.9) - faraday-http-cache (~> 1.0) + faraday-http-cache (~> 2.0) git (~> 1.5) kramdown (~> 2.0) kramdown-parser-gfm (~> 1.0) no_proxy_fix octokit (~> 4.7) terminal-table (~> 1) - danger-swiftlint (0.20.1) + danger-swiftlint (0.23.0) danger rake (> 10) thor (~> 0.19) - faraday (0.15.4) + faraday (0.17.0) multipart-post (>= 1.2, < 3) - faraday-http-cache (1.3.1) + faraday-http-cache (2.0.0) faraday (~> 0.8) git (1.5.0) kramdown (2.1.0) - kramdown-parser-gfm (1.0.1) + kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - multipart-post (2.0.0) + multipart-post (2.1.1) nap (1.1.0) no_proxy_fix (0.1.2) octokit (4.14.0) sawyer (~> 0.8.0, >= 0.5.3) open4 (1.3.4) - public_suffix (3.0.3) - rake (12.3.2) - sawyer (0.8.1) - addressable (>= 2.3.5, < 2.6) - faraday (~> 0.8, < 1.0) + public_suffix (4.0.1) + rake (13.0.0) + sawyer (0.8.2) + addressable (>= 2.3.5) + faraday (> 0.8, < 2.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) thor (0.20.3) - unicode-display_width (1.5.0) + unicode-display_width (1.6.0) PLATFORMS ruby @@ -60,4 +60,4 @@ DEPENDENCIES danger-swiftlint BUNDLED WITH - 1.16.5 + 1.17.2 diff --git a/XCode/Swifter.xcodeproj/project.pbxproj b/XCode/Swifter.xcodeproj/project.pbxproj index ee198128..3f051ff4 100644 --- a/XCode/Swifter.xcodeproj/project.pbxproj +++ b/XCode/Swifter.xcodeproj/project.pbxproj @@ -629,7 +629,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1010; - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1110; ORGANIZATIONNAME = "Damian KoĊ‚akowski"; TargetAttributes = { 043660C121FED34100497989 = { @@ -655,11 +655,11 @@ }; 7C839B6D19422CFF003A6950 = { CreatedOnToolsVersion = 6.0; - LastSwiftMigration = 1000; + LastSwiftMigration = 1110; }; 7CA4813A19A2EA8D0030B30D = { CreatedOnToolsVersion = 6.0; - LastSwiftMigration = 1000; + LastSwiftMigration = 1110; }; 7CCD875B1C66099B0068099B = { CreatedOnToolsVersion = 7.2; @@ -1371,7 +1371,7 @@ SWIFT_COMPILATION_MODE = singlefile; SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -1390,7 +1390,7 @@ SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OBJC_BRIDGING_HEADER = ""; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; @@ -1398,8 +1398,9 @@ 7CA4813F19A2EA8D0030B30D /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = "-"; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "$(inherited)", @@ -1411,22 +1412,23 @@ SDKROOT = macosx; SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Debug; }; 7CA4814019A2EA8D0030B30D /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = "-"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; SWIFT_OBJC_BRIDGING_HEADER = ""; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Release; }; diff --git a/XCode/Swifter.xcodeproj/xcshareddata/xcschemes/SwifterMac.xcscheme b/XCode/Swifter.xcodeproj/xcshareddata/xcschemes/SwifterMac.xcscheme index b1472c40..b38be005 100644 --- a/XCode/Swifter.xcodeproj/xcshareddata/xcschemes/SwifterMac.xcscheme +++ b/XCode/Swifter.xcodeproj/xcshareddata/xcschemes/SwifterMac.xcscheme @@ -1,6 +1,6 @@ + + + + @@ -39,17 +48,6 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/XCode/Swifter.xcodeproj/xcshareddata/xcschemes/SwifteriOS.xcscheme b/XCode/Swifter.xcodeproj/xcshareddata/xcschemes/SwifteriOS.xcscheme index 19001a69..b5413b4d 100644 --- a/XCode/Swifter.xcodeproj/xcshareddata/xcschemes/SwifteriOS.xcscheme +++ b/XCode/Swifter.xcodeproj/xcshareddata/xcschemes/SwifteriOS.xcscheme @@ -1,6 +1,6 @@ + + + + @@ -39,17 +48,6 @@ - - - - - - - - - - - - - - - - + + + + @@ -39,17 +48,6 @@ - - - - - - - - - - - -