From d6627867aacc45f6045f7b817a8753c69719b282 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mari=CC=81a=20Rodri=CC=81guez?= Date: Fri, 5 Sep 2025 18:26:25 +0200 Subject: [PATCH 01/29] Add SPM support --- Package.swift | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 Package.swift diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..dc7f63a --- /dev/null +++ b/Package.swift @@ -0,0 +1,26 @@ +// swift-tools-version:5.3 +import PackageDescription + +let package = Package( + name: "EncryptedCoreData", + platforms: [ + .iOS(.v15) + ], + products: [ + .library( + name: "EncryptedCoreData", + targets: ["EncryptedCoreData"] + ), + ], + dependencies: [ + .package(url: "https://github.com/stephencelis/SQLCipher.git", from: "3.4.0") + ], + targets: [ + .target( + name: "EncryptedCoreData", + dependencies: [ + .product(name: "SQLCipher", package: "SQLCipher") + ] + ) + ] +) \ No newline at end of file From 07f3dd9db62e394450b9ce4fb37c1889604b6d52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mari=CC=81a=20Rodri=CC=81guez?= Date: Fri, 5 Sep 2025 18:43:31 +0200 Subject: [PATCH 02/29] Include package --- Package.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index dc7f63a..ba66eee 100644 --- a/Package.swift +++ b/Package.swift @@ -13,7 +13,8 @@ let package = Package( ), ], dependencies: [ - .package(url: "https://github.com/stephencelis/SQLCipher.git", from: "3.4.0") + .package(url: "https://github.com/stephencelis/SQLCipher.git", from: "3.4.0"), + .package(url: "https://github.com/mRoRo/encrypted-core-data", branch: "Xcode-26") ], targets: [ .target( From cfa1e109a61d45a6846f64a3934b688b0bf9c04c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mari=CC=81a=20Rodri=CC=81guez?= Date: Fri, 5 Sep 2025 18:49:16 +0200 Subject: [PATCH 03/29] Modify swift-tools-version --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index ba66eee..8157135 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.3 +// swift-tools-version:5.9 import PackageDescription let package = Package( From 385b1373363d964d40881bdc8e1e47aaf66a4913 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mari=CC=81a=20Rodri=CC=81guez?= Date: Fri, 5 Sep 2025 18:54:42 +0200 Subject: [PATCH 04/29] Fix wrong url --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 8157135..aa3f9c7 100644 --- a/Package.swift +++ b/Package.swift @@ -13,7 +13,7 @@ let package = Package( ), ], dependencies: [ - .package(url: "https://github.com/stephencelis/SQLCipher.git", from: "3.4.0"), + .package(url: "https://github.com/sqlcipher/SQLCipher.git", from: "3.4.0"), .package(url: "https://github.com/mRoRo/encrypted-core-data", branch: "Xcode-26") ], targets: [ From a729388974bc7de16ef734d71d87b80fee74e3b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mari=CC=81a=20Rodri=CC=81guez?= Date: Fri, 5 Sep 2025 19:07:10 +0200 Subject: [PATCH 05/29] remove dependencies --- Package.swift | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Package.swift b/Package.swift index aa3f9c7..c9c323c 100644 --- a/Package.swift +++ b/Package.swift @@ -13,15 +13,11 @@ let package = Package( ), ], dependencies: [ - .package(url: "https://github.com/sqlcipher/SQLCipher.git", from: "3.4.0"), .package(url: "https://github.com/mRoRo/encrypted-core-data", branch: "Xcode-26") ], targets: [ .target( - name: "EncryptedCoreData", - dependencies: [ - .product(name: "SQLCipher", package: "SQLCipher") - ] + name: "EncryptedCoreData" ) ] ) \ No newline at end of file From b0beb537e88b38a6adb897af4e4bea6a94baa76a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mari=CC=81a=20Rodri=CC=81guez?= Date: Fri, 5 Sep 2025 19:44:07 +0200 Subject: [PATCH 06/29] Add path to the Package.swift file --- Package.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index c9c323c..0d06870 100644 --- a/Package.swift +++ b/Package.swift @@ -17,7 +17,8 @@ let package = Package( ], targets: [ .target( - name: "EncryptedCoreData" + name: "EncryptedCoreData", + path: "Incremental Store" ) ] ) \ No newline at end of file From acfb292313771eea2a26aa32b54cdef01b8b61fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mari=CC=81a=20Rodri=CC=81guez?= Date: Fri, 5 Sep 2025 19:58:02 +0200 Subject: [PATCH 07/29] Add include --- Package.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 0d06870..db13a5e 100644 --- a/Package.swift +++ b/Package.swift @@ -18,7 +18,8 @@ let package = Package( targets: [ .target( name: "EncryptedCoreData", - path: "Incremental Store" + path: "Incremental Store", + publicHeadersPath: "include" ) ] ) \ No newline at end of file From 64fbeaf81e567285e870d8eef30151383f97238f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mari=CC=81a=20Rodri=CC=81guez?= Date: Fri, 5 Sep 2025 20:05:39 +0200 Subject: [PATCH 08/29] New Package structure --- Package.swift | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Package.swift b/Package.swift index db13a5e..875c570 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.9 +// swift-tools-version: 5.9 import PackageDescription let package = Package( @@ -12,14 +12,15 @@ let package = Package( targets: ["EncryptedCoreData"] ), ], - dependencies: [ - .package(url: "https://github.com/mRoRo/encrypted-core-data", branch: "Xcode-26") - ], targets: [ .target( name: "EncryptedCoreData", - path: "Incremental Store", - publicHeadersPath: "include" - ) + path: "Incremental Store" + ), + .testTarget( + name: "EncryptedCoreDataTests", + dependencies: ["EncryptedCoreData"], + path: "Tests" + ), ] ) \ No newline at end of file From d4f3d883f0300934390074c865f0a1d08425b42a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mari=CC=81a=20Rodri=CC=81guez?= Date: Fri, 5 Sep 2025 20:15:29 +0200 Subject: [PATCH 09/29] Add include folder --- Incremental Store/{ => include}/EncryptedStore.h | 0 Package.swift | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) rename Incremental Store/{ => include}/EncryptedStore.h (100%) diff --git a/Incremental Store/EncryptedStore.h b/Incremental Store/include/EncryptedStore.h similarity index 100% rename from Incremental Store/EncryptedStore.h rename to Incremental Store/include/EncryptedStore.h diff --git a/Package.swift b/Package.swift index 875c570..1588c71 100644 --- a/Package.swift +++ b/Package.swift @@ -15,7 +15,8 @@ let package = Package( targets: [ .target( name: "EncryptedCoreData", - path: "Incremental Store" + path: "Incremental Store", + publicHeadersPath: "include" ), .testTarget( name: "EncryptedCoreDataTests", From 454a23d49d8a5836a03a90e2bb475664df23b085 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mari=CC=81a=20Rodri=CC=81guez?= Date: Wed, 10 Sep 2025 15:07:58 +0200 Subject: [PATCH 10/29] Add sqlcipher dependency --- Package.swift | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index 1588c71..56fdbc2 100644 --- a/Package.swift +++ b/Package.swift @@ -16,7 +16,13 @@ let package = Package( .target( name: "EncryptedCoreData", path: "Incremental Store", - publicHeadersPath: "include" + publicHeadersPath: "include", + dependencies: [ + .package( + url: "https://github.com/sqlcipher/sqlcipher.git", + exact: "v3.4.0" + ) + ], ), .testTarget( name: "EncryptedCoreDataTests", @@ -24,4 +30,4 @@ let package = Package( path: "Tests" ), ] -) \ No newline at end of file +) From 8a05753a242ce3fabd2360f0850d1ed5e5649999 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mari=CC=81a=20Rodri=CC=81guez?= Date: Wed, 10 Sep 2025 15:20:52 +0200 Subject: [PATCH 11/29] Increase the sqlcipher version --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 56fdbc2..5234418 100644 --- a/Package.swift +++ b/Package.swift @@ -20,7 +20,7 @@ let package = Package( dependencies: [ .package( url: "https://github.com/sqlcipher/sqlcipher.git", - exact: "v3.4.0" + exact: "v3.4.2" ) ], ), From a0076d33ce4895c15380f9471d2b0f172955ea49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mari=CC=81a=20Rodri=CC=81guez?= Date: Wed, 10 Sep 2025 15:29:51 +0200 Subject: [PATCH 12/29] Fix 'dependencies' must precede 'path' error --- Package.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index 5234418..c5b5677 100644 --- a/Package.swift +++ b/Package.swift @@ -15,14 +15,14 @@ let package = Package( targets: [ .target( name: "EncryptedCoreData", - path: "Incremental Store", - publicHeadersPath: "include", dependencies: [ .package( url: "https://github.com/sqlcipher/sqlcipher.git", exact: "v3.4.2" ) ], + path: "Incremental Store", + publicHeadersPath: "include" ), .testTarget( name: "EncryptedCoreDataTests", From 4b51b1a62fd8ed42314886415009d2334cd3686b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mari=CC=81a=20Rodri=CC=81guez?= Date: Wed, 10 Sep 2025 15:40:19 +0200 Subject: [PATCH 13/29] Add dependencies in the correct place --- Package.swift | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Package.swift b/Package.swift index c5b5677..118e238 100644 --- a/Package.swift +++ b/Package.swift @@ -12,15 +12,15 @@ let package = Package( targets: ["EncryptedCoreData"] ), ], + dependencies: [ + .package( + url: "https://github.com/sqlcipher/sqlcipher.git", + exact: "v3.4.2" + ) + ], targets: [ .target( name: "EncryptedCoreData", - dependencies: [ - .package( - url: "https://github.com/sqlcipher/sqlcipher.git", - exact: "v3.4.2" - ) - ], path: "Incremental Store", publicHeadersPath: "include" ), From 5f50790f0aa2065964596336404e2bc1de895a8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mari=CC=81a=20Rodri=CC=81guez?= Date: Wed, 10 Sep 2025 15:43:12 +0200 Subject: [PATCH 14/29] Fix tag name --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 118e238..7900a2a 100644 --- a/Package.swift +++ b/Package.swift @@ -15,7 +15,7 @@ let package = Package( dependencies: [ .package( url: "https://github.com/sqlcipher/sqlcipher.git", - exact: "v3.4.2" + exact: "3.4.2" ) ], targets: [ From 31e4ead2f30d749e83cb82f52fd3689270c84fa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mari=CC=81a=20Rodri=CC=81guez?= Date: Wed, 10 Sep 2025 16:25:47 +0200 Subject: [PATCH 15/29] Add cSettings and linkerSettings --- Package.swift | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index 7900a2a..de661d5 100644 --- a/Package.swift +++ b/Package.swift @@ -15,14 +15,23 @@ let package = Package( dependencies: [ .package( url: "https://github.com/sqlcipher/sqlcipher.git", - exact: "3.4.2" + from: "3.4.0" ) ], targets: [ .target( name: "EncryptedCoreData", path: "Incremental Store", - publicHeadersPath: "include" + publicHeadersPath: "include", + cSettings: [ + .define("SQLITE_HAS_CODEC"), + .define("SQLCIPHER_CRYPTO_CC"), + .headerSearchPath("include") + ], + linkerSettings: [ + .linkedFramework("CoreData"), + .linkedFramework("Security") + ] ), .testTarget( name: "EncryptedCoreDataTests", From a60a8c0edf2225afa142d54ac69307263699bafe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mari=CC=81a=20Rodri=CC=81guez?= Date: Wed, 10 Sep 2025 16:35:15 +0200 Subject: [PATCH 16/29] Use swift.git --- Package.resolved | 14 ++++++++++++++ Package.swift | 14 ++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 Package.resolved diff --git a/Package.resolved b/Package.resolved new file mode 100644 index 0000000..81dd901 --- /dev/null +++ b/Package.resolved @@ -0,0 +1,14 @@ +{ + "pins" : [ + { + "identity" : "sqlcipher.swift", + "kind" : "remoteSourceControl", + "location" : "https://github.com/sqlcipher/SQLCipher.swift.git", + "state" : { + "revision" : "46e687b829dce3f9262e16e9f941a9e159136085", + "version" : "4.10.0" + } + } + ], + "version" : 2 +} diff --git a/Package.swift b/Package.swift index de661d5..9a8ca86 100644 --- a/Package.swift +++ b/Package.swift @@ -14,14 +14,17 @@ let package = Package( ], dependencies: [ .package( - url: "https://github.com/sqlcipher/sqlcipher.git", - from: "3.4.0" - ) + url: "https://github.com/sqlcipher/SQLCipher.swift.git", + from: "4.10.0") ], targets: [ .target( name: "EncryptedCoreData", + dependencies: [ + .product(name: "SQLCipher", package: "SQLCipher.swift") + ], path: "Incremental Store", + sources: ["EncryptedStore.h", "EncryptedStore.m"], publicHeadersPath: "include", cSettings: [ .define("SQLITE_HAS_CODEC"), @@ -36,7 +39,10 @@ let package = Package( .testTarget( name: "EncryptedCoreDataTests", dependencies: ["EncryptedCoreData"], - path: "Tests" + cSettings: [ + .define("SQLITE_HAS_CODEC") + ] ), ] ) + From 76a75efaf23a86a39445b61c0cb4875bdbf2a614 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mari=CC=81a=20Rodri=CC=81guez?= Date: Wed, 10 Sep 2025 16:45:51 +0200 Subject: [PATCH 17/29] Remove space in path --- {Incremental Store => Incremental_Store}/EncryptedStore.m | 0 .../include/EncryptedStore.h | 0 Package.swift | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename {Incremental Store => Incremental_Store}/EncryptedStore.m (100%) rename {Incremental Store => Incremental_Store}/include/EncryptedStore.h (100%) diff --git a/Incremental Store/EncryptedStore.m b/Incremental_Store/EncryptedStore.m similarity index 100% rename from Incremental Store/EncryptedStore.m rename to Incremental_Store/EncryptedStore.m diff --git a/Incremental Store/include/EncryptedStore.h b/Incremental_Store/include/EncryptedStore.h similarity index 100% rename from Incremental Store/include/EncryptedStore.h rename to Incremental_Store/include/EncryptedStore.h diff --git a/Package.swift b/Package.swift index 9a8ca86..36dfb0b 100644 --- a/Package.swift +++ b/Package.swift @@ -23,7 +23,7 @@ let package = Package( dependencies: [ .product(name: "SQLCipher", package: "SQLCipher.swift") ], - path: "Incremental Store", + path: "Incremental_Store", sources: ["EncryptedStore.h", "EncryptedStore.m"], publicHeadersPath: "include", cSettings: [ From b54b0c2a7661f8233696ab0569cf86ec0fdf6827 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mari=CC=81a=20Rodri=CC=81guez?= Date: Wed, 10 Sep 2025 16:50:56 +0200 Subject: [PATCH 18/29] Remove sources in Package.swift --- Package.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/Package.swift b/Package.swift index 36dfb0b..cbe1855 100644 --- a/Package.swift +++ b/Package.swift @@ -24,7 +24,6 @@ let package = Package( .product(name: "SQLCipher", package: "SQLCipher.swift") ], path: "Incremental_Store", - sources: ["EncryptedStore.h", "EncryptedStore.m"], publicHeadersPath: "include", cSettings: [ .define("SQLITE_HAS_CODEC"), From 7e3f1476ce7010ae40ddf482a01343596bac478e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mari=CC=81a=20Rodri=CC=81guez?= Date: Wed, 10 Sep 2025 17:09:23 +0200 Subject: [PATCH 19/29] Simplify the Package.swift file --- Package.resolved | 14 -------------- Package.swift | 31 +++++++------------------------ 2 files changed, 7 insertions(+), 38 deletions(-) delete mode 100644 Package.resolved diff --git a/Package.resolved b/Package.resolved deleted file mode 100644 index 81dd901..0000000 --- a/Package.resolved +++ /dev/null @@ -1,14 +0,0 @@ -{ - "pins" : [ - { - "identity" : "sqlcipher.swift", - "kind" : "remoteSourceControl", - "location" : "https://github.com/sqlcipher/SQLCipher.swift.git", - "state" : { - "revision" : "46e687b829dce3f9262e16e9f941a9e159136085", - "version" : "4.10.0" - } - } - ], - "version" : 2 -} diff --git a/Package.swift b/Package.swift index cbe1855..c229465 100644 --- a/Package.swift +++ b/Package.swift @@ -12,36 +12,19 @@ let package = Package( targets: ["EncryptedCoreData"] ), ], - dependencies: [ - .package( - url: "https://github.com/sqlcipher/SQLCipher.swift.git", - from: "4.10.0") - ], + dependencies: [], targets: [ .target( name: "EncryptedCoreData", - dependencies: [ - .product(name: "SQLCipher", package: "SQLCipher.swift") - ], - path: "Incremental_Store", - publicHeadersPath: "include", - cSettings: [ - .define("SQLITE_HAS_CODEC"), - .define("SQLCIPHER_CRYPTO_CC"), - .headerSearchPath("include") + dependencies: [], + path: "Incremental Store", + sources: [ + "." ], - linkerSettings: [ - .linkedFramework("CoreData"), - .linkedFramework("Security") - ] - ), - .testTarget( - name: "EncryptedCoreDataTests", - dependencies: ["EncryptedCoreData"], + publicHeadersPath: ".", cSettings: [ - .define("SQLITE_HAS_CODEC") + .headerSearchPath("."), ] ), ] ) - From 678bf37406e5db920d2666f07b7e681f274a42d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mari=CC=81a=20Rodri=CC=81guez?= Date: Wed, 10 Sep 2025 17:12:01 +0200 Subject: [PATCH 20/29] Back to old name --- {Incremental_Store => Incremental Store}/EncryptedStore.m | 0 {Incremental_Store => Incremental Store}/include/EncryptedStore.h | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {Incremental_Store => Incremental Store}/EncryptedStore.m (100%) rename {Incremental_Store => Incremental Store}/include/EncryptedStore.h (100%) diff --git a/Incremental_Store/EncryptedStore.m b/Incremental Store/EncryptedStore.m similarity index 100% rename from Incremental_Store/EncryptedStore.m rename to Incremental Store/EncryptedStore.m diff --git a/Incremental_Store/include/EncryptedStore.h b/Incremental Store/include/EncryptedStore.h similarity index 100% rename from Incremental_Store/include/EncryptedStore.h rename to Incremental Store/include/EncryptedStore.h From 75ecab4a2885be7e7a1ec008ad380de8e4c61fa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mari=CC=81a=20Rodri=CC=81guez?= Date: Wed, 10 Sep 2025 17:17:03 +0200 Subject: [PATCH 21/29] fix header and search paths --- Package.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index c229465..5882037 100644 --- a/Package.swift +++ b/Package.swift @@ -21,9 +21,9 @@ let package = Package( sources: [ "." ], - publicHeadersPath: ".", + publicHeadersPath: "include", cSettings: [ - .headerSearchPath("."), + .headerSearchPath("include"), ] ), ] From 26f731d223abea955c47bef1cf5f0742feed6018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mari=CC=81a=20Rodri=CC=81guez?= Date: Wed, 10 Sep 2025 17:29:02 +0200 Subject: [PATCH 22/29] Add SQLITE_HAS_CODEC and SQLCIPHER_CRYPTO_CC --- Package.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Package.swift b/Package.swift index 5882037..e627a1f 100644 --- a/Package.swift +++ b/Package.swift @@ -23,6 +23,8 @@ let package = Package( ], publicHeadersPath: "include", cSettings: [ + .define("SQLITE_HAS_CODEC"), + .define("SQLCIPHER_CRYPTO_CC"), .headerSearchPath("include"), ] ), From 4d5253c26875e7621886f9aa32308e89fe473c49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mari=CC=81a=20Rodri=CC=81guez?= Date: Wed, 10 Sep 2025 17:33:48 +0200 Subject: [PATCH 23/29] Add sqlcipher as a dependency --- Package.swift | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index e627a1f..2a40d4c 100644 --- a/Package.swift +++ b/Package.swift @@ -12,7 +12,12 @@ let package = Package( targets: ["EncryptedCoreData"] ), ], - dependencies: [], + dependencies: [ + .package( + url: "https://github.com/sqlcipher/sqlcipher.git", + from: "3.4.0" + ) + ], targets: [ .target( name: "EncryptedCoreData", From 135f955ea0895e8d8cfdbfb0e33146fd7a11d527 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mari=CC=81a=20Rodri=CC=81guez?= Date: Wed, 10 Sep 2025 17:38:42 +0200 Subject: [PATCH 24/29] Add SQLCipher dependency --- Package.swift | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 2a40d4c..d99d7a5 100644 --- a/Package.swift +++ b/Package.swift @@ -21,7 +21,9 @@ let package = Package( targets: [ .target( name: "EncryptedCoreData", - dependencies: [], + dependencies: [ + .product(name: "SQLCipher", package: "sqlcipher") + ], path: "Incremental Store", sources: [ "." From 4934cf85e1e94a120393cb9c1575c41b64df8e92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mari=CC=81a=20Rodri=CC=81guez?= Date: Wed, 10 Sep 2025 17:44:33 +0200 Subject: [PATCH 25/29] Use SQLCipher.swift --- Package.resolved | 14 ++++++++++++++ Package.swift | 6 +++--- 2 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 Package.resolved diff --git a/Package.resolved b/Package.resolved new file mode 100644 index 0000000..81dd901 --- /dev/null +++ b/Package.resolved @@ -0,0 +1,14 @@ +{ + "pins" : [ + { + "identity" : "sqlcipher.swift", + "kind" : "remoteSourceControl", + "location" : "https://github.com/sqlcipher/SQLCipher.swift.git", + "state" : { + "revision" : "46e687b829dce3f9262e16e9f941a9e159136085", + "version" : "4.10.0" + } + } + ], + "version" : 2 +} diff --git a/Package.swift b/Package.swift index d99d7a5..7af230d 100644 --- a/Package.swift +++ b/Package.swift @@ -14,15 +14,15 @@ let package = Package( ], dependencies: [ .package( - url: "https://github.com/sqlcipher/sqlcipher.git", - from: "3.4.0" + url: "https://github.com/sqlcipher/SQLCipher.swift.git", + from: "4.10.0" ) ], targets: [ .target( name: "EncryptedCoreData", dependencies: [ - .product(name: "SQLCipher", package: "sqlcipher") + .product(name: "SQLCipher", package: "SQLCipher.swift") ], path: "Incremental Store", sources: [ From 00dc2d531005c6ffeff2cf7db74a065dbabe05da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mari=CC=81a=20Rodri=CC=81guez?= Date: Wed, 10 Sep 2025 17:54:32 +0200 Subject: [PATCH 26/29] Add SQLCipher import --- Incremental Store/EncryptedStore.m | 1 + 1 file changed, 1 insertion(+) diff --git a/Incremental Store/EncryptedStore.m b/Incremental Store/EncryptedStore.m index 9fb0010..5a22273 100755 --- a/Incremental Store/EncryptedStore.m +++ b/Incremental Store/EncryptedStore.m @@ -12,6 +12,7 @@ #import #import "EncryptedStore.h" +#import typedef sqlite3_stmt sqlite3_statement; From d95d3d36e828e9cfbaa40c1fc6bc894b709fbe35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mari=CC=81a=20Rodri=CC=81guez?= Date: Wed, 10 Sep 2025 17:59:49 +0200 Subject: [PATCH 27/29] Add linker settings --- Package.swift | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Package.swift b/Package.swift index 7af230d..7859d6b 100644 --- a/Package.swift +++ b/Package.swift @@ -33,6 +33,10 @@ let package = Package( .define("SQLITE_HAS_CODEC"), .define("SQLCIPHER_CRYPTO_CC"), .headerSearchPath("include"), + ], + linkerSettings: [ + .linkedFramework("CoreData"), + .linkedFramework("Security") ] ), ] From 02f745d92b5f344805596c45b41b908aec4a15c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mari=CC=81a=20Rodri=CC=81guez?= Date: Wed, 10 Sep 2025 18:06:07 +0200 Subject: [PATCH 28/29] Add #import --- Incremental Store/include/EncryptedStore.h | 1 + 1 file changed, 1 insertion(+) diff --git a/Incremental Store/include/EncryptedStore.h b/Incremental Store/include/EncryptedStore.h index 81ec5a8..1b595bb 100755 --- a/Incremental Store/include/EncryptedStore.h +++ b/Incremental Store/include/EncryptedStore.h @@ -6,6 +6,7 @@ // #import +#import typedef struct _options { char * passphrase; From f810372afdb93ad1a5a038b78a01e97d0f25aeeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mari=CC=81a=20Rodri=CC=81guez?= Date: Wed, 10 Sep 2025 18:11:27 +0200 Subject: [PATCH 29/29] Check without linker --- Package.swift | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Package.swift b/Package.swift index 7859d6b..7af230d 100644 --- a/Package.swift +++ b/Package.swift @@ -33,10 +33,6 @@ let package = Package( .define("SQLITE_HAS_CODEC"), .define("SQLCIPHER_CRYPTO_CC"), .headerSearchPath("include"), - ], - linkerSettings: [ - .linkedFramework("CoreData"), - .linkedFramework("Security") ] ), ]