From 839bfa13c1b43c337c7f6c902b21e81fde506d08 Mon Sep 17 00:00:00 2001 From: Yonas Kolb Date: Thu, 18 Oct 2018 23:20:00 +1100 Subject: [PATCH 1/3] change generated versions to xcode 10 and swift 4.2 --- SettingPresets/base.yml | 2 +- Sources/XcodeGenKit/Version.swift | 2 +- .../Fixtures/TestProject/App_iOS/AppDelegate.swift | 2 +- .../TestProject/Project.xcodeproj/project.pbxproj | 14 +++++++------- .../xcschemes/App_iOS Production.xcscheme | 2 +- .../xcschemes/App_iOS Staging.xcscheme | 2 +- .../xcshareddata/xcschemes/App_iOS Test.xcscheme | 2 +- .../xcshareddata/xcschemes/App_watchOS.xcscheme | 2 +- .../xcshareddata/xcschemes/Framework.xcscheme | 2 +- .../xcshareddata/xcschemes/iMessageApp.xcscheme | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/SettingPresets/base.yml b/SettingPresets/base.yml index 3722c640..9552b7a0 100644 --- a/SettingPresets/base.yml +++ b/SettingPresets/base.yml @@ -42,4 +42,4 @@ GCC_WARN_UNUSED_VARIABLE: YES # Swift Settings PRODUCT_NAME: $(TARGET_NAME) -SWIFT_VERSION: '4.0' +SWIFT_VERSION: '4.2' diff --git a/Sources/XcodeGenKit/Version.swift b/Sources/XcodeGenKit/Version.swift index 7fdeee10..d37cebab 100644 --- a/Sources/XcodeGenKit/Version.swift +++ b/Sources/XcodeGenKit/Version.swift @@ -4,7 +4,7 @@ import ProjectSpec extension Project { var xcodeVersion: String { - return XCodeVersion.parse(options.xcodeVersion ?? "9.3") + return XCodeVersion.parse(options.xcodeVersion ?? "10.0") } var schemeVersion: String { diff --git a/Tests/Fixtures/TestProject/App_iOS/AppDelegate.swift b/Tests/Fixtures/TestProject/App_iOS/AppDelegate.swift index 3116cdbf..2c79185e 100644 --- a/Tests/Fixtures/TestProject/App_iOS/AppDelegate.swift +++ b/Tests/Fixtures/TestProject/App_iOS/AppDelegate.swift @@ -6,7 +6,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { var window: UIWindow? - func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool { + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { // Override point for customization after application launch. _ = FrameworkStruct() // Standalone files added to project by path-to-file. diff --git a/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj b/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj index b21a0ae5..f5691c5d 100644 --- a/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj +++ b/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj @@ -1365,7 +1365,7 @@ P_88EC38DC1E39C9039D2FA49EDC2FA124 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1000; TargetAttributes = { AT_D40C01B2BAD29EDEA392714DFB69FE8F = { CUSTOM = value; @@ -2363,7 +2363,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; VALIDATE_PRODUCT = YES; WATCHOS_DEPLOYMENT_TARGET = 4.0; }; @@ -2458,7 +2458,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = "Production Debug"; @@ -3106,7 +3106,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; VALIDATE_PRODUCT = YES; WATCHOS_DEPLOYMENT_TARGET = 4.0; }; @@ -3703,7 +3703,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = "Staging Debug"; @@ -3898,7 +3898,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; VALIDATE_PRODUCT = YES; WATCHOS_DEPLOYMENT_TARGET = 4.0; }; @@ -4700,7 +4700,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = "Test Debug"; diff --git a/Tests/Fixtures/TestProject/Project.xcodeproj/xcshareddata/xcschemes/App_iOS Production.xcscheme b/Tests/Fixtures/TestProject/Project.xcodeproj/xcshareddata/xcschemes/App_iOS Production.xcscheme index 3c8c9251..0d8babba 100644 --- a/Tests/Fixtures/TestProject/Project.xcodeproj/xcshareddata/xcschemes/App_iOS Production.xcscheme +++ b/Tests/Fixtures/TestProject/Project.xcodeproj/xcshareddata/xcschemes/App_iOS Production.xcscheme @@ -1,6 +1,6 @@ Date: Thu, 18 Oct 2018 23:28:21 +1100 Subject: [PATCH 2/3] Remove swift 4.1 from CI tests --- .circleci/config.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 14b4cb35..f1edcc7f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,13 +1,5 @@ version: 2 jobs: - macOS_swift_4.1: - macos: - xcode: "9.4.0" - steps: - - checkout - - run: - name: Build Test Project - command: ./build-fixtures.sh macOS_swift_4.2: macos: xcode: "10.0.0" @@ -32,5 +24,4 @@ workflows: version: 2 workflow: jobs: - - macOS_swift_4.1 - macOS_swift_4.2 From 84182d86b868bae7e962a5f071b13932405bd287 Mon Sep 17 00:00:00 2001 From: Yonas Kolb Date: Thu, 18 Oct 2018 23:32:44 +1100 Subject: [PATCH 3/3] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c2e35b4..e1adcb17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - Upgraded to xcodeproj 6 [#388](https://github.com/yonaskolb/XcodeGen/pull/388) @yonaskolb - Upgraded to Swift 4.2 [#388](https://github.com/yonaskolb/XcodeGen/pull/388) @yonaskolb - Remove iOS codesigning sdk restriction in setting preset [#414](https://github.com/yonaskolb/XcodeGen/pull/414) @yonaskolb +- Changed default project version to Xcode 10.0 and default Swift version to 4.2 [#423](https://github.com/yonaskolb/XcodeGen/pull/423) @yonaskolb #### Fixed - Fixed code signing issues [#414](https://github.com/yonaskolb/XcodeGen/pull/414) @yonaskolb