Update SQLite3 to 3.47.2 (#132)

README.md

@@ -301,6 +301,7 @@ Versioning follows the following pattern of `SQLDelight` - `SQLite3MultipleCiphe
 `SQLITE_ENABLE_REGEXP=1`  
 `SQLITE_TEMP_STORE=2`  
 `SQLITE_USE_URI=1`  
+`WXSQLITE3_HAVE_CIPHER_AEGIS=0`  
 
 **Jvm**
 
@@ -409,13 +410,13 @@ I'm guessing this is not really a factor on iOS."
 <!-- TAG_DEPENDENCIES -->
 [badge-kotlin]: https://img.shields.io/badge/kotlin-1.9.24-blue.svg?logo=kotlin
 [badge-coroutines]: https://img.shields.io/badge/coroutines-1.8.1-blue.svg?logo=kotlin
-[badge-encoding]: https://img.shields.io/badge/encoding-2.2.2-blue.svg?style=flat
+[badge-encoding]: https://img.shields.io/badge/encoding-2.3.1-blue.svg?style=flat
 [badge-immutable]: https://img.shields.io/badge/immutable-0.1.4-blue.svg?style=flat
 [badge-sqldelight]: https://img.shields.io/badge/SQLDelight-2.0.2-blue.svg?style=flat
-[badge-sqlite]: https://img.shields.io/badge/SQLite3-3.47.1-blue.svg?style=flat
-[badge-sqlitemc]: https://img.shields.io/badge/SQLite3MultipleCiphers-1.9.1-blue.svg?style=flat
+[badge-sqlite]: https://img.shields.io/badge/SQLite3-3.47.2-blue.svg?style=flat
+[badge-sqlitemc]: https://img.shields.io/badge/SQLite3MultipleCiphers-2.0.1-blue.svg?style=flat
 [badge-sqliter]: https://img.shields.io/badge/SQLiter-1.3.1-blue.svg?style=flat
-[badge-sqlitejdbc]: https://img.shields.io/badge/sqlite--jdbc-3.47.1.0-blue.svg?style=flat
+[badge-sqlitejdbc]: https://img.shields.io/badge/sqlite--jdbc-3.47.2.0-blue.svg?style=flat
 
 <!-- TAG_PLATFORMS -->
 [badge-platform-android]: http://img.shields.io/badge/-android%20[minSdk%2021]-6EDB8D.svg?style=flat

external/patches/0001-Add-user-group-ids-to-docker-build.patch

@@ -1,7 +1,7 @@
-From c7673b893f4e1485b1406613861dc40335bac6c4 Mon Sep 17 00:00:00 2001
+From 75d67a6ac90884b4586b0906859279781bdc7177 Mon Sep 17 00:00:00 2001
 From: Matthew Nelson <[email protected]>
-Date: Mon, 9 Dec 2024 02:59:08 -0500
-Subject: [PATCH 1/9] Add user/group ids to docker build
+Date: Thu, 16 Jan 2025 06:29:30 -0500
+Subject: [PATCH 01/10] Add user/group ids to docker build
 
 ---
  Makefile | 17 ++++++++++-------

external/patches/0002-Disable-double-quoted-strings.patch

@@ -1,7 +1,7 @@
-From f0f61af65345a482b8ec015d803d6c0d0ee07f92 Mon Sep 17 00:00:00 2001
+From f400f30d18ceae00c85350ed5f8d3d4688376a48 Mon Sep 17 00:00:00 2001
 From: Matthew Nelson <[email protected]>
-Date: Mon, 9 Dec 2024 02:59:09 -0500
-Subject: [PATCH 2/9] Disable double-quoted strings
+Date: Thu, 16 Jan 2025 06:29:31 -0500
+Subject: [PATCH 02/10] Disable double-quoted strings
 
 ---
  Makefile                                    | 1 +

external/patches/0003-Remove-JDBC-extensions.patch

@@ -1,7 +1,7 @@
-From 57c57ffb1b805b3ef29272e3f7f89478d4a04aa3 Mon Sep 17 00:00:00 2001
+From 58d66ed37508f69e9124e9a381a213b3feecf3aa Mon Sep 17 00:00:00 2001
 From: Matthew Nelson <[email protected]>
-Date: Mon, 9 Dec 2024 02:59:10 -0500
-Subject: [PATCH 3/9] Remove JDBC extensions
+Date: Thu, 16 Jan 2025 06:29:32 -0500
+Subject: [PATCH 03/10] Remove JDBC extensions
 
 ---
  Makefile | 12 +-----------

external/patches/0004-Add-Linux-Musl-definitions.patch

@@ -1,7 +1,7 @@
-From 96e18f4952200a86088d50c8d16245177764d1d9 Mon Sep 17 00:00:00 2001
+From 11c259481d84d82a83e495583516fc3a7e16e0ab Mon Sep 17 00:00:00 2001
 From: Matthew Nelson <[email protected]>
-Date: Mon, 9 Dec 2024 02:59:11 -0500
-Subject: [PATCH 4/9] Add Linux-Musl definitions
+Date: Thu, 16 Jan 2025 06:29:32 -0500
+Subject: [PATCH 04/10] Add Linux-Musl definitions
 
 ---
  Makefile.common | 23 ++++++++++++++++++++++-

external/patches/0005-Disable-Windows-arm-FreeBSD-targets.patch

@@ -1,7 +1,7 @@
-From ba0831afff517eb257a0d53348dccc0cafee413a Mon Sep 17 00:00:00 2001
+From b4e48a62191afc983979412c409a558fb85304e0 Mon Sep 17 00:00:00 2001
 From: Matthew Nelson <[email protected]>
-Date: Mon, 9 Dec 2024 02:59:11 -0500
-Subject: [PATCH 5/9] Disable Windows arm & FreeBSD targets
+Date: Thu, 16 Jan 2025 06:29:33 -0500
+Subject: [PATCH 05/10] Disable Windows arm & FreeBSD targets
 
 ---
  Makefile | 2 +-

external/patches/0006-Disable-macOS-adhoc-signing.patch

@@ -1,7 +1,7 @@
-From df34f7956bed1b2b6c89ed5a8140436df07147bd Mon Sep 17 00:00:00 2001
+From ae6f1f665345749c0f848b0ef5f361ed203a3c21 Mon Sep 17 00:00:00 2001
 From: Matthew Nelson <[email protected]>
-Date: Mon, 9 Dec 2024 02:59:12 -0500
-Subject: [PATCH 6/9] Disable macOS adhoc signing
+Date: Thu, 16 Jan 2025 06:29:34 -0500
+Subject: [PATCH 06/10] Disable macOS adhoc signing
 
 ---
  Makefile | 2 +-

external/patches/0007-Configure-build-to-use-SQLite3MultipleCiphers.patch

@@ -1,7 +1,7 @@
-From c0b4df051e1d0be780965763d239d28592fef258 Mon Sep 17 00:00:00 2001
+From 43aa1dc071d2d8baa44074e417ed1eb788a07ffc Mon Sep 17 00:00:00 2001
 From: Matthew Nelson <[email protected]>
-Date: Mon, 9 Dec 2024 02:59:13 -0500
-Subject: [PATCH 7/9] Configure build to use SQLite3MultipleCiphers
+Date: Thu, 16 Jan 2025 06:29:35 -0500
+Subject: [PATCH 07/10] Configure build to use SQLite3MultipleCiphers
 
 ---
  Makefile                                 | 25 +++++++++---------
@@ -209,12 +209,12 @@ index 2f99457..9bc779e 100644
  Windows-x86_64_LIBNAME      := sqlitejdbc.dll
  Windows-x86_64_SQLITE_FLAGS :=
 diff --git a/VERSION b/VERSION
-index 90c9e32..dce009a 100644
+index 0f283db..460b5dd 100644
 --- a/VERSION
 +++ b/VERSION
 @@ -1 +1,2 @@
- version=3.47.1
-+version_mc=1.9.1
+ version=3.47.2
++version_mc=2.0.1
 diff --git a/src/main/java/org/sqlite/core/NativeDB.c b/src/main/java/org/sqlite/core/NativeDB.c
 index 7361dbc..17dab54 100644
 --- a/src/main/java/org/sqlite/core/NativeDB.c

external/patches/0008-Update-Docker-images.patch

@@ -1,7 +1,7 @@
-From 08be9c7ef9f783d7cae33908f58cb51fa625f3fc Mon Sep 17 00:00:00 2001
+From 0abf0a50520279de182f9eb0f0a930efabfab88d Mon Sep 17 00:00:00 2001
 From: Matthew Nelson <[email protected]>
-Date: Mon, 9 Dec 2024 02:59:14 -0500
-Subject: [PATCH 8/9] Update Docker images
+Date: Thu, 16 Jan 2025 06:29:36 -0500
+Subject: [PATCH 08/10] Update Docker images
 
 ---
  Makefile                    | 27 ++++++++++++++-------------

external/patches/0009-Fix-Android-API-23-compatibility-Disable-all-logging.patch

@@ -1,7 +1,7 @@
-From 0cee1687bbc81a237398df143ed94f8a32c719fa Mon Sep 17 00:00:00 2001
+From 92ffc4ad80f7050315a686c0cfd6a5c1f7564703 Mon Sep 17 00:00:00 2001
 From: Matthew Nelson <[email protected]>
-Date: Mon, 9 Dec 2024 02:59:15 -0500
-Subject: [PATCH 9/9] Fix Android API 23- compatibility (Disable all logging)
+Date: Thu, 16 Jan 2025 06:29:37 -0500
+Subject: [PATCH 09/10] Fix Android API 23- compatibility (Disable all logging)
 
 ---
  src/main/java/org/sqlite/JDBC.java            |  8 ++--
@@ -200,7 +200,7 @@ index a71e8ea..b563484 100644
      }
 
 diff --git a/src/main/java/org/sqlite/jdbc3/JDBC3DatabaseMetaData.java b/src/main/java/org/sqlite/jdbc3/JDBC3DatabaseMetaData.java
-index 086fcbc..bd1ba88 100644
+index 59aadfb..6e94570 100644
 --- a/src/main/java/org/sqlite/jdbc3/JDBC3DatabaseMetaData.java
 +++ b/src/main/java/org/sqlite/jdbc3/JDBC3DatabaseMetaData.java
 @@ -25,8 +25,8 @@ import org.sqlite.SQLiteConnection;

external/patches/0010-Disable-cipher-AEGIS.patch

@@ -0,0 +1,24 @@
+From edc5948525ac563a92df951965ef22d9205708c6 Mon Sep 17 00:00:00 2001
+From: Matthew Nelson <[email protected]>
+Date: Thu, 16 Jan 2025 06:29:38 -0500
+Subject: [PATCH 10/10] Disable cipher AEGIS
+
+---
+ Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile b/Makefile
+index bb2e184..d2ec350 100644
+--- a/Makefile
++++ b/Makefile
+@@ -96,6 +96,7 @@ $(SQLITE_OUT)/sqlite3.o : $(SQLITE_UNPACKED)
+ 	    -DSQLITE_ENABLE_REGEXP=1 \
+ 	    -DSQLITE_TEMP_STORE=2 \
+ 	    -DSQLITE_USE_URI=1 \
++	    -DWXSQLITE3_HAVE_CIPHER_AEGIS=0 \
+ 	    $(SQLITE_FLAGS) \
+ 	    $(SQLITE_OUT)/sqlite3mc_amalgamation.c
+
+-- 
+2.34.1
+

gradle.properties

@@ -32,7 +32,7 @@ POM_DEVELOPER_ID=toxicity-io
 POM_DEVELOPER_NAME=Toxicity
 POM_DEVELOPER_URL=https://github.com/toxicity-io/
 
-VERSION_NAME=2.0.2-1.9.2-0-SNAPSHOT
+VERSION_NAME=2.0.2-2.0.1-0-SNAPSHOT
 # 2.0.0-1.6.4-0-alpha01 = (02 00 00 00) + (01 06 04 00) + 11 = 03 06 04 11
 # 2.0.0-1.6.4-0-beta01  = (02 00 00 00) + (01 06 04 00) + 21 = 03 06 04 21
 # 2.0.0-1.6.4-0-rc01    = (02 00 00 00) + (01 06 04 00) + 31 = 03 06 04 31
@@ -42,4 +42,4 @@ VERSION_NAME=2.0.2-1.9.2-0-SNAPSHOT
 # 2.1.0-1.6.5-2         = (02 01 00 00) + (01 06 05 00) + 42 = 03 07 05 42
 # 2.1.0-1.6.6-0         = (02 01 00 00) + (01 06 06 00) + 40 = 03 07 06 40
 # 2.2.1-1.7.0-0         = (02 02 01 00) + (01 07 00 00) + 40 = 03 09 01 40
-VERSION_CODE=03090440
+VERSION_CODE=04000340

gradle/libs.versions.toml

@@ -3,7 +3,7 @@ androidx-startup = "1.2.0"
 androidx-test-core = "1.6.1"
 androidx-test-runner = "1.6.2"
 
-encoding = "2.2.2"
+encoding = "2.3.1"
 
 gradle-android = "8.2.2"
 gradle-binary-compat = "0.16.3"
@@ -22,7 +22,7 @@ okio = "3.9.0"
 
 sql-delight-dialect = "sqlite-3-38-dialect"
 sql-delight = "2.0.2"
-sql-jdbc-xerial = "3.47.1.0"
+sql-jdbc-xerial = "3.47.2.0"
 
 [libraries]
 androidx-startup-runtime = { module = "androidx.startup:startup-runtime", version.ref = "androidx-startup" }

library/driver/build.gradle.kts

@@ -310,6 +310,7 @@ fun CompileToBitcodeExtension.createSqlite3mc() {
             "-DSQLITE_ENABLE_REGEXP=1",
             "-DSQLITE_TEMP_STORE=2",
             "-DSQLITE_USE_URI=1",
+            "-DWXSQLITE3_HAVE_CIPHER_AEGIS=0",
         ).let { compilerArgs.addAll(it) }
 
         // Linker (llvm-link) options