groue · CrownedPhoenix · Nov 6, 2025 · Nov 6, 2025
diff --git a/GRDB/Core/Configuration.swift b/GRDB/Core/Configuration.swift
@@ -13,8 +13,9 @@ import GRDBSQLite
 #if !canImport(Darwin)
 @preconcurrency
 #endif
-import Dispatch
-import Foundation
+import struct Dispatch.DispatchQoS
+import class Dispatch.DispatchQueue
+
 
 public struct Configuration: Sendable {
 

diff --git a/GRDB/Core/Database+Statements.swift b/GRDB/Core/Database+Statements.swift
@@ -10,7 +10,7 @@ import SQLite3
 import GRDBSQLite
 #endif
 
-import Foundation
+
 
 extension Database {
 

diff --git a/GRDB/Core/Database.swift b/GRDB/Core/Database.swift
@@ -10,7 +10,11 @@ import SQLite3
 import GRDBSQLite
 #endif
 
-import Foundation
+import struct Foundation.Date
+import class Foundation.FileManager
+import struct Foundation.URL
+import struct Foundation.TimeInterval
+import struct Foundation.Notification
 
 /// A raw SQLite connection, suitable for the SQLite C API.
 public typealias SQLiteConnection = OpaquePointer

diff --git a/GRDB/Core/DatabaseCollation.swift b/GRDB/Core/DatabaseCollation.swift
@@ -10,7 +10,7 @@ import SQLite3
 import GRDBSQLite
 #endif
 
-import Foundation
+import enum Foundation.ComparisonResult
 
 /// `DatabaseCollation` is a custom string comparison function used by SQLite.
 ///

diff --git a/GRDB/Core/DatabaseError.swift b/GRDB/Core/DatabaseError.swift
@@ -10,7 +10,9 @@ import SQLite3
 import GRDBSQLite
 #endif
 
-import Foundation
+import protocol Foundation.CustomNSError
+import var Foundation.NSLocalizedDescriptionKey
+import var Foundation.NSLocalizedFailureReasonErrorKey
 
 /// An SQLite result code.
 ///

diff --git a/GRDB/Core/DatabasePool.swift b/GRDB/Core/DatabasePool.swift
@@ -1,5 +1,7 @@
-import Dispatch
-import Foundation
+
+import protocol Foundation.NSObjectProtocol
+import class Foundation.NotificationCenter
+import class Foundation.DispatchSemaphore
 #if os(iOS)
 import UIKit
 #endif

diff --git a/GRDB/Core/DatabaseQueue.swift b/GRDB/Core/DatabaseQueue.swift
@@ -1,4 +1,5 @@
-import Foundation
+import protocol Foundation.NSObjectProtocol
+import class Foundation.NotificationCenter
 
 #if os(iOS)
 import UIKit

diff --git a/GRDB/Core/DatabaseReader.swift b/GRDB/Core/DatabaseReader.swift
@@ -1,7 +1,8 @@
 #if canImport(Combine)
 import Combine
+import class Dispatch.DispatchQueue
 #endif
-import Dispatch
+
 
 /// A type that reads from an SQLite database.
 ///

diff --git a/GRDB/Core/DatabaseRegionObservation.swift b/GRDB/Core/DatabaseRegionObservation.swift
@@ -1,7 +1,7 @@
 #if canImport(Combine)
 import Combine
 #endif
-import Foundation
+import class Foundation.NSRecursiveLock
 
 public struct DatabaseRegionObservation: Sendable {
     /// A closure that is evaluated when the observation starts, and returns

diff --git a/GRDB/Core/DatabaseSnapshot.swift b/GRDB/Core/DatabaseSnapshot.swift
@@ -1,4 +1,4 @@
-import Dispatch
+ 
 
 /// A database connection that serializes accesses to an unchanging
 /// database content, as it existed at the moment the snapshot was created.

diff --git a/GRDB/Core/DatabaseValue.swift b/GRDB/Core/DatabaseValue.swift
@@ -10,7 +10,7 @@ import SQLite3
 import GRDBSQLite
 #endif
 
-import Foundation
+import struct Foundation.Data
 
 /// A value stored in a database table.
 ///

diff --git a/GRDB/Core/DatabaseValueConvertible.swift b/GRDB/Core/DatabaseValueConvertible.swift
@@ -1,4 +1,5 @@
-import Foundation
+import class Foundation.JSONDecoder
+import class Foundation.JSONEncoder
 
 // Standard collections `Array`, `Set`, and `Dictionary` do not conform to
 // `DatabaseValueConvertible`, on purpose.

diff --git a/GRDB/Core/DatabaseWriter.swift b/GRDB/Core/DatabaseWriter.swift
@@ -1,7 +1,7 @@
 #if canImport(Combine)
 import Combine
+import class Dispatch.DispatchQueue
 #endif
-import Dispatch
 
 /// A type that writes into an SQLite database.
 ///

diff --git a/GRDB/Core/DispatchQueueActor.swift b/GRDB/Core/DispatchQueueActor.swift
@@ -1,4 +1,6 @@
-import Dispatch
+import class Dispatch.DispatchQueue
+import struct Dispatch.DispatchWorkItemFlags
+import func Dispatch.dispatchPrecondition
 
 /// An actor that runs in a DispatchQueue.
 ///

diff --git a/GRDB/Core/Row.swift b/GRDB/Core/Row.swift
@@ -10,7 +10,7 @@ import SQLite3
 import GRDBSQLite
 #endif
 
-import Foundation
+import struct Foundation.Data
 
 /// A database row.
 ///

diff --git a/GRDB/Core/RowAdapter.swift b/GRDB/Core/RowAdapter.swift
@@ -1,4 +1,4 @@
-import Foundation
+import struct Foundation.Data
 
 /// Returns an array of row adapters that split a row according to the
 /// provided numbers of columns.

diff --git a/GRDB/Core/SchedulingWatchdog.swift b/GRDB/Core/SchedulingWatchdog.swift
@@ -1,7 +1,8 @@
 #if !canImport(Darwin)
 @preconcurrency
 #endif
-import Dispatch
+import class Dispatch.DispatchSpecificKey
+import class Dispatch.DispatchQueue
 
 /// SchedulingWatchdog makes sure that databases connections are used on correct
 /// dispatch queues, and warns the user with a fatal error whenever she misuses

diff --git a/GRDB/Core/SerializedDatabase.swift b/GRDB/Core/SerializedDatabase.swift
@@ -1,4 +1,4 @@
-import Foundation
+import class Foundation.DispatchQueue
 
 /// A class that serializes accesses to an SQLite connection.
 final class SerializedDatabase {

diff --git a/GRDB/Core/Statement.swift b/GRDB/Core/Statement.swift
@@ -10,7 +10,7 @@ import SQLite3
 import GRDBSQLite
 #endif
 
-import Foundation
+import struct Foundation.CharacterSet
 
 /// A raw SQLite statement, suitable for the SQLite C API.
 public typealias SQLiteStatement = OpaquePointer

diff --git a/GRDB/Core/Support/Foundation/Data.swift b/GRDB/Core/Support/Foundation/Data.swift
@@ -10,7 +10,7 @@ import SQLite3
 import GRDBSQLite
 #endif
 
-import Foundation
+import struct Foundation.Data
 
 /// Data is convertible to and from DatabaseValue.
 extension Data: DatabaseValueConvertible, StatementColumnConvertible {

diff --git a/GRDB/Core/Support/Foundation/DatabaseDateComponents.swift b/GRDB/Core/Support/Foundation/DatabaseDateComponents.swift
@@ -10,7 +10,8 @@ import SQLite3
 import GRDBSQLite
 #endif
 
-import Foundation
+import struct Foundation.DateComponents
+import func Foundation.round
 
 /// A database value that holds date components.
 public struct DatabaseDateComponents: Sendable {

diff --git a/GRDB/Core/Support/Foundation/DatabaseValueConvertible+ReferenceConvertible.swift b/GRDB/Core/Support/Foundation/DatabaseValueConvertible+ReferenceConvertible.swift
@@ -1,4 +1,4 @@
-import Foundation
+import protocol Foundation.ReferenceConvertible
 
 /// DatabaseValueConvertible is free for ReferenceConvertible types whose
 /// ReferenceType is itself DatabaseValueConvertible.

diff --git a/GRDB/Core/Support/Foundation/Date.swift b/GRDB/Core/Support/Foundation/Date.swift
@@ -10,7 +10,13 @@ import SQLite3
 import GRDBSQLite
 #endif
 
-import Foundation
+import class Foundation.NSDate
+import struct Foundation.Date
+import struct Foundation.DateComponents
+import class Foundation.DateFormatter
+import struct Foundation.Calendar
+import struct Foundation.Locale
+import struct Foundation.TimeZone
 
 #if !os(Linux)
 /// NSDate is stored in the database using the format

diff --git a/GRDB/Core/Support/Foundation/Decimal.swift b/GRDB/Core/Support/Foundation/Decimal.swift
@@ -11,7 +11,9 @@ import SQLite3
 import GRDBSQLite
 #endif
 
-import Foundation
+import struct Foundation.Decimal
+import class Foundation.NSDecimalNumber
+import struct Foundation.Locale
 
 /// Decimal adopts DatabaseValueConvertible
 extension Decimal: DatabaseValueConvertible {

diff --git a/GRDB/Core/Support/Foundation/NSData.swift b/GRDB/Core/Support/Foundation/NSData.swift
@@ -1,5 +1,6 @@
 #if !os(Linux)
-import Foundation
+import class Foundation.NSData
+import struct Foundation.Data
 
 /// NSData is convertible to and from DatabaseValue.
 extension NSData: DatabaseValueConvertible {

diff --git a/GRDB/Core/Support/Foundation/NSNull.swift b/GRDB/Core/Support/Foundation/NSNull.swift
@@ -1,4 +1,4 @@
-import Foundation
+import class Foundation.NSNull
 
 /// NSNull adopts DatabaseValueConvertible
 extension NSNull: DatabaseValueConvertible {

diff --git a/GRDB/Core/Support/Foundation/NSNumber.swift b/GRDB/Core/Support/Foundation/NSNumber.swift
@@ -1,5 +1,10 @@
 #if !os(Linux) && !os(Windows)
-import Foundation
+import class Foundation.NSDecimalNumberHandler
+import class Foundation.NSNumber
+import class Foundation.NSDecimalNumber
+import struct Foundation.Decimal
+import struct Foundation.Locale
+
 
 private let integerRoundingBehavior = NSDecimalNumberHandler(
     roundingMode: .plain,

diff --git a/GRDB/Core/Support/Foundation/NSString.swift b/GRDB/Core/Support/Foundation/NSString.swift
@@ -1,5 +1,5 @@
 #if !os(Linux)
-import Foundation
+import class Foundation.NSString
 
 /// NSString adopts DatabaseValueConvertible
 extension NSString: DatabaseValueConvertible {

diff --git a/GRDB/Core/Support/Foundation/SQLiteDateParser.swift b/GRDB/Core/Support/Foundation/SQLiteDateParser.swift
@@ -1,4 +1,6 @@
-import Foundation
+import func Foundation.strlen
+import struct Foundation.DateComponents
+import struct Foundation.TimeZone
 
 // inspired by: http://jordansmith.io/performant-date-parsing/
 

diff --git a/GRDB/Core/Support/Foundation/URL.swift b/GRDB/Core/Support/Foundation/URL.swift
@@ -1,4 +1,5 @@
-import Foundation
+import class Foundation.NSURL
+import struct Foundation.URL
 
 #if !os(Linux) && !os(Windows)
 /// NSURL stores its absoluteString in the database.

diff --git a/GRDB/Core/Support/Foundation/UUID.swift b/GRDB/Core/Support/Foundation/UUID.swift
@@ -10,7 +10,10 @@ import SQLite3
 import GRDBSQLite
 #endif
 
-import Foundation
+import class Foundation.NSUUID
+import struct Foundation.UUID
+import typealias Foundation.uuid_t
+import struct Foundation.Data
 
 #if !os(Linux) && !os(Windows)
 /// NSUUID adopts DatabaseValueConvertible

diff --git a/GRDB/Core/Support/StandardLibrary/DatabaseValueConvertible+Decodable.swift b/GRDB/Core/Support/StandardLibrary/DatabaseValueConvertible+Decodable.swift
@@ -1,4 +1,4 @@
-import Foundation
+import struct Foundation.Data
 
 private struct DatabaseValueDecodingContainer: SingleValueDecodingContainer {
     let dbValue: DatabaseValue

diff --git a/GRDB/Core/Support/StandardLibrary/DatabaseValueConvertible+Encodable.swift b/GRDB/Core/Support/StandardLibrary/DatabaseValueConvertible+Encodable.swift
@@ -1,4 +1,4 @@
-import Foundation
+import class Foundation.JSONEncoder
 
 private struct DatabaseValueEncodingContainer: SingleValueEncodingContainer {
     let encode: (DatabaseValue) -> Void

diff --git a/GRDB/Core/TransactionClock.swift b/GRDB/Core/TransactionClock.swift
@@ -1,4 +1,4 @@
-import Foundation
+import struct Foundation.Date
 
 /// A type that provides the moment of a transaction.
 ///

diff --git a/GRDB/Dump/Database+Dump.swift b/GRDB/Dump/Database+Dump.swift
@@ -1,4 +1,4 @@
-import Foundation
+
 
 // MARK: - Dump
 

diff --git a/GRDB/Dump/DumpFormats/DebugDumpFormat.swift b/GRDB/Dump/DumpFormats/DebugDumpFormat.swift
@@ -10,7 +10,9 @@ import SQLite3
 import GRDBSQLite
 #endif
 
-import Foundation
+import struct Foundation.Data
+import struct Foundation.UUID
+import typealias Foundation.uuid_t
 
 /// A format that prints one line per database row, suitable
 /// for debugging.

diff --git a/GRDB/Dump/DumpFormats/JSONDumpFormat.swift b/GRDB/Dump/DumpFormats/JSONDumpFormat.swift
@@ -10,7 +10,8 @@ import SQLite3
 import GRDBSQLite
 #endif
 
-import Foundation
+import class Foundation.JSONEncoder
+import struct Foundation.Data
 
 /// A format that prints database rows as a JSON array.
 ///

diff --git a/GRDB/Dump/DumpFormats/LineDumpFormat.swift b/GRDB/Dump/DumpFormats/LineDumpFormat.swift
@@ -10,7 +10,7 @@ import SQLite3
 import GRDBSQLite
 #endif
 
-import Foundation
+
 
 /// A format that prints one line per database value. All blob values
 /// are interpreted as strings.

diff --git a/GRDB/Dump/DumpFormats/ListDumpFormat.swift b/GRDB/Dump/DumpFormats/ListDumpFormat.swift
@@ -10,7 +10,7 @@ import SQLite3
 import GRDBSQLite
 #endif
 
-import Foundation
+
 
 /// A format that prints one line per database row. All blob values
 /// are interpreted as strings.

diff --git a/GRDB/FTS/FTS5.swift b/GRDB/FTS/FTS5.swift
@@ -11,7 +11,7 @@ import SQLite3
 import GRDBSQLite
 #endif
 
-import Foundation
+
 
 /// The virtual table module for the FTS5 full-text engine.
 ///

diff --git a/GRDB/FTS/FTS5Tokenizer.swift b/GRDB/FTS/FTS5Tokenizer.swift
@@ -11,7 +11,7 @@ import SQLite3
 import GRDBSQLite
 #endif
 
-import Foundation
+import struct Foundation.Data
 
 /// A low-level SQLite function that lets FTS5Tokenizer notify tokens.
 ///

diff --git a/GRDB/FTS/FTS5WrapperTokenizer.swift b/GRDB/FTS/FTS5WrapperTokenizer.swift
@@ -11,7 +11,7 @@ import SQLite3
 import GRDBSQLite
 #endif
 
-import Foundation
+import struct Foundation.Data
 
 /// Flags that tell SQLite how to register a token.
 ///

diff --git a/GRDB/Migration/DatabaseMigrator.swift b/GRDB/Migration/DatabaseMigrator.swift
@@ -1,7 +1,11 @@
 #if canImport(Combine)
 import Combine
 #endif
-import Foundation
+import struct Foundation.URL
+import class Foundation.ProcessInfo
+import func Foundation.NSTemporaryDirectory
+import class Foundation.FileManager
+import class Foundation.DispatchQueue
 
 // TODO: provide concurrent apis for migrations that run @Sendable closures.
 /// A `DatabaseMigrator` registers and applies database migrations.

diff --git a/GRDB/QueryInterface/Request/Association/Association.swift b/GRDB/QueryInterface/Request/Association/Association.swift
@@ -1,4 +1,4 @@
-import Foundation
+
 
 /// A type that defines a connection between two tables.
 ///

diff --git a/GRDB/QueryInterface/Request/Association/AssociationAggregate.swift b/GRDB/QueryInterface/Request/Association/AssociationAggregate.swift
@@ -1,4 +1,4 @@
-import Foundation
+
 
 extension AssociationToMany {
     private func makeAggregate(_ expression: SQLExpression) -> AssociationAggregate<OriginRowDecoder> {
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ import SQLite3 @@
     import GRDBSQLite
     #endif
-    import Foundation
     extension Database {
@@ Expand Down @@