Merge pull request #1641 from groue/dev/GRDB7-Swift-6-language-mode

GRDB7: Enable the Swift 6 language mode
groue · Sep 29, 2024 · 4132d02 · 4132d02
2 parents 625c529 + 9302925
commit 4132d02
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 15 deletions.
diff --git a/GRDB.xcodeproj/project.pbxproj b/GRDB.xcodeproj/project.pbxproj
@@ -720,6 +720,7 @@
 		5698AD151DAAD16F0056AF8C /* FTS5Tokenizer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FTS5Tokenizer.swift; sourceTree = "<group>"; };
 		5698AD201DABAEFA0056AF8C /* FTS5WrapperTokenizer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FTS5WrapperTokenizer.swift; sourceTree = "<group>"; };
 		5698AD341DABAF4A0056AF8C /* FTS5CustomTokenizer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FTS5CustomTokenizer.swift; sourceTree = "<group>"; };
+		5698C1C32CA844F4001C0EB0 /* GRDBTests.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = GRDBTests.xcconfig; sourceTree = "<group>"; };
 		569BBA20228DE51800478429 /* AssociationPrefetchingFetchableRecordTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AssociationPrefetchingFetchableRecordTests.swift; sourceTree = "<group>"; };
 		569BBA3522905FFA00478429 /* InflectionsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InflectionsTests.swift; sourceTree = "<group>"; };
 		569BBA4522906A8200478429 /* InflectionsTests.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = InflectionsTests.json; sourceTree = "<group>"; };
@@ -1769,6 +1770,7 @@
 				56C48E731C9A9923005DF1D9 /* module.modulemap */,
 				DC3773F719C8CBB3004FCF85 /* Info.plist */,
 				56B8F49A1B4E2F3600C24296 /* GRDB.xcconfig */,
+				5698C1C32CA844F4001C0EB0 /* GRDBTests.xcconfig */,
 				56C494401ED7255500CC72AF /* GRDBDeploymentTarget.xcconfig */,
 			);
 			name = "Supporting Files";
@@ -2344,7 +2346,7 @@
 /* Begin XCBuildConfiguration section */
 		56E5D8021B4D422E00430942 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 56C494401ED7255500CC72AF /* GRDBDeploymentTarget.xcconfig */;
+			baseConfigurationReference = 5698C1C32CA844F4001C0EB0 /* GRDBTests.xcconfig */;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_WEAK = YES;
@@ -2374,7 +2376,7 @@
 		};
 		56E5D8031B4D422E00430942 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 56C494401ED7255500CC72AF /* GRDBDeploymentTarget.xcconfig */;
+			baseConfigurationReference = 5698C1C32CA844F4001C0EB0 /* GRDBTests.xcconfig */;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_WEAK = YES;

diff --git a/GRDB/Fixits.swift b/GRDB/Fixits.swift
@@ -1,5 +1,4 @@
 // Fixits for changes introduced by GRDB 7.0.0
-// swiftlint:disable all
 
 extension Configuration {
     @available(*, unavailable, message: "The default transaction kind is now automatically managed.")

diff --git a/GRDB/Record/Record.swift b/GRDB/Record/Record.swift
@@ -4,7 +4,9 @@
 ///
 /// ## Overview
 ///
-/// - warning: `Record` is a legacy GRDB type. Since GRDB 7, it is not recommended to define record types by subclassing the `Record` class. See <doc:SwiftConcurrency> for more information.
+/// - warning: `Record` is a legacy GRDB type. Since GRDB 7, it is not
+///   recommended to define record types by subclassing the `Record` class.
+///   See <doc:SwiftConcurrency> for more information.
 ///
 /// ## Topics
 ///

diff --git a/Package.swift b/Package.swift
@@ -6,15 +6,10 @@ import PackageDescription
 
 var swiftSettings: [SwiftSetting] = [
     .define("SQLITE_ENABLE_FTS5"),
-    .enableUpcomingFeature("InferSendableFromCaptures"),
-    .enableUpcomingFeature("GlobalActorIsolatedTypesUsability"),
 ]
 var cSettings: [CSetting] = []
 var dependencies: [PackageDescription.Package.Dependency] = []
 
-// For Swift 5.8+
-//swiftSettings.append(.enableUpcomingFeature("ExistentialAny"))
-
 // Don't rely on those environment variables. They are ONLY testing conveniences:
 // $ SQLITE_ENABLE_PREUPDATE_HOOK=1 make test_SPM
 if ProcessInfo.processInfo.environment["SQLITE_ENABLE_PREUPDATE_HOOK"] == "1" {
@@ -81,7 +76,12 @@ let package = Package(
                 .copy("GRDBTests/Issue1383.sqlite"),
             ],
             cSettings: cSettings,
-            swiftSettings: swiftSettings)
+            swiftSettings: swiftSettings + [
+                // Tests still use the Swift 5 language mode.
+                .swiftLanguageMode(.v5),
+                .enableUpcomingFeature("InferSendableFromCaptures"),
+                .enableUpcomingFeature("GlobalActorIsolatedTypesUsability"),
+            ])
     ],
-    swiftLanguageModes: [.v5]
+    swiftLanguageModes: [.v6]
 )
diff --git a/SQLiteCustom/GRDB.xcconfig b/SQLiteCustom/GRDB.xcconfig
@@ -13,3 +13,4 @@ OTHER_CFLAGS = -DUSING_BUILTIN_SQLITE -DGRDBCUSTOMSQLITE $(CUSTOM_SQLLIBRARY_CFL
 GCC_PREPROCESSOR_DEFINITIONS = "GRDBCUSTOMSQLITE=1"
 OTHER_SWIFT_FLAGS = -D USING_BUILTIN_SQLITE -D GRDBCUSTOMSQLITE $(CUSTOM_OTHER_SWIFT_FLAGS)
 HEADER_SEARCH_PATHS = $(SRCROOT)/SQLiteCustom/src
+SWIFT_VERSION = 6.0
diff --git a/SQLiteCustom/GRDBCustomSQLite-Testing.xcconfig b/SQLiteCustom/GRDBCustomSQLite-Testing.xcconfig
@@ -10,3 +10,7 @@ CUSTOM_OTHER_SWIFT_FLAGS=   // do not modify
 
 OTHER_CFLAGS = -DUSING_BUILTIN_SQLITE -DGRDBCUSTOMSQLITE $(CUSTOM_SQLLIBRARY_CFLAGS)        // Do not modify.
 OTHER_SWIFT_FLAGS = -D USING_BUILTIN_SQLITE -D GRDBCUSTOMSQLITE $(CUSTOM_OTHER_SWIFT_FLAGS)  // Do not modify.
+
+// Tests still use the Swift 5 language mode.
+SWIFT_UPCOMING_FEATURE_INFER_SENDABLE_FROM_CAPTURES = YES
+OTHER_SWIFT_FLAGS = $(inherited) -enable-upcoming-feature GlobalActorIsolatedTypesUsability
diff --git a/SQLiteCustom/GRDBDeploymentTarget.xcconfig b/SQLiteCustom/GRDBDeploymentTarget.xcconfig
@@ -2,5 +2,3 @@ IPHONEOS_DEPLOYMENT_TARGET = 13.0
 MACOSX_DEPLOYMENT_TARGET = 10.15
 TVOS_DEPLOYMENT_TARGET = 13.0
 WATCHOS_DEPLOYMENT_TARGET = 7.0
-SWIFT_UPCOMING_FEATURE_INFER_SENDABLE_FROM_CAPTURES = YES
-OTHER_SWIFT_FLAGS = $(inherited) -enable-upcoming-feature GlobalActorIsolatedTypesUsability
diff --git a/Support/GRDB.xcconfig b/Support/GRDB.xcconfig
@@ -3,6 +3,7 @@ INFOPLIST_FILE = Support/Info.plist
 PRODUCT_NAME = GRDB
 PRODUCT_BUNDLE_IDENTIFIER = com.github.groue.$(PRODUCT_NAME:rfc1034identifier)
 MODULEMAP_FILE = $(SRCROOT)/Support/module.modulemap
+SWIFT_VERSION = 6.0
 
 // Slow compilation hunt:
 // OTHER_SWIFT_FLAGS = $(inherited) -Xfrontend -warn-long-expression-type-checking=100 -Xfrontend -warn-long-function-bodies=100

diff --git a/Support/GRDBDeploymentTarget.xcconfig b/Support/GRDBDeploymentTarget.xcconfig
@@ -3,8 +3,6 @@ MACOSX_DEPLOYMENT_TARGET = 10.15
 TVOS_DEPLOYMENT_TARGET = 13.0
 WATCHOS_DEPLOYMENT_TARGET = 7.0
 OTHER_SWIFT_FLAGS = $(inherited) -D SQLITE_ENABLE_FTS5
-SWIFT_UPCOMING_FEATURE_INFER_SENDABLE_FROM_CAPTURES = YES
-OTHER_SWIFT_FLAGS = $(inherited) -enable-upcoming-feature GlobalActorIsolatedTypesUsability
 
 //// Compile with all opt-in APIs
 //GCC_PREPROCESSOR_DEFINITIONS = $(inherited) GRDB_SQLITE_ENABLE_PREUPDATE_HOOK=1

diff --git a/Support/GRDBTests.xcconfig b/Support/GRDBTests.xcconfig
@@ -0,0 +1,5 @@
+#include "GRDBDeploymentTarget.xcconfig"
+
+// Tests still use the Swift 5 language mode.
+SWIFT_UPCOMING_FEATURE_INFER_SENDABLE_FROM_CAPTURES = YES
+OTHER_SWIFT_FLAGS = $(inherited) -enable-upcoming-feature GlobalActorIsolatedTypesUsability