From 55e9007365aa9af90d8319ee41dffb644e8e2d0b Mon Sep 17 00:00:00 2001
From: Tim Bert <5411131+timbms@users.noreply.github.com>
Date: Wed, 30 Oct 2024 16:17:33 +0100
Subject: [PATCH] Update to recommended settings for
 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES

Signed-off-by: Tim Bert <5411131+timbms@users.noreply.github.com>
---
 openHAB.xcodeproj/project.pbxproj                     | 10 +---------
 .../xcshareddata/xcschemes/openHAB.xcscheme           |  2 +-
 .../xcshareddata/xcschemes/openHABTestsSwift.xcscheme | 11 +----------
 .../xcshareddata/xcschemes/openHABUITests.xcscheme    |  2 +-
 .../xcschemes/openHABWatch (Notification).xcscheme    |  2 +-
 .../xcshareddata/xcschemes/openHABWatch.xcscheme      |  2 +-
 .../openHABWatchSwift (Complication).xcscheme         |  2 +-
 7 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/openHAB.xcodeproj/project.pbxproj b/openHAB.xcodeproj/project.pbxproj
index 555c69d01..f2b0e906a 100644
--- a/openHAB.xcodeproj/project.pbxproj
+++ b/openHAB.xcodeproj/project.pbxproj
@@ -1212,7 +1212,7 @@
 				BuildIndependentTargetsInParallel = YES;
 				CLASSPREFIX = OpenHAB;
 				LastSwiftUpdateCheck = 1540;
-				LastUpgradeCheck = 1500;
+				LastUpgradeCheck = 1610;
 				ORGANIZATIONNAME = "openHAB e.V.";
 				TargetAttributes = {
 					4D6470D22561F935007B03FC = {
@@ -1840,7 +1840,6 @@
 		933D7F0B22E7015100621A03 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "$(inherited)";
@@ -1884,7 +1883,6 @@
 		933D7F0C22E7015100621A03 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "$(inherited)";
@@ -1927,7 +1925,6 @@
 		DA07753C2346705F0086C685 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication;
 				CLANG_ANALYZER_NONNULL = YES;
@@ -1979,7 +1976,6 @@
 		DA07753D2346705F0086C685 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication;
 				CLANG_ANALYZER_NONNULL = YES;
@@ -2033,7 +2029,6 @@
 		DA2DC23621F2736D00830730 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -2074,7 +2069,6 @@
 		DA2DC23721F2736D00830730 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -2388,7 +2382,6 @@
 		DFB2625D18830A3600D3244D /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_CXX_LANGUAGE_STANDARD = "$(inherited)";
 				CLANG_ENABLE_MODULES = YES;
@@ -2433,7 +2426,6 @@
 		DFB2625E18830A3600D3244D /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_CXX_LANGUAGE_STANDARD = "$(inherited)";
 				CLANG_ENABLE_MODULES = YES;
diff --git a/openHAB.xcodeproj/xcshareddata/xcschemes/openHAB.xcscheme b/openHAB.xcodeproj/xcshareddata/xcschemes/openHAB.xcscheme
index bd46b5166..8475457e2 100644
--- a/openHAB.xcodeproj/xcshareddata/xcschemes/openHAB.xcscheme
+++ b/openHAB.xcodeproj/xcshareddata/xcschemes/openHAB.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1610"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/openHAB.xcodeproj/xcshareddata/xcschemes/openHABTestsSwift.xcscheme b/openHAB.xcodeproj/xcshareddata/xcschemes/openHABTestsSwift.xcscheme
index fe6338d6f..cce89b723 100644
--- a/openHAB.xcodeproj/xcshareddata/xcschemes/openHABTestsSwift.xcscheme
+++ b/openHAB.xcodeproj/xcshareddata/xcschemes/openHABTestsSwift.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1610"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -63,15 +63,6 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "DA2DC22E21F2736C00830730"
-            BuildableName = "openHABTestsSwift.xctest"
-            BlueprintName = "openHABTestsSwift"
-            ReferencedContainer = "container:openHAB.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">
diff --git a/openHAB.xcodeproj/xcshareddata/xcschemes/openHABUITests.xcscheme b/openHAB.xcodeproj/xcshareddata/xcschemes/openHABUITests.xcscheme
index b134560e5..e5722b204 100644
--- a/openHAB.xcodeproj/xcshareddata/xcschemes/openHABUITests.xcscheme
+++ b/openHAB.xcodeproj/xcshareddata/xcschemes/openHABUITests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1610"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/openHAB.xcodeproj/xcshareddata/xcschemes/openHABWatch (Notification).xcscheme b/openHAB.xcodeproj/xcshareddata/xcschemes/openHABWatch (Notification).xcscheme
index 45cfdeb6b..dd9c28004 100644
--- a/openHAB.xcodeproj/xcshareddata/xcschemes/openHABWatch (Notification).xcscheme	
+++ b/openHAB.xcodeproj/xcshareddata/xcschemes/openHABWatch (Notification).xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1610"
    version = "2.0">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/openHAB.xcodeproj/xcshareddata/xcschemes/openHABWatch.xcscheme b/openHAB.xcodeproj/xcshareddata/xcschemes/openHABWatch.xcscheme
index a544d63ff..eedf9ac77 100644
--- a/openHAB.xcodeproj/xcshareddata/xcschemes/openHABWatch.xcscheme
+++ b/openHAB.xcodeproj/xcshareddata/xcschemes/openHABWatch.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1610"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/openHAB.xcodeproj/xcshareddata/xcschemes/openHABWatchSwift (Complication).xcscheme b/openHAB.xcodeproj/xcshareddata/xcschemes/openHABWatchSwift (Complication).xcscheme
index 67a5ec76b..bb20cd0ff 100644
--- a/openHAB.xcodeproj/xcshareddata/xcschemes/openHABWatchSwift (Complication).xcscheme	
+++ b/openHAB.xcodeproj/xcshareddata/xcschemes/openHABWatchSwift (Complication).xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1610"
    version = "2.0">
    <BuildAction
       parallelizeBuildables = "YES"