Skip to content

Commit

Permalink
Update SQLite to 3.47.1 (#130)
Browse files Browse the repository at this point in the history
  • Loading branch information
05nelsonm authored Dec 9, 2024
1 parent a682551 commit 0e0c047
Show file tree
Hide file tree
Showing 20 changed files with 186 additions and 78 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -412,10 +412,10 @@ I'm guessing this is not really a factor on iOS."
[badge-encoding]: https://img.shields.io/badge/encoding-2.2.2-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.0-blue.svg?style=flat
[badge-sqlitemc]: https://img.shields.io/badge/SQLite3MultipleCiphers-1.9.0-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-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.0.0-blue.svg?style=flat
[badge-sqlitejdbc]: https://img.shields.io/badge/sqlite--jdbc-3.47.1.0-blue.svg?style=flat

<!-- TAG_PLATFORMS -->
[badge-platform-android]: http://img.shields.io/badge/-android%20[minSdk%2021]-6EDB8D.svg?style=flat
Expand Down
Binary file modified external/libs/signed/Mac/aarch64/libsqlitejdbc.dylib
Binary file not shown.
Binary file modified external/libs/signed/Mac/x86_64/libsqlitejdbc.dylib
Binary file not shown.
Binary file modified external/libs/signed/Windows/x86/sqlitejdbc.dll
Binary file not shown.
Binary file modified external/libs/signed/Windows/x86_64/sqlitejdbc.dll
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From 727163e68f85df3b5de5daa17e84d6f21b9cf483 Mon Sep 17 00:00:00 2001
From c7673b893f4e1485b1406613861dc40335bac6c4 Mon Sep 17 00:00:00 2001
From: Matthew Nelson <[email protected]>
Date: Wed, 23 Oct 2024 09:51:18 -0400
Date: Mon, 9 Dec 2024 02:59:08 -0500
Subject: [PATCH 1/9] Add user/group ids to docker build

---
Expand Down
4 changes: 2 additions & 2 deletions external/patches/0002-Disable-double-quoted-strings.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From 1477083c5ffffc750791cd6e86efa36201e4be42 Mon Sep 17 00:00:00 2001
From f0f61af65345a482b8ec015d803d6c0d0ee07f92 Mon Sep 17 00:00:00 2001
From: Matthew Nelson <[email protected]>
Date: Wed, 23 Oct 2024 09:51:18 -0400
Date: Mon, 9 Dec 2024 02:59:09 -0500
Subject: [PATCH 2/9] Disable double-quoted strings

---
Expand Down
4 changes: 2 additions & 2 deletions external/patches/0003-Remove-JDBC-extensions.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From 1a17df9a4ecb475d7106b1c851f932c350d100db Mon Sep 17 00:00:00 2001
From 57c57ffb1b805b3ef29272e3f7f89478d4a04aa3 Mon Sep 17 00:00:00 2001
From: Matthew Nelson <[email protected]>
Date: Wed, 23 Oct 2024 09:51:19 -0400
Date: Mon, 9 Dec 2024 02:59:10 -0500
Subject: [PATCH 3/9] Remove JDBC extensions

---
Expand Down
4 changes: 2 additions & 2 deletions external/patches/0004-Add-Linux-Musl-definitions.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From 785916d29e3ffc2c74741b2a2f0d97505df5c0c4 Mon Sep 17 00:00:00 2001
From 96e18f4952200a86088d50c8d16245177764d1d9 Mon Sep 17 00:00:00 2001
From: Matthew Nelson <[email protected]>
Date: Wed, 23 Oct 2024 09:51:20 -0400
Date: Mon, 9 Dec 2024 02:59:11 -0500
Subject: [PATCH 4/9] Add Linux-Musl definitions

---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From 9272444d9be04bcb06f413a9a2eced642a5fd53e Mon Sep 17 00:00:00 2001
From ba0831afff517eb257a0d53348dccc0cafee413a Mon Sep 17 00:00:00 2001
From: Matthew Nelson <[email protected]>
Date: Wed, 23 Oct 2024 09:51:21 -0400
Date: Mon, 9 Dec 2024 02:59:11 -0500
Subject: [PATCH 5/9] Disable Windows arm & FreeBSD targets

---
Expand Down
4 changes: 2 additions & 2 deletions external/patches/0006-Disable-macOS-adhoc-signing.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From e49f26a511ad73df588bef2d0a58626b914c27f1 Mon Sep 17 00:00:00 2001
From df34f7956bed1b2b6c89ed5a8140436df07147bd Mon Sep 17 00:00:00 2001
From: Matthew Nelson <[email protected]>
Date: Wed, 23 Oct 2024 09:51:22 -0400
Date: Mon, 9 Dec 2024 02:59:12 -0500
Subject: [PATCH 6/9] Disable macOS adhoc signing

---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From cea74e728aa76b5e588003b962256df25ce3612f Mon Sep 17 00:00:00 2001
From c0b4df051e1d0be780965763d239d28592fef258 Mon Sep 17 00:00:00 2001
From: Matthew Nelson <[email protected]>
Date: Wed, 23 Oct 2024 09:51:23 -0400
Date: Mon, 9 Dec 2024 02:59:13 -0500
Subject: [PATCH 7/9] Configure build to use SQLite3MultipleCiphers

---
Expand Down Expand Up @@ -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 e54c168..a36200c 100644
index 90c9e32..dce009a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1,2 @@
version=3.47.0
+version_mc=1.9.0
version=3.47.1
+version_mc=1.9.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
Expand Down
4 changes: 2 additions & 2 deletions external/patches/0008-Update-Docker-images.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From 76c7db1b1c28fd12f5027bfd74b3bff3fcc7f862 Mon Sep 17 00:00:00 2001
From 08be9c7ef9f783d7cae33908f58cb51fa625f3fc Mon Sep 17 00:00:00 2001
From: Matthew Nelson <[email protected]>
Date: Wed, 23 Oct 2024 09:51:24 -0400
Date: Mon, 9 Dec 2024 02:59:14 -0500
Subject: [PATCH 8/9] Update Docker images

---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From 55581073ccaf5512541571097b3507b18441c9e0 Mon Sep 17 00:00:00 2001
From 0cee1687bbc81a237398df143ed94f8a32c719fa Mon Sep 17 00:00:00 2001
From: Matthew Nelson <[email protected]>
Date: Wed, 23 Oct 2024 22:25:40 -0400
Date: Mon, 9 Dec 2024 02:59:15 -0500
Subject: [PATCH 9/9] Fix Android API 23- compatibility (Disable all logging)

---
Expand Down
2 changes: 1 addition & 1 deletion external/sqlite-jdbc
Submodule sqlite-jdbc updated 30 files
+2 −2 README.adoc
+1 −1 VERSION
+5 −5 pom.xml
+1 −1 src/main/java/org/sqlite/ExtendedCommand.java
+1 −1 src/main/java9/module-info.java
+ src/main/resources/org/sqlite/native/FreeBSD/aarch64/libsqlitejdbc.so
+ src/main/resources/org/sqlite/native/FreeBSD/x86/libsqlitejdbc.so
+ src/main/resources/org/sqlite/native/FreeBSD/x86_64/libsqlitejdbc.so
+ src/main/resources/org/sqlite/native/Linux-Android/aarch64/libsqlitejdbc.so
+ src/main/resources/org/sqlite/native/Linux-Android/arm/libsqlitejdbc.so
+ src/main/resources/org/sqlite/native/Linux-Android/x86/libsqlitejdbc.so
+ src/main/resources/org/sqlite/native/Linux-Android/x86_64/libsqlitejdbc.so
+ src/main/resources/org/sqlite/native/Linux-Musl/aarch64/libsqlitejdbc.so
+ src/main/resources/org/sqlite/native/Linux-Musl/x86/libsqlitejdbc.so
+ src/main/resources/org/sqlite/native/Linux-Musl/x86_64/libsqlitejdbc.so
+ src/main/resources/org/sqlite/native/Linux/aarch64/libsqlitejdbc.so
+ src/main/resources/org/sqlite/native/Linux/arm/libsqlitejdbc.so
+ src/main/resources/org/sqlite/native/Linux/armv6/libsqlitejdbc.so
+ src/main/resources/org/sqlite/native/Linux/armv7/libsqlitejdbc.so
+ src/main/resources/org/sqlite/native/Linux/ppc64/libsqlitejdbc.so
+ src/main/resources/org/sqlite/native/Linux/riscv64/libsqlitejdbc.so
+ src/main/resources/org/sqlite/native/Linux/x86/libsqlitejdbc.so
+ src/main/resources/org/sqlite/native/Linux/x86_64/libsqlitejdbc.so
+ src/main/resources/org/sqlite/native/Mac/aarch64/libsqlitejdbc.dylib
+ src/main/resources/org/sqlite/native/Mac/x86_64/libsqlitejdbc.dylib
+ src/main/resources/org/sqlite/native/Windows/aarch64/sqlitejdbc.dll
+ src/main/resources/org/sqlite/native/Windows/armv7/sqlitejdbc.dll
+ src/main/resources/org/sqlite/native/Windows/x86/sqlitejdbc.dll
+ src/main/resources/org/sqlite/native/Windows/x86_64/sqlitejdbc.dll
+22 −0 src/test/java/org/sqlite/ExtendedCommandTest.java
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.0"
sql-jdbc-xerial = "3.47.1.0"

[libraries]
androidx-startup-runtime = { module = "androidx.startup:startup-runtime", version.ref = "androidx-startup" }
Expand Down
Loading

0 comments on commit 0e0c047

Please sign in to comment.