From 27c588a19355f4582eafe8d592bac82892585dca Mon Sep 17 00:00:00 2001 From: yonaskolb Date: Tue, 2 Apr 2019 22:24:08 +1100 Subject: [PATCH 1/7] update default swift version to 5.0 --- SettingPresets/base.yml | 2 +- .../TestProject/Project.xcodeproj/project.pbxproj | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/SettingPresets/base.yml b/SettingPresets/base.yml index 9552b7a0..0cb9ea15 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.2' +SWIFT_VERSION: '5.0' diff --git a/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj b/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj index c64a1531..44956535 100644 --- a/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj +++ b/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj @@ -4132,7 +4132,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = "Production Debug"; @@ -4287,7 +4287,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; VALIDATE_PRODUCT = YES; WATCHOS_DEPLOYMENT_TARGET = 4.0; }; @@ -4356,7 +4356,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; VALIDATE_PRODUCT = YES; WATCHOS_DEPLOYMENT_TARGET = 4.0; }; @@ -4645,7 +4645,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = "Staging Debug"; @@ -4827,7 +4827,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = "Test Debug"; @@ -5028,7 +5028,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; VALIDATE_PRODUCT = YES; WATCHOS_DEPLOYMENT_TARGET = 4.0; }; From 93fb98573283e0b680c3d828526d2582ce1b8163 Mon Sep 17 00:00:00 2001 From: yonaskolb Date: Tue, 2 Apr 2019 22:24:59 +1100 Subject: [PATCH 2/7] use sdk default for SWIFT_OPTIMIZATION_LEVEL in release config (-O) --- SettingPresets/Configs/release.yml | 3 --- Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj | 3 --- 2 files changed, 6 deletions(-) diff --git a/SettingPresets/Configs/release.yml b/SettingPresets/Configs/release.yml index b32b0c58..71664415 100644 --- a/SettingPresets/Configs/release.yml +++ b/SettingPresets/Configs/release.yml @@ -4,6 +4,3 @@ DEBUG_INFORMATION_FORMAT: dwarf-with-dsym ENABLE_NS_ASSERTIONS: NO VALIDATE_PRODUCT: YES - -# Swift Settings -SWIFT_OPTIMIZATION_LEVEL: -Owholemodule diff --git a/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj b/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj index 44956535..ae1f3cd7 100644 --- a/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj +++ b/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj @@ -4286,7 +4286,6 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_VERSION = 5.0; VALIDATE_PRODUCT = YES; WATCHOS_DEPLOYMENT_TARGET = 4.0; @@ -4355,7 +4354,6 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_VERSION = 5.0; VALIDATE_PRODUCT = YES; WATCHOS_DEPLOYMENT_TARGET = 4.0; @@ -5027,7 +5025,6 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_VERSION = 5.0; VALIDATE_PRODUCT = YES; WATCHOS_DEPLOYMENT_TARGET = 4.0; From f69fdb508d5854dca973827ac849ebcf8f01488a Mon Sep 17 00:00:00 2001 From: yonaskolb Date: Tue, 2 Apr 2019 22:25:54 +1100 Subject: [PATCH 3/7] set SWIFT_COMPILATION_MODE in release to wholemodule --- SettingPresets/Configs/release.yml | 3 +++ Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj | 3 +++ 2 files changed, 6 insertions(+) diff --git a/SettingPresets/Configs/release.yml b/SettingPresets/Configs/release.yml index 71664415..ce6d9f24 100644 --- a/SettingPresets/Configs/release.yml +++ b/SettingPresets/Configs/release.yml @@ -4,3 +4,6 @@ DEBUG_INFORMATION_FORMAT: dwarf-with-dsym ENABLE_NS_ASSERTIONS: NO VALIDATE_PRODUCT: YES + +# Swift Settings +SWIFT_COMPILATION_MODE: wholemodule diff --git a/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj b/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj index ae1f3cd7..70985c71 100644 --- a/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj +++ b/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj @@ -4286,6 +4286,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_COMPILATION_MODE = wholemodule; SWIFT_VERSION = 5.0; VALIDATE_PRODUCT = YES; WATCHOS_DEPLOYMENT_TARGET = 4.0; @@ -4354,6 +4355,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_COMPILATION_MODE = wholemodule; SWIFT_VERSION = 5.0; VALIDATE_PRODUCT = YES; WATCHOS_DEPLOYMENT_TARGET = 4.0; @@ -5025,6 +5027,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_COMPILATION_MODE = wholemodule; SWIFT_VERSION = 5.0; VALIDATE_PRODUCT = YES; WATCHOS_DEPLOYMENT_TARGET = 4.0; From 401dd772eb8f34e5a4e299f2e899f2a116ae3e33 Mon Sep 17 00:00:00 2001 From: yonaskolb Date: Tue, 2 Apr 2019 22:34:33 +1100 Subject: [PATCH 4/7] remove ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES --- .../Products/application.watchapp2.yml | 1 - SettingPresets/Products/application.yml | 1 - .../Project.xcodeproj/project.pbxproj | 24 ------------------- 3 files changed, 26 deletions(-) delete mode 100644 SettingPresets/Products/application.watchapp2.yml delete mode 100644 SettingPresets/Products/application.yml diff --git a/SettingPresets/Products/application.watchapp2.yml b/SettingPresets/Products/application.watchapp2.yml deleted file mode 100644 index 19d40c81..00000000 --- a/SettingPresets/Products/application.watchapp2.yml +++ /dev/null @@ -1 +0,0 @@ -ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES: YES diff --git a/SettingPresets/Products/application.yml b/SettingPresets/Products/application.yml deleted file mode 100644 index 19d40c81..00000000 --- a/SettingPresets/Products/application.yml +++ /dev/null @@ -1 +0,0 @@ -ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES: YES diff --git a/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj b/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj index 70985c71..2ca67cc4 100644 --- a/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj +++ b/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj @@ -2138,7 +2138,6 @@ 00FD318C7418F3351FC0074451FC8AF5 /* Test Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/watchOS", @@ -2231,7 +2230,6 @@ 06E4383A2687EAD5877836CD308F610F /* Staging Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; FRAMEWORK_SEARCH_PATHS = ( @@ -2476,7 +2474,6 @@ 196FEEE6C4B0DDE53AD16BD6E5645F0E /* Test Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -2508,7 +2505,6 @@ 20803EC42C26E4EA13474E5A694068D1 /* Production Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/watchOS", @@ -2525,7 +2521,6 @@ 234640A811EF6EB9CC9081CA803A4C19 /* Staging Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = App_iOS/App.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; @@ -2720,7 +2715,6 @@ 3FFEE1ED324166B88F5F9A451E59A29C /* Test Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -2804,7 +2798,6 @@ 4621C6C8A78FBB1CF4078178688742F9 /* Production Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -3001,7 +2994,6 @@ 545342CFDF7810F2EBFFFC5EEE5B87A6 /* Production Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; FRAMEWORK_SEARCH_PATHS = ( @@ -3364,7 +3356,6 @@ 7931F229200F89B8CDC8A5E3B755C52E /* Test Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; FRAMEWORK_SEARCH_PATHS = ( @@ -3398,7 +3389,6 @@ 7B2A1BE6CA654E9903A4C6802DBCE440 /* Staging Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/watchOS", @@ -3604,7 +3594,6 @@ 94295771D06A8E3DC6DCC8ADE73874F7 /* Staging Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = App_iOS/App.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; @@ -3618,7 +3607,6 @@ 943D402E936EC5BD391F9FD0C7D926EA /* Production Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -3675,7 +3663,6 @@ 97009625463EC8B19F53007A9D102A56 /* Staging Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -3721,7 +3708,6 @@ 983ACA9F991B0B18D9760B122B42614C /* Test Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = App_iOS/App.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; @@ -3938,7 +3924,6 @@ AABC1E325EADF86C5137D659051CC749 /* Production Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/watchOS", @@ -3966,7 +3951,6 @@ AE37A01B34B4B956E784082C03DEB579 /* Production Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; FRAMEWORK_SEARCH_PATHS = ( @@ -4028,7 +4012,6 @@ B008685BA25BB8FD771F0AE3B59FA06C /* Staging Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; FRAMEWORK_SEARCH_PATHS = ( @@ -4193,7 +4176,6 @@ BA5AD3137CD90C50E5E1BDA06645F11E /* Production Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = App_iOS/App.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; @@ -4296,7 +4278,6 @@ C4397CDA0D458BAD55C911B0A4DC7868 /* Staging Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/watchOS", @@ -4429,7 +4410,6 @@ CB4F81A519CA89CAF5703DAB428CCE0A /* Test Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = App_iOS/App.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; @@ -4443,7 +4423,6 @@ CBE9D80AD0719511A13A889E867077CC /* Staging Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -4532,7 +4511,6 @@ DC80DC0AF0B4F2B51DAB0A5276F79F05 /* Test Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; FRAMEWORK_SEARCH_PATHS = ( @@ -4554,7 +4532,6 @@ DDECE7D81A63C1C46A08F1F47ACCE4DF /* Production Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = App_iOS/App.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; @@ -4891,7 +4868,6 @@ F3AC6A112F81D0958A316D820549143D /* Test Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/watchOS", From a7613064b45e5149febe89f1ad7d45f95aa4df8c Mon Sep 17 00:00:00 2001 From: yonaskolb Date: Tue, 2 Apr 2019 22:39:59 +1100 Subject: [PATCH 5/7] update latest xcode version to 10.2 --- Sources/XcodeGenKit/Version.swift | 4 ++-- Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj | 4 ++-- .../xcshareddata/xcschemes/App_Scheme.xcscheme | 2 +- .../xcshareddata/xcschemes/App_iOS Production.xcscheme | 2 +- .../xcshareddata/xcschemes/App_iOS Staging.xcscheme | 2 +- .../xcshareddata/xcschemes/App_iOS Test.xcscheme | 2 +- .../xcshareddata/xcschemes/App_macOS.xcscheme | 2 +- .../xcshareddata/xcschemes/App_watchOS.xcscheme | 2 +- .../xcshareddata/xcschemes/Framework.xcscheme | 2 +- .../Project.xcodeproj/xcshareddata/xcschemes/Tool.xcscheme | 2 +- .../xcshareddata/xcschemes/iMessageApp.xcscheme | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Sources/XcodeGenKit/Version.swift b/Sources/XcodeGenKit/Version.swift index 5acef3f1..63904f67 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 ?? "10.0") + return XCodeVersion.parse(options.xcodeVersion ?? "10.2") } var schemeVersion: String { @@ -16,7 +16,7 @@ extension Project { } var objectVersion: UInt { - return 50 + return 51 } public func validateMinimumXcodeGenVersion(_ xcodeGenVersion: Version) throws { diff --git a/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj b/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj index 2ca67cc4..dc91f913 100644 --- a/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj +++ b/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 51; objects = { /* Begin PBXAggregateTarget section */ @@ -1430,7 +1430,7 @@ 0FBAE303E3CFC2ABAC876A7719B30922 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1000; + LastUpgradeCheck = 1020; TargetAttributes = { 020A320BB3736FCDE6CC4E703EE69AC0 = { ProvisioningStyle = Automatic; diff --git a/Tests/Fixtures/TestProject/Project.xcodeproj/xcshareddata/xcschemes/App_Scheme.xcscheme b/Tests/Fixtures/TestProject/Project.xcodeproj/xcshareddata/xcschemes/App_Scheme.xcscheme index b0efd3fd..c9a35a5b 100644 --- a/Tests/Fixtures/TestProject/Project.xcodeproj/xcshareddata/xcschemes/App_Scheme.xcscheme +++ b/Tests/Fixtures/TestProject/Project.xcodeproj/xcshareddata/xcschemes/App_Scheme.xcscheme @@ -1,6 +1,6 @@ Date: Tue, 2 Apr 2019 23:13:37 +1100 Subject: [PATCH 6/7] generate carthage fixture --- .../CarthageProject/Project.xcodeproj/project.pbxproj | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Tests/Fixtures/CarthageProject/Project.xcodeproj/project.pbxproj b/Tests/Fixtures/CarthageProject/Project.xcodeproj/project.pbxproj index af08556f..b809ab72 100644 --- a/Tests/Fixtures/CarthageProject/Project.xcodeproj/project.pbxproj +++ b/Tests/Fixtures/CarthageProject/Project.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 51; objects = { /* Begin PBXBuildFile section */ @@ -312,7 +312,7 @@ 0FBAE303E3CFC2ABAC876A7719B30922 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1000; + LastUpgradeCheck = 1020; }; buildConfigurationList = D91E14E36EC0B415578456F264E0161E /* Build configuration list for PBXProject "Project" */; compatibilityVersion = "Xcode 9.3"; @@ -409,8 +409,8 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.2; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_VERSION = 5.0; VALIDATE_PRODUCT = YES; }; name = Release; @@ -582,7 +582,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Debug; }; From 3a03f0b33839e9b19995c5c31885a29fe8bd815c Mon Sep 17 00:00:00 2001 From: yonaskolb Date: Sat, 6 Apr 2019 20:37:56 +1100 Subject: [PATCH 7/7] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7018e4fa..92643f69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ #### Changed - Updated to xcodeproj 6.7.0 including its performance improvements [#536](https://github.com/yonaskolb/XcodeGen/pull/536) @yonaskolb +- Updated default generated settings for Xcode 10.2 [#555](https://github.com/yonaskolb/XcodeGen/pull/555) @yonaskolb ## 2.4.0