Skip to content

Commit

Permalink
Update sqlite-jdbc to 3.45.0.0 + SQLite3MultipleCiphers to 1.8.2
Browse files Browse the repository at this point in the history
  • Loading branch information
05nelsonm committed Jan 19, 2024
1 parent 8522987 commit c7ae378
Show file tree
Hide file tree
Showing 47 changed files with 275,372 additions and 268,394 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -408,10 +408,10 @@ I'm guessing this is not really a factor on iOS."
[badge-encoding]: https://img.shields.io/badge/encoding-2.1.0-blue.svg?style=flat
[badge-immutable]: https://img.shields.io/badge/immutable-0.1.0-blue.svg?style=flat
[badge-sqldelight]: https://img.shields.io/badge/SQLDelight-2.0.1-blue.svg?style=flat
[badge-sqlite]: https://img.shields.io/badge/SQLite3-3.44.1-blue.svg?style=flat
[badge-sqlitemc]: https://img.shields.io/badge/SQLite3MultipleCiphers-1.8.0-blue.svg?style=flat
[badge-sqlite]: https://img.shields.io/badge/SQLite3-3.45.0-blue.svg?style=flat
[badge-sqlitemc]: https://img.shields.io/badge/SQLite3MultipleCiphers-1.8.2-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.44.1.0-blue.svg?style=flat
[badge-sqlitejdbc]: https://img.shields.io/badge/sqlite--jdbc-3.45.0.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.
Binary file modified external/libs/unsigned/Mac/aarch64/libsqlitejdbc.dylib
Binary file not shown.
Binary file modified external/libs/unsigned/Mac/x86_64/libsqlitejdbc.dylib
Binary file not shown.
Binary file modified external/libs/unsigned/Windows/x86/sqlitejdbc.dll
Binary file not shown.
Binary file modified external/libs/unsigned/Windows/x86_64/sqlitejdbc.dll
Binary file not shown.
12 changes: 6 additions & 6 deletions external/patches/0001-Add-user-group-ids-to-docker-build.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 46a7d0e5e2b12290fa9b33b43f1489c8d3de46d6 Mon Sep 17 00:00:00 2001
From ad456ab1c125d72ffbcfd1a3e37c8a903073ea6e Mon Sep 17 00:00:00 2001
From: Matthew Nelson <developer@matthewnelson.io>
Date: Fri, 13 Oct 2023 07:09:23 -0400
Subject: [PATCH 01/11] Add user/group ids to docker build
Expand All @@ -8,7 +8,7 @@ Subject: [PATCH 01/11] Add user/group ids to docker build
1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index aca83ba..18b7a6e 100644
index b32d85f..04cba66 100644
--- a/Makefile
+++ b/Makefile
@@ -29,6 +29,9 @@ SQLITE_INCLUDE := $(shell dirname "$(SQLITE_HEADER)")
Expand All @@ -20,8 +20,8 @@ index aca83ba..18b7a6e 100644
+
$(SQLITE_ARCHIVE):
@mkdir -p $(@D)
curl -L --max-redirs 0 -f -o$@ https://www.sqlite.org/2023/$(SQLITE_AMAL_PREFIX).zip || \
@@ -143,10 +146,10 @@ win-arm64: $(SQLITE_UNPACKED) jni-header
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
./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
Expand All @@ -34,7 +34,7 @@ index aca83ba..18b7a6e 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-'
@@ -158,10 +161,10 @@ freebsd-arm64: $(SQLITE_UNPACKED) jni-header
@@ -159,10 +162,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
Expand All @@ -47,7 +47,7 @@ index aca83ba..18b7a6e 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'
@@ -194,14 +197,14 @@ linux-ppc64: $(SQLITE_UNPACKED) jni-header
@@ -195,14 +198,14 @@ linux-ppc64: $(SQLITE_UNPACKED) jni-header
./docker/dockcross-ppc64 -a $(DOCKER_RUN_OPTS) bash -c 'make clean-native native CROSS_PREFIX=powerpc64le-unknown-linux-gnu- OS_NAME=Linux OS_ARCH=ppc64'

mac64: $(SQLITE_UNPACKED) jni-header
Expand Down
12 changes: 6 additions & 6 deletions external/patches/0002-Disable-double-quoted-strings.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 6d8f0acc9e60e376c89755ee6e05c53b4edd8812 Mon Sep 17 00:00:00 2001
From cf3e49135fe0d553daa77893cdf65d87cb87255d Mon Sep 17 00:00:00 2001
From: Matthew Nelson <developer@matthewnelson.io>
Date: Fri, 13 Oct 2023 07:09:39 -0400
Subject: [PATCH 02/11] Disable double-quoted strings
Expand All @@ -12,10 +12,10 @@ Subject: [PATCH 02/11] Disable double-quoted strings
5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 18b7a6e..71e4047 100644
index 04cba66..1fc51c9 100644
--- a/Makefile
+++ b/Makefile
@@ -104,6 +104,7 @@ $(SQLITE_OUT)/sqlite3.o : $(SQLITE_UNPACKED)
@@ -105,6 +105,7 @@ $(SQLITE_OUT)/sqlite3.o : $(SQLITE_UNPACKED)
-DSQLITE_MAX_ATTACHED=125 \
-DSQLITE_MAX_PAGE_COUNT=4294967294 \
-DSQLITE_DISABLE_PAGECACHE_OVERFLOW_STATS \
Expand Down Expand Up @@ -61,10 +61,10 @@ index a79cd86..89dd54b 100644
assertThat(rs.getString(1)).isEqualTo("TGCA");
rs.close();
diff --git a/src/test/java/org/sqlite/PrepStmtTest.java b/src/test/java/org/sqlite/PrepStmtTest.java
index 403603c..405299c 100644
index ee2e77e..0a296b6 100644
--- a/src/test/java/org/sqlite/PrepStmtTest.java
+++ b/src/test/java/org/sqlite/PrepStmtTest.java
@@ -600,7 +600,7 @@ public class PrepStmtTest {
@@ -605,7 +605,7 @@ public class PrepStmtTest {
public void clearParameters() throws SQLException {
stat.executeUpdate(
"create table tbl (colid integer primary key AUTOINCREMENT, col varchar)");
Expand All @@ -74,7 +74,7 @@ index 403603c..405299c 100644

PreparedStatement prep = conn.prepareStatement("select colid from tbl where col = ?");
diff --git a/src/test/java/org/sqlite/StatementTest.java b/src/test/java/org/sqlite/StatementTest.java
index dc7a7aa..40e5cc0 100644
index ee08f4c..b9d3e9a 100644
--- a/src/test/java/org/sqlite/StatementTest.java
+++ b/src/test/java/org/sqlite/StatementTest.java
@@ -108,7 +108,7 @@ public class StatementTest {
Expand Down
6 changes: 3 additions & 3 deletions external/patches/0003-Remove-JDBC-extensions.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 7c8031d6286e0e057484a00094ba805508ddc0f1 Mon Sep 17 00:00:00 2001
From 6bda9a5a053ac128db4d4d161cd269b4919a6e84 Mon Sep 17 00:00:00 2001
From: Matthew Nelson <developer@matthewnelson.io>
Date: Fri, 13 Oct 2023 07:09:56 -0400
Subject: [PATCH 03/11] Remove JDBC extensions
Expand All @@ -8,10 +8,10 @@ Subject: [PATCH 03/11] Remove JDBC extensions
1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 71e4047..d890f85 100644
index 1fc51c9..e1c88b9 100644
--- a/Makefile
+++ b/Makefile
@@ -69,18 +69,8 @@ clean: clean-native clean-java clean-tests
@@ -70,18 +70,8 @@ clean: clean-native clean-java clean-tests

$(SQLITE_OUT)/sqlite3.o : $(SQLITE_UNPACKED)
@mkdir -p $(@D)
Expand Down
Loading

0 comments on commit c7ae378

Please sign in to comment.