RMET-2843 ::: SQLite 3.40.1 Update (#13)

* feat: updated sqlite to 3.40.1

* feat: added mising AAR

* updated versions

* test: bump plugin version

* fix: fixed aar name

* feat: updated android-database-sqlcipher to 4.5.4 custom build

* feat: updated android-database-sqlcipher to 4.5.4 custom build

* fix: added missing build.gradle

* fix: updated iOS sqlite3 amalgamation

Author: nflsilva

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-sqlcipher-adapter",
-  "version": "0.1.7-OS7",
+  "version": "0.1.7-OS8",
   "description": "SQLCipher database adapter for PhoneGap/Cordova, based on cordova-sqlite-storage",
   "cordova": {
     "id": "cordova-sqlcipher-adapter",

plugin.xml

@@ -2,7 +2,7 @@
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android"
     id="cordova-sqlcipher-adapter"
-    version="0.1.7-OS7">
+    version="0.1.7-OS8">
 
     <name>Cordova sqlcipher adapter</name>
 
@@ -27,6 +27,7 @@
     <!-- android -->
     <platform name="android">
         <!-- Cordova >= 3.0.0 -->
+
         <config-file target="res/xml/config.xml" parent="/*">
             <feature name="SQLitePlugin">
                 <param name="android-package" value="io.sqlc.SQLitePlugin"/>
@@ -36,20 +37,11 @@
         <source-file src="src/android/io/sqlc/SQLitePlugin.java" target-dir="src/io/sqlc"/>
         <source-file src="src/android/io/sqlc/SQLiteAndroidDatabase.java" target-dir="src/io/sqlc"/>
 
-        <lib-file src="src/android/libs/android-database-sqlcipher-classes.jar" />
-        <lib-file src="src/android/libs/android-database-sqlcipher-ndk.jar" />
+        <lib-file src="src/android/libs/android-database-sqlcipher-4.5.4-custom.aar" />
         <!-- androidx.sqlite now required -->
         <framework src="androidx.sqlite:sqlite:2.1.0" />
+        <framework src="src/android/build.gradle" custom="true" type="gradleReference" />
 
-        <!-- [FUTURE TBD] consider using external aar again -->
-        <!-- THANKS to @jcesarmobile for GUIDANCE in accepted answer:
-             https://stackoverflow.com/questions/34115571/add-external-jar-library-to-build-cordova-plugin-ionic-framework/34129929#34129929
-         -->
-        <!-- SQLCipher distribution for Android
-             [sqlcipher.jar & ndk objects in aar (modified reference for Buildr)] from:
-             https://mvnrepository.com/artifact/net.zetetic/android-database-sqlcipher/4.3.0
-        <framework src="net.zetetic:android-database-sqlcipher:4.3.0" />
-        - -->
     </platform>
 
     <!-- iOS -->

spec/www/spec/sqlite-version-test.js

@@ -107,9 +107,9 @@ var mytests = function() {
 
               // Check specific SQLCipher version on plugin
               if (isAndroid) // (android-database-sqlcipher)
-                expect(rs.rows.item(0).myResult).toBe('3.33.0');
+                expect(rs.rows.item(0).myResult).toBe('3.40.1');
               else // SQLCipher for iOS/macOS/...
-                expect(rs.rows.item(0).myResult).toBe('3.33.0');
+                expect(rs.rows.item(0).myResult).toBe('3.40.1');
 
               // Close (plugin only) & finish:
               (isWebSql) ? done() : db.close(done, done);
@@ -138,9 +138,9 @@ var mytests = function() {
 
               // Check specific SQLCipher version on plugin
               if (isAndroid) // (android-database-sqlcipher)
-                expect(rs.rows.item(0).cipher_version).toBe('4.4.2 community');
+                expect(rs.rows.item(0).cipher_version).toBe('4.5.4 community');
               else // SQLCipher for iOS/macOS/...
-                expect(rs.rows.item(0).cipher_version).toBe('4.4.2 community');
+                expect(rs.rows.item(0).cipher_version).toBe('4.5.4 community');
 
               // Close (plugin only) & finish:
               (isWebSql) ? done() : db.close(done, done);

src/android/build.gradle

@@ -0,0 +1,3 @@
+dependencies{
+    implementation files("libs/android-database-sqlcipher-4.5.4-custom.aar")
+}

src/android/io/sqlc/SQLiteAndroidDatabase.java

@@ -20,6 +20,8 @@
 import android.database.sqlite.SQLiteStatement;
 // */
 
+import android.database.sqlite.SQLiteConstraintException;
+import android.database.sqlite.SQLiteException;
 import android.util.Log;
 
 import java.io.File;

src/android/io/sqlc/SQLitePlugin.java

@@ -6,13 +6,12 @@
 
 package io.sqlc;
 
+import android.database.sqlite.SQLiteException;
 import android.util.Log;
 
 import com.outsystems.plugins.oslogger.OSLogger;
 import com.outsystems.plugins.oslogger.interfaces.Logger;
 
-import net.sqlcipher.database.SQLiteException;
-
 import java.io.File;
 
 import java.lang.IllegalArgumentException;