From 10e605a206db0b408e2cae85600f160f4f2d1087 Mon Sep 17 00:00:00 2001 From: Nick Parker Date: Wed, 17 Jan 2024 10:02:59 -0600 Subject: [PATCH 1/2] Update cipher_version test when built against 4.5.6 --- .../zetetic/database/sqlcipher_cts/SQLCipherVersionTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLCipherVersionTest.java b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLCipherVersionTest.java index e67b198..e2da7f1 100644 --- a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLCipherVersionTest.java +++ b/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SQLCipherVersionTest.java @@ -17,6 +17,6 @@ public void shouldExtractLibraryCipherVersion() { cipherVersion = cursor.getString(0); cursor.close(); } - assertThat(cipherVersion, containsString("4.5.4")); + assertThat(cipherVersion, containsString("4.5.6")); } } From a05b38f28664077224419f452392d5cf97786c2d Mon Sep 17 00:00:00 2001 From: Stephen Lombardo Date: Wed, 3 Apr 2024 16:27:28 -0400 Subject: [PATCH 2/2] add buildType for release w/o x86 (32 bit) --- sqlcipher/build.gradle | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sqlcipher/build.gradle b/sqlcipher/build.gradle index 381b0dd..d79a5e4 100644 --- a/sqlcipher/build.gradle +++ b/sqlcipher/build.gradle @@ -20,6 +20,13 @@ android { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } + releaseNoX86 { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + ndk { + abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86_64' + } + } debug { minifyEnabled false debuggable true