Update SQLite3MultipleCiphers to 1.9.0 (#127)

.github/workflows/CI.yml

@@ -1,49 +1,26 @@
-name: Test
+name: CI
 
 on: [ pull_request ]
 
 env:
   GRADLE_OPTS: -Dorg.gradle.daemon=false -Dkotlin.incremental=false -Dorg.gradle.jvmargs="-XX:+HeapDumpOnOutOfMemoryError -XX:MetaspaceSize=1g"
 
 jobs:
-  build:
+  check:
     strategy:
       fail-fast: false
       matrix:
         os: [ macos-latest, ubuntu-latest, ubuntu-20.04, windows-latest, windows-2019 ]
-
     runs-on: ${{ matrix.os }}
-
     steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v3
+      - name: Checkout Repository
+        uses: actions/checkout@v4
 
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
-
-      - name: Setup Caches [ Gradle Wrapper ]
-        uses: actions/cache@v1
-        with:
-          path: ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.*') }}
-          restore-keys: ${{ runner.os }}-gradle-wrapper-
-
-      - name: Setup Caches [ Konan ]
-        uses: actions/cache@v1
-        with:
-          path: ~/.konan
-          key: ${{ runner.os }}-konan-${{ hashFiles('**/*.gradle.kts') }}-${{ hashFiles('gradle/libs.versions.toml') }}
-          restore-keys: ${{ runner.os }}-konan-
-
-      - name: Setup Caches [ Gradle Caches ]
-        uses: actions/cache@v1
-        with:
-          path: ~/.gradle/caches
-          key: ${{ matrix.os }}-gradle-caches-${{ hashFiles('**/*.gradle.kts') }}-${{ hashFiles('gradle/libs.versions.toml') }}
-          restore-keys: ${{ matrix.os }}-gradle-caches-
+        uses: gradle/actions/wrapper-validation@v3
 
       - name: Setup JDK
-        uses: actions/setup-java@v3.4.0
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: 17
@@ -53,37 +30,48 @@ jobs:
         run: >
           ./gradlew check --stacktrace
           -PKMP_TARGETS="JVM,JS,IOS_ARM64,IOS_X64,IOS_SIMULATOR_ARM64,MACOS_ARM64,MACOS_X64,TVOS_ARM64,TVOS_X64,TVOS_SIMULATOR_ARM64,WATCHOS_ARM32,WATCHOS_ARM64,WATCHOS_DEVICE_ARM64,WATCHOS_X64,WATCHOS_SIMULATOR_ARM64,WASM_JS,WASM_WASI"
+
       - name: Run Linux Tests
         if: matrix.os == 'ubuntu-latest'
         run: >
           ./gradlew check --stacktrace
           -PKMP_TARGETS="JVM,JS,ANDROID,ANDROID_ARM32,ANDROID_ARM64,ANDROID_X64,ANDROID_X86,LINUX_ARM64,LINUX_X64,WASM_JS,WASM_WASI"
+
       - name: Run Linux JVM Tests
         if: matrix.os == 'ubuntu-20.04'
         run: >
           ./gradlew check --stacktrace
           -PKMP_TARGETS="JVM"
+
       - name: Run Windows Tests
         if: matrix.os == 'windows-latest'
         run: >
           ./gradlew check --stacktrace
           -PKMP_TARGETS="JVM,JS,MINGW_X64,WASM_JS,WASM_WASI"
+
       - name: Run Windows JVM Tests
         if: matrix.os == 'windows-2019'
         run: >
           ./gradlew check --stacktrace
           -PKMP_TARGETS="JVM"
 
-  emulator:
-    runs-on: ubuntu-latest
+      - name: Upload Test Reports
+        uses: actions/upload-artifact@v4
+        if: ${{ always() }}
+        with:
+          name: test-report-${{ matrix.os }}
+          path: '**/build/reports/tests/**'
+          retention-days: 1
 
+  android-check:
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        api-level: [ 21, 23, 26, 29 ]
+        api-level: [ 21, 23, 24, 26, 29 ]
     steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v3
+      - name: Checkout Repository
+        uses: actions/checkout@v4
 
       - name: Enable KVM
         run: |
@@ -92,20 +80,25 @@ jobs:
           sudo udevadm trigger --name-match=kvm
 
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/actions/wrapper-validation@v3
 
       - name: Setup JDK
-        uses: actions/setup-java@v3.11.0
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: 17
 
-      - name: Build
-        uses: gradle/gradle-build-action@v2
-
       - name: Run Android Instrumented Tests
         uses: reactivecircus/android-emulator-runner@v2
         with:
           emulator-boot-timeout: 300 # 5 minutes
           api-level: ${{ matrix.api-level }}
           script: ./gradlew :library:driver-test:connectedCheck -PKMP_TARGETS="ANDROID,JVM"
+
+      - name: Upload Test Reports
+        uses: actions/upload-artifact@v4
+        if: ${{ always() }}
+        with:
+          name: test-report-android-${{ matrix.api-level }}
+          path: '**/build/reports/androidTests/**'
+          retention-days: 1

README.md

@@ -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.1-blue.svg?style=flat
 [badge-immutable]: https://img.shields.io/badge/immutable-0.1.3-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.46.1-blue.svg?style=flat
-[badge-sqlitemc]: https://img.shields.io/badge/SQLite3MultipleCiphers-1.8.7-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-sqliter]: https://img.shields.io/badge/SQLiter-1.3.1-blue.svg?style=flat
-[badge-sqlitejdbc]: https://img.shields.io/badge/sqlite--jdbc-3.46.1.0-blue.svg?style=flat
+[badge-sqlitejdbc]: https://img.shields.io/badge/sqlite--jdbc-3.47.0.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 ab4fc3549cc16c2f688360fcae3ecd3bf7a1ed80 Mon Sep 17 00:00:00 2001
+From 727163e68f85df3b5de5daa17e84d6f21b9cf483 Mon Sep 17 00:00:00 2001
 From: Matthew Nelson <[email protected]>
-Date: Wed, 21 Aug 2024 12:11:44 -0400
-Subject: [PATCH 1/8] Add user/group ids to docker build
+Date: Wed, 23 Oct 2024 09:51:18 -0400
+Subject: [PATCH 1/9] Add user/group ids to docker build
 
 ---
  Makefile | 17 ++++++++++-------

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

@@ -1,7 +1,7 @@
-From 8a3bc05b0c08d4c9d4270633a4ea8912dec7e7eb Mon Sep 17 00:00:00 2001
+From 1477083c5ffffc750791cd6e86efa36201e4be42 Mon Sep 17 00:00:00 2001
 From: Matthew Nelson <[email protected]>
-Date: Wed, 21 Aug 2024 12:11:45 -0400
-Subject: [PATCH 2/8] Disable double-quoted strings
+Date: Wed, 23 Oct 2024 09:51:18 -0400
+Subject: [PATCH 2/9] Disable double-quoted strings
 
 ---
  Makefile                                    | 1 +
@@ -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 ee2e77e..0a296b6 100644
+index 1bf609d..fee401d 100644
 --- a/src/test/java/org/sqlite/PrepStmtTest.java
 +++ b/src/test/java/org/sqlite/PrepStmtTest.java
-@@ -605,7 +605,7 @@ public class PrepStmtTest {
+@@ -635,7 +635,7 @@ public class PrepStmtTest {
      public void clearParameters() throws SQLException {
          stat.executeUpdate(
                  "create table tbl (colid integer primary key AUTOINCREMENT, col varchar)");
@@ -74,10 +74,10 @@ index ee2e77e..0a296b6 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 172a2f2..40b8a2b 100644
+index e8c891a..7419bbd 100644
 --- a/src/test/java/org/sqlite/StatementTest.java
 +++ b/src/test/java/org/sqlite/StatementTest.java
-@@ -108,7 +108,7 @@ public class StatementTest {
+@@ -106,7 +106,7 @@ public class StatementTest {
 
      @Test
      public void stringRS() throws SQLException {

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

@@ -1,7 +1,7 @@
-From 1904df0f4bdb9e3e05a5b4b7c076d6503434d474 Mon Sep 17 00:00:00 2001
+From 1a17df9a4ecb475d7106b1c851f932c350d100db Mon Sep 17 00:00:00 2001
 From: Matthew Nelson <[email protected]>
-Date: Wed, 21 Aug 2024 12:11:45 -0400
-Subject: [PATCH 3/8] Remove JDBC extensions
+Date: Wed, 23 Oct 2024 09:51:19 -0400
+Subject: [PATCH 3/9] Remove JDBC extensions
 
 ---
  Makefile | 12 +-----------

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

@@ -1,7 +1,7 @@
-From 0328e3006287191efa330362e78f3e095dfcf065 Mon Sep 17 00:00:00 2001
+From 785916d29e3ffc2c74741b2a2f0d97505df5c0c4 Mon Sep 17 00:00:00 2001
 From: Matthew Nelson <[email protected]>
-Date: Wed, 21 Aug 2024 12:11:46 -0400
-Subject: [PATCH 4/8] Add Linux-Musl definitions
+Date: Wed, 23 Oct 2024 09:51:20 -0400
+Subject: [PATCH 4/9] Add Linux-Musl definitions
 
 ---
  Makefile.common | 23 ++++++++++++++++++++++-

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

@@ -1,7 +1,7 @@
-From baf227a58c816e6f6fe0479ecdc28263e58ab724 Mon Sep 17 00:00:00 2001
+From 9272444d9be04bcb06f413a9a2eced642a5fd53e Mon Sep 17 00:00:00 2001
 From: Matthew Nelson <[email protected]>
-Date: Wed, 21 Aug 2024 12:11:47 -0400
-Subject: [PATCH 5/8] Disable Windows arm & FreeBSD targets
+Date: Wed, 23 Oct 2024 09:51:21 -0400
+Subject: [PATCH 5/9] Disable Windows arm & FreeBSD targets
 
 ---
  Makefile | 2 +-

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

@@ -1,7 +1,7 @@
-From dd490870c001345f763529761661b8a371ee4144 Mon Sep 17 00:00:00 2001
+From e49f26a511ad73df588bef2d0a58626b914c27f1 Mon Sep 17 00:00:00 2001
 From: Matthew Nelson <[email protected]>
-Date: Wed, 21 Aug 2024 12:11:48 -0400
-Subject: [PATCH 6/8] Disable macOS adhoc signing
+Date: Wed, 23 Oct 2024 09:51:22 -0400
+Subject: [PATCH 6/9] Disable macOS adhoc signing
 
 ---
  Makefile | 2 +-

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

@@ -1,7 +1,7 @@
-From f1ded894f65ecc0d6de72900ccd2b737db8bd8bb Mon Sep 17 00:00:00 2001
+From cea74e728aa76b5e588003b962256df25ce3612f Mon Sep 17 00:00:00 2001
 From: Matthew Nelson <[email protected]>
-Date: Wed, 21 Aug 2024 12:11:49 -0400
-Subject: [PATCH 7/8] Configure build to use SQLite3MultipleCiphers
+Date: Wed, 23 Oct 2024 09:51:23 -0400
+Subject: [PATCH 7/9] 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 d30720f..a7d7bf2 100644
+index e54c168..a36200c 100644
 --- a/VERSION
 +++ b/VERSION
 @@ -1 +1,2 @@
- version=3.46.1
-+version_mc=1.8.7
+ version=3.47.0
++version_mc=1.9.0
 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 bfa506b800741aefbb689ae49837a79561b248e4 Mon Sep 17 00:00:00 2001
+From 76c7db1b1c28fd12f5027bfd74b3bff3fcc7f862 Mon Sep 17 00:00:00 2001
 From: Matthew Nelson <[email protected]>
-Date: Wed, 21 Aug 2024 12:11:50 -0400
-Subject: [PATCH 8/8] Update Docker images
+Date: Wed, 23 Oct 2024 09:51:24 -0400
+Subject: [PATCH 8/9] Update Docker images
 
 ---
  Makefile                    | 27 ++++++++++++++-------------
@@ -12,14 +12,14 @@ Subject: [PATCH 8/8] Update Docker images
  5 files changed, 31 insertions(+), 37 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 07e6510..23666a9 100644
+index 07e6510..bb2e184 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -21,6 +21,7 @@ SQLITE_ARCHIVE:=$(TARGET)/$(sqlite)-amal.zip
  SQLITE_UNPACKED:=$(TARGET)/sqlite-unpack.log
  SQLITE_SOURCE?=$(TARGET)/$(SQLITE_AMAL_PREFIX)
  SQLITE_HEADER?=$(SQLITE_SOURCE)/sqlite3mc_amalgamation.h
-+TAG_BUILD_ENV=0.1.3
++TAG_BUILD_ENV=0.2.0
  ifneq ($(SQLITE_SOURCE),$(TARGET)/$(SQLITE_AMAL_PREFIX))
  	created := $(shell touch $(SQLITE_UNPACKED))
  endif