Update to Swift 6

StanfordBDHG · Jan 17, 2025 · bf919b9 · bf919b9
1 parent 97aad47
commit bf919b9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/LLMonFHIR.xcodeproj/project.pbxproj b/LLMonFHIR.xcodeproj/project.pbxproj
@@ -489,7 +489,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
 				LastSwiftUpdateCheck = 1340;
-				LastUpgradeCheck = 1530;
+				LastUpgradeCheck = 1620;
 				TargetAttributes = {
 					653A254C283387FE005D4D48 = {
 						CreatedOnToolsVersion = 13.4;
@@ -769,7 +769,7 @@
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
 				"SWIFT_ELicenseRef-LLMonFHIR_LOC_STRINGS" = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Test;
@@ -787,7 +787,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = edu.stanford.bdhg.llmonfhir.tests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				"SWIFT_ELicenseRef-LLMonFHIR_LOC_STRINGS" = NO;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/LLMonFHIR.app/LLMonFHIR";
 			};
@@ -805,7 +805,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = edu.stanford.bdhg.llmonfhiruitests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				"SWIFT_ELicenseRef-LLMonFHIR_LOC_STRINGS" = NO;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_TARGET_NAME = LLMonFHIR;
 			};
@@ -972,7 +972,7 @@
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
 				"SWIFT_ELicenseRef-LLMonFHIR_LOC_STRINGS" = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -1021,7 +1021,7 @@
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
 				"SWIFT_ELicenseRef-LLMonFHIR_LOC_STRINGS" = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -1039,7 +1039,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = edu.stanford.bdhg.llmonfhir.tests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				"SWIFT_ELicenseRef-LLMonFHIR_LOC_STRINGS" = NO;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/LLMonFHIR.app/LLMonFHIR";
 			};
@@ -1058,7 +1058,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = edu.stanford.bdhg.llmonfhir.tests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				"SWIFT_ELicenseRef-LLMonFHIR_LOC_STRINGS" = NO;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/LLMonFHIR.app/LLMonFHIR";
 			};
@@ -1076,7 +1076,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = edu.stanford.bdhg.llmonfhiruitests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				"SWIFT_ELicenseRef-LLMonFHIR_LOC_STRINGS" = NO;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_TARGET_NAME = LLMonFHIR;
 			};
@@ -1094,7 +1094,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = edu.stanford.bdhg.llmonfhiruitests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				"SWIFT_ELicenseRef-LLMonFHIR_LOC_STRINGS" = NO;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_TARGET_NAME = LLMonFHIR;
 			};

diff --git a/LLMonFHIR.xcodeproj/xcshareddata/xcschemes/LLMonFHIR.xcscheme b/LLMonFHIR.xcodeproj/xcshareddata/xcschemes/LLMonFHIR.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1530"
+   LastUpgradeVersion = "1620"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/LLMonFHIR/Settings/ResourceSelection.swift b/LLMonFHIR/Settings/ResourceSelection.swift
@@ -96,3 +96,8 @@ struct ResourceSelection: View {
         }
     }
 }
+
+/// Necessary `Sendable` conformance for Swift 6 language mode.
+/// This allows the type to be used in concurrent contexts while acknowledging that we take
+/// responsibility for ensuring thread safety, rather than relying on the compiler's verification.
+extension ModelsR4.Bundle: @retroactive @unchecked Sendable {}