From 79f1ffec2e8eaa26423e4ba0a9f18455aa4f8c46 Mon Sep 17 00:00:00 2001 From: ed Date: Fri, 16 Jul 2021 10:15:10 +0100 Subject: [PATCH] Projucer: Migrate old iOS deployment target setting --- .../ProjectSaving/jucer_ProjectExport_Xcode.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h index 9c1781f12a..76f5a3a633 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h @@ -953,21 +953,22 @@ protected: void updateOldSDKDefaults() { - if (config[Ids::iosCompatibility].toString() == "default") iosDeploymentTarget.resetToDefault(); - if (macOSArchitecture.get() == "default") macOSArchitecture.resetToDefault(); + if (macOSArchitecture.get() == "default") + macOSArchitecture.resetToDefault(); - const auto updateSDKString = [this] (const Identifier& propertyName, ValueWithDefault& value) + const auto updateSDKString = [this] (const Identifier& propertyName, ValueWithDefault& value, const String& suffix) { auto sdkString = config[propertyName].toString(); if (sdkString == "default") value.resetToDefault(); - else if (sdkString.isNotEmpty() && sdkString.contains (" SDK")) - value = sdkString.upToFirstOccurrenceOf (" SDK", false, false); + else if (sdkString.isNotEmpty() && sdkString.endsWith (suffix)) + value = sdkString.upToLastOccurrenceOf (suffix, false, false); }; - updateSDKString (Ids::osxSDK, macOSBaseSDK); - updateSDKString (Ids::osxCompatibility, macOSDeploymentTarget); + updateSDKString (Ids::osxSDK, macOSBaseSDK, " SDK"); + updateSDKString (Ids::osxCompatibility, macOSDeploymentTarget, " SDK"); + updateSDKString (Ids::iosCompatibility, iosDeploymentTarget, {}); } };