Tencent · Qiuwen-chen · Nov 5, 2025 · Oct 30, 2025
diff --git a/WCDB.podspec b/WCDB.podspec
@@ -149,7 +149,6 @@ Pod::Spec.new do |wcdb|
     "VALID_ARCHS[sdk=watchos*]" => "arm64_32 arm64 86_64",
     "OTHER_CFLAGS" => "-fvisibility-inlines-hidden",
     "OTHER_CPLUSPLUSFLAGS" => "-fvisibility-inlines-hidden",
-    "SWIFT_ENABLE_EXPLICIT_MODULES" => 'NO',
     "OTHER_SWIFT_FLAGS" => "-no-verify-emitted-module-interface",
     "SWIFT_ACTIVE_COMPILATION_CONDITIONS" => "WCDB_SWIFT_BRIDGE_OBJC",
   }

diff --git a/WCDB.swift.podspec b/WCDB.swift.podspec
@@ -77,8 +77,8 @@ Pod::Spec.new do |wcdb|
     "VALID_ARCHS[sdk=watchos*]" => "arm64_32 arm64 x86_64",
     "OTHER_CFLAGS" => "-fvisibility-inlines-hidden",
     "OTHER_CPLUSPLUSFLAGS" => "-fvisibility-inlines-hidden",
-    "SWIFT_ENABLE_EXPLICIT_MODULES" => 'NO',
     "OTHER_SWIFT_FLAGS" => "-no-verify-emitted-module-interface",
+    "SWIFT_ACTIVE_COMPILATION_CONDITIONS" => "WCDB_SWIFT_TARGET",
   }
   wcdb.swift_versions = '5'
   wcdb.dependency 'WCDBOptimizedSQLCipher', '1.4.7'

diff --git a/src/WCDB.xcodeproj/project.pbxproj b/src/WCDB.xcodeproj/project.pbxproj
@@ -4785,6 +4785,7 @@
 		39B524DC2304F9A2001DF52D /* InnerHandle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InnerHandle.cpp; sourceTree = "<group>"; };
 		39C70CC52313E20E002D773C /* Assemble.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Assemble.cpp; sourceTree = "<group>"; };
 		39C70CC62313E20F002D773C /* Assemble.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Assemble.hpp; sourceTree = "<group>"; };
+		3C9A56E02EB44B9D00DA1C6E /* WCDBSwift.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WCDBSwift.xcconfig; sourceTree = "<group>"; };
 		7500829229223463009C0F38 /* WCTBridgeMacro.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WCTBridgeMacro.h; sourceTree = "<group>"; };
 		75067CBD293F8192005DA25B /* AutoAddColumnObject.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = AutoAddColumnObject.mm; sourceTree = "<group>"; };
 		75067CBF293F819B005DA25B /* AutoAddColumnObject.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AutoAddColumnObject.h; sourceTree = "<group>"; };
@@ -7469,6 +7470,7 @@
 				234F0369227A9E3C00DD65A2 /* Info.plist */,
 				234F0370227A9E3D00DD65A2 /* WCDBWithoutCompression.xcconfig */,
 				0DACF8B22B2ADC7700CB0710 /* WCDB.xcconfig */,
+				3C9A56E02EB44B9D00DA1C6E /* WCDBSwift.xcconfig */,
 				234F036E227A9E3D00DD65A2 /* WCDB.modulemap */,
 				7521DA49291E9D9E009642EF /* WCDBCpp.modulemap */,
 				7521DA4A291E9D9E009642EF /* WCDBObjc.modulemap */,
@@ -12196,17 +12198,19 @@
 		};
 		7521DDDB291EA349009642EF /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 0DACF8B22B2ADC7700CB0710 /* WCDB.xcconfig */;
+			baseConfigurationReference = 3C9A56E02EB44B9D00DA1C6E /* WCDBSwift.xcconfig */;
 			buildSettings = {
 				MODULEMAP_FILE = "$(SRCROOT)/support/WCDBSwift.modulemap";
+				SWIFT_ENABLE_EXPLICIT_MODULES = YES;
 			};
 			name = Debug;
 		};
 		7521DDDC291EA349009642EF /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 0DACF8B22B2ADC7700CB0710 /* WCDB.xcconfig */;
+			baseConfigurationReference = 3C9A56E02EB44B9D00DA1C6E /* WCDBSwift.xcconfig */;
 			buildSettings = {
 				MODULEMAP_FILE = "$(SRCROOT)/support/WCDBSwift.modulemap";
+				SWIFT_ENABLE_EXPLICIT_MODULES = YES;
 			};
 			name = Release;
 		};

diff --git a/src/support/WCDB.modulemap b/src/support/WCDB.modulemap
@@ -18,12 +18,9 @@ framework module WCDB {
         header "WCTTableCoding.h"
 		export *
 	}
-}
-
-framework module WCDB_Private {
-    requires objc
-
-    module BridgeHeader {
+
+    explicit module Private {
+        requires objc
         umbrella header "WCDBBridging.h"
         export *
     }

diff --git a/src/support/WCDBSwift.modulemap b/src/support/WCDBSwift.modulemap
@@ -2,12 +2,9 @@ framework module WCDBSwift {
     module All {
         export *
     }
-}
-
-framework module WCDB_Private {
-    requires objc
 
-    module BridgeHeader {
+    explicit module Private {
+        requires objc
         umbrella header "WCDBBridging.h"
         export *
     }

diff --git a/src/support/WCDBSwift.xcconfig b/src/support/WCDBSwift.xcconfig
@@ -0,0 +1,3 @@
+#include "WCDB.xcconfig"
+
+SWIFT_ACTIVE_COMPILATION_CONDITIONS = $(inherited) WCDB_SWIFT_TARGET
diff --git a/src/support/WCDBWithoutCompression.xcconfig b/src/support/WCDBWithoutCompression.xcconfig
@@ -13,6 +13,4 @@ MARKETING_VERSION = 1.1.0
 // Preprocessing
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) $(WCDB_VERSION_DEFINITIONS) $(SQLITE_PREPROCESSOR_DEFINITIONS) ZLIB_CONST=1 SQLITE_WCDB=1
 
-SWIFT_ENABLE_EXPLICIT_MODULES = NO;
-
 OTHER_SWIFT_FLAGS = -no-verify-emitted-module-interface
diff --git a/src/swift/bridge/ErrorBridge.swift b/src/swift/bridge/ErrorBridge.swift
@@ -23,7 +23,13 @@
  */
 
 import Foundation
+#if SWIFT_PACKAGE
 import WCDB_Private
+#elseif WCDB_SWIFT_TARGET
+import WCDBSwift.Private
+#else
+import WCDB.Private
+#endif
 
 internal final class ErrorBridge {
     static func getErrorFrom(cppError error: CPPError) -> WCDBError {

diff --git a/src/swift/bridge/FTSBridge.swift b/src/swift/bridge/FTSBridge.swift
@@ -23,7 +23,13 @@
  */
 
 import Foundation
+#if SWIFT_PACKAGE
 import WCDB_Private
+#elseif WCDB_SWIFT_TARGET
+import WCDBSwift.Private
+#else
+import WCDB.Private
+#endif
 
 public enum TokenizerErrorCode {
     case OK

diff --git a/src/swift/bridge/ObjectBridge.swift b/src/swift/bridge/ObjectBridge.swift
@@ -23,7 +23,13 @@
  */
 
 import Foundation
+#if SWIFT_PACKAGE
 import WCDB_Private
+#elseif WCDB_SWIFT_TARGET
+import WCDBSwift.Private
+#else
+import WCDB.Private
+#endif
 
 internal final class ValueWrap<T> {
     var value: T

diff --git a/src/swift/bridge/WCTBridgeProperty.swift b/src/swift/bridge/WCTBridgeProperty.swift
@@ -25,7 +25,13 @@
 #if WCDB_SWIFT_BRIDGE_OBJC
 
 import Foundation
+#if SWIFT_PACKAGE
 import WCDB_Private
+#elseif WCDB_SWIFT_TARGET
+import WCDBSwift.Private
+#else
+import WCDB.Private
+#endif
 
 extension WCTBridgeProperty: PropertyOperable {
 

diff --git a/src/swift/builtin/CodableType.swift b/src/swift/builtin/CodableType.swift
@@ -19,7 +19,13 @@
  */
 
 import Foundation
+#if SWIFT_PACKAGE
 import WCDB_Private
+#elseif WCDB_SWIFT_TARGET
+import WCDBSwift.Private
+#else
+import WCDB.Private
+#endif
 
 /*
  * Builtin codable implementation

diff --git a/src/swift/builtin/Master.swift b/src/swift/builtin/Master.swift
@@ -19,7 +19,13 @@
  */
 
 import Foundation
+#if SWIFT_PACKAGE
 import WCDB_Private
+#elseif WCDB_SWIFT_TARGET
+import WCDBSwift.Private
+#else
+import WCDB.Private
+#endif
 
 public struct Master: TableCodable {
     public static let builtinTableName: String = "sqlite_master"

diff --git a/src/swift/core/base/BaseType.swift b/src/swift/core/base/BaseType.swift
@@ -19,7 +19,13 @@
  */
 
 import Foundation
+#if SWIFT_PACKAGE
 import WCDB_Private
+#elseif WCDB_SWIFT_TARGET
+import WCDBSwift.Private
+#else
+import WCDB.Private
+#endif
 
 public typealias Tag = Int
 

diff --git a/src/swift/core/base/Database+WCTTableCoding.swift b/src/swift/core/base/Database+WCTTableCoding.swift
@@ -25,7 +25,13 @@
 #if WCDB_SWIFT_BRIDGE_OBJC
 
 import Foundation
+#if SWIFT_PACKAGE
 import WCDB_Private
+#elseif WCDB_SWIFT_TARGET
+import WCDBSwift.Private
+#else
+import WCDB.Private
+#endif
 
 // WCTTable
 public extension Database {

diff --git a/src/swift/core/base/Database.swift b/src/swift/core/base/Database.swift
@@ -19,7 +19,13 @@
  */
 
 import Foundation
+#if SWIFT_PACKAGE
 import WCDB_Private
+#elseif WCDB_SWIFT_TARGET
+import WCDBSwift.Private
+#else
+import WCDB.Private
+#endif
 
 /// Thread-safe Database object
 public class Database {

diff --git a/src/swift/core/base/Handle.swift b/src/swift/core/base/Handle.swift
@@ -19,7 +19,13 @@
  */
 
 import Foundation
+#if SWIFT_PACKAGE
 import WCDB_Private
+#elseif WCDB_SWIFT_TARGET
+import WCDBSwift.Private
+#else
+import WCDB.Private
+#endif
 
 public final class Handle {
     private let recyclableHandle: RecyclableCPPHandle

diff --git a/src/swift/core/base/HandleStatement+WCTTableCoding.swift b/src/swift/core/base/HandleStatement+WCTTableCoding.swift
@@ -25,7 +25,13 @@
 #if WCDB_SWIFT_BRIDGE_OBJC
 
 import Foundation
+#if SWIFT_PACKAGE
 import WCDB_Private
+#elseif WCDB_SWIFT_TARGET
+import WCDBSwift.Private
+#else
+import WCDB.Private
+#endif
 
 extension PreparedStatement: StatementInterfaceForObjc {}
 

diff --git a/src/swift/core/base/PreparedStatement.swift b/src/swift/core/base/PreparedStatement.swift
@@ -19,7 +19,13 @@
  */
 
 import Foundation
+#if SWIFT_PACKAGE
 import WCDB_Private
+#elseif WCDB_SWIFT_TARGET
+import WCDBSwift.Private
+#else
+import WCDB.Private
+#endif
 public final class PreparedStatement {
     internal let recyclableStmt: RecyclableCPPHandleStatement
 

diff --git a/src/swift/core/base/Table+WCTTableCoding.swift b/src/swift/core/base/Table+WCTTableCoding.swift
@@ -25,7 +25,13 @@
 #if WCDB_SWIFT_BRIDGE_OBJC
 
 import Foundation
+#if SWIFT_PACKAGE
 import WCDB_Private
+#elseif WCDB_SWIFT_TARGET
+import WCDBSwift.Private
+#else
+import WCDB.Private
+#endif
 
 /// Convenient table interface
 extension Table {

diff --git a/src/swift/core/base/Table.swift b/src/swift/core/base/Table.swift
@@ -19,7 +19,13 @@
  */
 
 import Foundation
+#if SWIFT_PACKAGE
 import WCDB_Private
+#elseif WCDB_SWIFT_TARGET
+import WCDBSwift.Private
+#else
+import WCDB.Private
+#endif
 
 /// Convenient table interface
 public final class Table<Object: Any>: @unchecked Sendable {

diff --git a/src/swift/core/binding/CheckExpressionConfig.swift b/src/swift/core/binding/CheckExpressionConfig.swift
@@ -23,7 +23,13 @@
  */
 
 import Foundation
+#if SWIFT_PACKAGE
 import WCDB_Private
+#elseif WCDB_SWIFT_TARGET
+import WCDBSwift.Private
+#else
+import WCDB.Private
+#endif
 
 public final class CheckExpressionConfig: TableConfiguration {
     private let constraints: [TableConstraint]

diff --git a/src/swift/core/binding/ColumnConstraintConfig.swift b/src/swift/core/binding/ColumnConstraintConfig.swift
@@ -23,7 +23,13 @@
  */
 
 import Foundation
+#if SWIFT_PACKAGE
 import WCDB_Private
+#elseif WCDB_SWIFT_TARGET
+import WCDBSwift.Private
+#else
+import WCDB.Private
+#endif
 
 public final class ColumnConstraintConfig<CodingTableKeyType: CodingTableKey>: TableConfiguration {
     let codingKey: CodingTableKeyType

diff --git a/src/swift/core/binding/ForeignKeyConfig.swift b/src/swift/core/binding/ForeignKeyConfig.swift
@@ -23,7 +23,13 @@
  */
 
 import Foundation
+#if SWIFT_PACKAGE
 import WCDB_Private
+#elseif WCDB_SWIFT_TARGET
+import WCDBSwift.Private
+#else
+import WCDB.Private
+#endif
 
 public final class ForeignKeyConfig<CodingTableKeyType: CodingTableKey>: TableConfiguration {
     let codingKeys: [CodingTableKeyType]

diff --git a/src/swift/core/binding/IndexConfig.swift b/src/swift/core/binding/IndexConfig.swift
@@ -23,7 +23,13 @@
  */
 
 import Foundation
+#if SWIFT_PACKAGE
 import WCDB_Private
+#elseif WCDB_SWIFT_TARGET
+import WCDBSwift.Private
+#else
+import WCDB.Private
+#endif
 
 public final class IndexConfig<CodingTableKeyType: CodingTableKey>: TableConfiguration {
     private let indexes: [IndexedColumnConvertible]

diff --git a/src/swift/core/binding/MultiPrimaryConfig.swift b/src/swift/core/binding/MultiPrimaryConfig.swift
@@ -23,7 +23,13 @@
  */
 
 import Foundation
+#if SWIFT_PACKAGE
 import WCDB_Private
+#elseif WCDB_SWIFT_TARGET
+import WCDBSwift.Private
+#else
+import WCDB.Private
+#endif
 
 public final class MultiPrimaryConfig<CodingTableKeyType: CodingTableKey>: TableConfiguration {
 

diff --git a/src/swift/core/binding/MultiUniqueConfig.swift b/src/swift/core/binding/MultiUniqueConfig.swift
@@ -23,7 +23,13 @@
  */
 
 import Foundation
+#if SWIFT_PACKAGE
 import WCDB_Private
+#elseif WCDB_SWIFT_TARGET
+import WCDBSwift.Private
+#else
+import WCDB.Private
+#endif
 
 public final class MultiUniqueConfig<CodingTableKeyType: CodingTableKey>: TableConfiguration {
     private let indexes: [IndexedColumnConvertible]

diff --git a/src/swift/core/binding/Property.swift b/src/swift/core/binding/Property.swift
@@ -19,7 +19,13 @@
  */
 
 import Foundation
+#if SWIFT_PACKAGE
 import WCDB_Private
+#elseif WCDB_SWIFT_TARGET
+import WCDBSwift.Private
+#else
+import WCDB.Private
+#endif
 
 public protocol PropertyConvertible: ColumnConvertible, PropertyRedirectable {
     func isSwiftProperty() -> Bool
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#include "WCDB.xcconfig"

		SWIFT_ACTIVE_COMPILATION_CONDITIONS = $(inherited) WCDB_SWIFT_TARGET