Update SQLite3 to 3.48.0

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

@@ -1,14 +1,14 @@
-From 75d67a6ac90884b4586b0906859279781bdc7177 Mon Sep 17 00:00:00 2001
+From 126c1ae17bd16d4208849943b524c398b41946b1 Mon Sep 17 00:00:00 2001
 From: Matthew Nelson <[email protected]>
-Date: Thu, 16 Jan 2025 06:29:30 -0500
+Date: Thu, 16 Jan 2025 07:51:28 -0500
 Subject: [PATCH 01/10] Add user/group ids to docker build
 
 ---
  Makefile | 17 ++++++++++-------
  1 file changed, 10 insertions(+), 7 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index a698f26..605990f 100644
+index c3d16d7..af2ffa5 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -29,6 +29,9 @@ SQLITE_INCLUDE := $(shell dirname "$(SQLITE_HEADER)")
@@ -20,8 +20,8 @@ index a698f26..605990f 100644
 +
  $(SQLITE_ARCHIVE):
  	@mkdir -p $(@D)
- 	curl -L --max-redirs 0 -f -o$@ https://www.sqlite.org/2024/$(SQLITE_AMAL_PREFIX).zip || \
-@@ -144,10 +147,10 @@ win-arm64: $(SQLITE_UNPACKED) jni-header
+ 	curl -L --max-redirs 0 -f -o$@ https://www.sqlite.org/2025/$(SQLITE_AMAL_PREFIX).zip || \
+@@ -145,10 +148,10 @@ win-arm64: $(SQLITE_UNPACKED) jni-header
  	./docker/dockcross-windows-arm64 -a $(DOCKER_RUN_OPTS) bash -c 'make clean-native native CROSS_PREFIX=aarch64-w64-mingw32- OS_NAME=Windows OS_ARCH=aarch64'
 
  linux32: $(SQLITE_UNPACKED) jni-header
@@ -34,7 +34,7 @@ index a698f26..605990f 100644
 
  freebsd32: $(SQLITE_UNPACKED) jni-header
  	docker run $(DOCKER_RUN_OPTS) -v $$PWD:/workdir empterdose/freebsd-cross-build:9.3 sh -c 'apk add bash; apk add openjdk8; apk add perl; make clean-native native OS_NAME=FreeBSD OS_ARCH=x86 CROSS_PREFIX=i386-freebsd9-'
-@@ -159,10 +162,10 @@ freebsd-arm64: $(SQLITE_UNPACKED) jni-header
+@@ -160,10 +163,10 @@ freebsd-arm64: $(SQLITE_UNPACKED) jni-header
  	docker run $(DOCKER_RUN_OPTS) -v $$PWD:/workdir gotson/freebsd-cross-build:aarch64-11.4 sh -c 'make clean-native native OS_NAME=FreeBSD OS_ARCH=aarch64 CROSS_PREFIX=aarch64-unknown-freebsd11-'
 
  linux-musl32: $(SQLITE_UNPACKED) jni-header
@@ -47,7 +47,7 @@ index a698f26..605990f 100644
 
  linux-musl-arm64: $(SQLITE_UNPACKED) jni-header
  	./docker/dockcross-musl-arm64 -a $(DOCKER_RUN_OPTS) bash -c 'make clean-native native CROSS_PREFIX=aarch64-linux-musl- OS_NAME=Linux-Musl OS_ARCH=aarch64'
-@@ -198,14 +201,14 @@ linux-riscv64: $(SQLITE_UNPACKED) jni-header
+@@ -199,14 +202,14 @@ linux-riscv64: $(SQLITE_UNPACKED) jni-header
  	./docker/dockcross-riscv64 -a $(DOCKER_RUN_OPTS) bash -c 'make clean-native native CROSS_PREFIX=riscv64-unknown-linux-gnu- OS_NAME=Linux OS_ARCH=riscv64'
 
  mac64: $(SQLITE_UNPACKED) jni-header

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

@@ -1,6 +1,6 @@
-From f400f30d18ceae00c85350ed5f8d3d4688376a48 Mon Sep 17 00:00:00 2001
+From 76e4d699bb5cf28a95a5366ecce5ddaf281f997d Mon Sep 17 00:00:00 2001
 From: Matthew Nelson <[email protected]>
-Date: Thu, 16 Jan 2025 06:29:31 -0500
+Date: Thu, 16 Jan 2025 07:51:29 -0500
 Subject: [PATCH 02/10] Disable double-quoted strings
 
 ---
@@ -12,10 +12,10 @@ Subject: [PATCH 02/10] Disable double-quoted strings
  5 files changed, 7 insertions(+), 6 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 605990f..5297c5c 100644
+index af2ffa5..4156840 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -105,6 +105,7 @@ $(SQLITE_OUT)/sqlite3.o : $(SQLITE_UNPACKED)
+@@ -106,6 +106,7 @@ $(SQLITE_OUT)/sqlite3.o : $(SQLITE_UNPACKED)
  	    -DSQLITE_MAX_ATTACHED=125 \
  	    -DSQLITE_MAX_PAGE_COUNT=4294967294 \
  	    -DSQLITE_DISABLE_PAGECACHE_OVERFLOW_STATS \

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

@@ -1,17 +1,17 @@
-From 58d66ed37508f69e9124e9a381a213b3feecf3aa Mon Sep 17 00:00:00 2001
+From 1ce10e9197aab111c27084b5f342c4b1d5e021ca Mon Sep 17 00:00:00 2001
 From: Matthew Nelson <[email protected]>
-Date: Thu, 16 Jan 2025 06:29:32 -0500
+Date: Thu, 16 Jan 2025 07:51:30 -0500
 Subject: [PATCH 03/10] Remove JDBC extensions
 
 ---
  Makefile | 12 +-----------
  1 file changed, 1 insertion(+), 11 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 5297c5c..50f8735 100644
+index 4156840..ddb6b21 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -70,18 +70,8 @@ clean: clean-native clean-java clean-tests
+@@ -71,18 +71,8 @@ clean: clean-native clean-java clean-tests
 
  $(SQLITE_OUT)/sqlite3.o : $(SQLITE_UNPACKED)
  	@mkdir -p $(@D)

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

@@ -1,6 +1,6 @@
-From 11c259481d84d82a83e495583516fc3a7e16e0ab Mon Sep 17 00:00:00 2001
+From 13d7e6a82eb90d4a1e12567e4f8dcf910954ce5d Mon Sep 17 00:00:00 2001
 From: Matthew Nelson <[email protected]>
-Date: Thu, 16 Jan 2025 06:29:32 -0500
+Date: Thu, 16 Jan 2025 07:51:30 -0500
 Subject: [PATCH 04/10] Add Linux-Musl definitions
 
 ---

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

@@ -1,17 +1,17 @@
-From b4e48a62191afc983979412c409a558fb85304e0 Mon Sep 17 00:00:00 2001
+From 6c001bdbae4ca248a6e72f0ec2189028fe37168c Mon Sep 17 00:00:00 2001
 From: Matthew Nelson <[email protected]>
-Date: Thu, 16 Jan 2025 06:29:33 -0500
+Date: Thu, 16 Jan 2025 07:51:31 -0500
 Subject: [PATCH 05/10] Disable Windows arm & FreeBSD targets
 
 ---
  Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index 50f8735..3898179 100644
+index ddb6b21..35df43f 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -115,7 +115,7 @@ NATIVE_TARGET_DIR:=$(TARGET)/classes/org/sqlite/native/$(OS_NAME)/$(OS_ARCH)
+@@ -116,7 +116,7 @@ NATIVE_TARGET_DIR:=$(TARGET)/classes/org/sqlite/native/$(OS_NAME)/$(OS_ARCH)
  NATIVE_DLL:=$(NATIVE_DIR)/$(LIBNAME)
 
  # For cross-compilation, install docker. See also https://github.com/dockcross/dockcross

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

@@ -1,17 +1,17 @@
-From ae6f1f665345749c0f848b0ef5f361ed203a3c21 Mon Sep 17 00:00:00 2001
+From 143c0e0ed49aaa0336d0146924ae86c462c72aea Mon Sep 17 00:00:00 2001
 From: Matthew Nelson <[email protected]>
-Date: Thu, 16 Jan 2025 06:29:34 -0500
+Date: Thu, 16 Jan 2025 07:51:32 -0500
 Subject: [PATCH 06/10] Disable macOS adhoc signing
 
 ---
  Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index 3898179..561ad4c 100644
+index 35df43f..fc1f668 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -115,7 +115,7 @@ NATIVE_TARGET_DIR:=$(TARGET)/classes/org/sqlite/native/$(OS_NAME)/$(OS_ARCH)
+@@ -116,7 +116,7 @@ NATIVE_TARGET_DIR:=$(TARGET)/classes/org/sqlite/native/$(OS_NAME)/$(OS_ARCH)
  NATIVE_DLL:=$(NATIVE_DIR)/$(LIBNAME)
 
  # For cross-compilation, install docker. See also https://github.com/dockcross/dockcross

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

@@ -1,17 +1,17 @@
-From 43aa1dc071d2d8baa44074e417ed1eb788a07ffc Mon Sep 17 00:00:00 2001
+From 79e0fc6c46dd543bd878340720e274e8a074b977 Mon Sep 17 00:00:00 2001
 From: Matthew Nelson <[email protected]>
-Date: Thu, 16 Jan 2025 06:29:35 -0500
+Date: Thu, 16 Jan 2025 07:51:33 -0500
 Subject: [PATCH 07/10] Configure build to use SQLite3MultipleCiphers
 
 ---
- Makefile                                 | 25 +++++++++---------
+ Makefile                                 | 26 +++++++++----------
  Makefile.common                          | 32 ++++++++++++------------
  VERSION                                  |  1 +
  src/main/java/org/sqlite/core/NativeDB.c |  2 +-
- 4 files changed, 30 insertions(+), 30 deletions(-)
+ 4 files changed, 30 insertions(+), 31 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 561ad4c..07e6510 100644
+index fc1f668..07e6510 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -20,7 +20,7 @@ SQLITE_OBJ?=$(SQLITE_OUT)/sqlite3.o
@@ -23,10 +23,11 @@ index 561ad4c..07e6510 100644
  ifneq ($(SQLITE_SOURCE),$(TARGET)/$(SQLITE_AMAL_PREFIX))
  	created := $(shell touch $(SQLITE_UNPACKED))
  endif
-@@ -34,13 +34,7 @@ G_ID:=$(shell id -g)
+@@ -34,14 +34,7 @@ G_ID:=$(shell id -g)
 
  $(SQLITE_ARCHIVE):
  	@mkdir -p $(@D)
+-	curl -L --max-redirs 0 -f -o$@ https://www.sqlite.org/2025/$(SQLITE_AMAL_PREFIX).zip || \
 -	curl -L --max-redirs 0 -f -o$@ https://www.sqlite.org/2024/$(SQLITE_AMAL_PREFIX).zip || \
 -	curl -L --max-redirs 0 -f -o$@ https://www.sqlite.org/2023/$(SQLITE_AMAL_PREFIX).zip || \
 -	curl -L --max-redirs 0 -f -o$@ https://www.sqlite.org/2022/$(SQLITE_AMAL_PREFIX).zip || \
@@ -38,7 +39,7 @@ index 561ad4c..07e6510 100644
 
  $(SQLITE_UNPACKED): $(SQLITE_ARCHIVE)
  	unzip -qo $< -d $(TARGET)/tmp.$(version)
-@@ -87,7 +81,7 @@ $(SQLITE_OUT)/sqlite3.o : $(SQLITE_UNPACKED)
+@@ -88,7 +81,7 @@ $(SQLITE_OUT)/sqlite3.o : $(SQLITE_UNPACKED)
  	    -DSQLITE_DEFAULT_MEMSTATUS=0 \
  	    -DSQLITE_DEFAULT_FILE_PERMISSIONS=0666 \
  	    -DSQLITE_MAX_VARIABLE_NUMBER=250000 \
@@ -47,7 +48,7 @@ index 561ad4c..07e6510 100644
  	    -DSQLITE_MAX_LENGTH=2147483647 \
  	    -DSQLITE_MAX_COLUMN=32767 \
  	    -DSQLITE_MAX_SQL_LENGTH=1073741824 \
-@@ -95,11 +89,16 @@ $(SQLITE_OUT)/sqlite3.o : $(SQLITE_UNPACKED)
+@@ -96,11 +89,16 @@ $(SQLITE_OUT)/sqlite3.o : $(SQLITE_UNPACKED)
  	    -DSQLITE_MAX_ATTACHED=125 \
  	    -DSQLITE_MAX_PAGE_COUNT=4294967294 \
  	    -DSQLITE_DISABLE_PAGECACHE_OVERFLOW_STATS \
@@ -67,7 +68,7 @@ index 561ad4c..07e6510 100644
 
  $(SQLITE_OUT)/$(LIBNAME): $(SQLITE_HEADER) $(SQLITE_OBJ) $(SRC)/org/sqlite/core/NativeDB.c $(TARGET)/common-lib/NativeDB.h
  	@mkdir -p $(@D)
-@@ -115,7 +114,7 @@ NATIVE_TARGET_DIR:=$(TARGET)/classes/org/sqlite/native/$(OS_NAME)/$(OS_ARCH)
+@@ -116,7 +114,7 @@ NATIVE_TARGET_DIR:=$(TARGET)/classes/org/sqlite/native/$(OS_NAME)/$(OS_ARCH)
  NATIVE_DLL:=$(NATIVE_DIR)/$(LIBNAME)
 
  # For cross-compilation, install docker. See also https://github.com/dockcross/dockcross
@@ -209,12 +210,12 @@ index 2f99457..9bc779e 100644
  Windows-x86_64_LIBNAME      := sqlitejdbc.dll
  Windows-x86_64_SQLITE_FLAGS :=
 diff --git a/VERSION b/VERSION
-index 0f283db..460b5dd 100644
+index e969a37..b8e0aca 100644
 --- a/VERSION
 +++ b/VERSION
 @@ -1 +1,2 @@
- version=3.47.2
-+version_mc=2.0.1
+ version=3.48.0
++version_mc=2.0.2
 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,6 +1,6 @@
-From 0abf0a50520279de182f9eb0f0a930efabfab88d Mon Sep 17 00:00:00 2001
+From 36fd7047af1e4e0d8b0129916eae3afd5af108d5 Mon Sep 17 00:00:00 2001
 From: Matthew Nelson <[email protected]>
-Date: Thu, 16 Jan 2025 06:29:36 -0500
+Date: Thu, 16 Jan 2025 07:51:34 -0500
 Subject: [PATCH 08/10] Update Docker images
 
 ---

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

@@ -1,6 +1,6 @@
-From 92ffc4ad80f7050315a686c0cfd6a5c1f7564703 Mon Sep 17 00:00:00 2001
+From 10355be79c2527c055a441b269aab0c7a8590d0f Mon Sep 17 00:00:00 2001
 From: Matthew Nelson <[email protected]>
-Date: Thu, 16 Jan 2025 06:29:37 -0500
+Date: Thu, 16 Jan 2025 07:51:35 -0500
 Subject: [PATCH 09/10] Fix Android API 23- compatibility (Disable all logging)
 
 ---

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

@@ -1,6 +1,6 @@
-From edc5948525ac563a92df951965ef22d9205708c6 Mon Sep 17 00:00:00 2001
+From dba71b49cc14a8a954c87e58686787403778cb0d Mon Sep 17 00:00:00 2001
 From: Matthew Nelson <[email protected]>
-Date: Thu, 16 Jan 2025 06:29:38 -0500
+Date: Thu, 16 Jan 2025 07:51:36 -0500
 Subject: [PATCH 10/10] Disable cipher AEGIS
 
 ---

gradle/libs.versions.toml

@@ -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.2.0"
+sql-jdbc-xerial = "3.48.0.0"
 
 [libraries]
 androidx-startup-runtime = { module = "androidx.startup:startup-runtime", version.ref = "androidx-startup" }