Merge pull request #10 from davidmartos96/update_from_upstream

Update from upstream

Author: mugikhan

.github/actions/build-wasm/action.yml

@@ -43,5 +43,5 @@ runs:
       working-directory: sqlite3
       shell: bash
       run: |
-        cmake -Dwasi_sysroot=/opt/wasi-sysroot -Dclang=/opt/homebrew/opt/llvm@18/bin/clang -S assets/wasm -B .dart_tool/sqlite3_build --toolchain toolchain.cmake
+        cmake -Dwasi_sysroot=/opt/wasi-sysroot -Dclang=/opt/homebrew/opt/llvm@18/bin/clang -S assets/wasm -B .dart_tool/sqlite3_build
         cmake --build .dart_tool/sqlite3_build/ -t output -j

.github/workflows/main.yml

@@ -176,7 +176,7 @@ jobs:
 
     - name: Web tests
       run: |
-        curl https://storage.googleapis.com/simon-public-euw3/assets/sqlite3/wasm/2.4.3/sqlite3.wasm -o example/web/sqlite3.wasm
+        curl https://storage.googleapis.com/simon-public-euw3/assets/sqlite3/wasm/2.4.6/sqlite3.wasm -o example/web/sqlite3.wasm
         dart test -P web -r expanded
       # If browsers behave differently on different platforms, surely that's not our fault...
       # So, only run browser tests on Linux to be faster.

integration_tests/sqlcipher_flutter/android/app/build.gradle

@@ -26,7 +26,17 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 34
+    namespace "com.example.sqlcipher_flutter"
+
+    compileOptions {
+        sourceCompatibility = 1.8
+        targetCompatibility = 1.8
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'

integration_tests/sqlcipher_flutter/android/build.gradle

@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '2.0.10'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0'
+        classpath 'com.android.tools.build:gradle:8.5.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

integration_tests/sqlcipher_flutter/android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip

sqlcipher_flutter_libs/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.6.4
+
+- Fix compilation on Android by upgrading `compileSdk` version.
+
 ## 0.6.3
 
 - Enable extension loading on Windows and Linux to match the compile options

sqlcipher_flutter_libs/android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.1'
+        classpath 'com.android.tools.build:gradle:8.5.1'
     }
 }
 
@@ -22,15 +22,14 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
-
     // Conditional for compatibility with AGP <4.2.
     if (project.android.hasProperty("namespace")) {
         namespace 'eu.simonbinder.sqlite3_flutter_libs'
     }
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion 21
+        compileSdk 34
     }
     lintOptions {
         disable 'InvalidPackage'

sqlcipher_flutter_libs/pubspec.yaml

@@ -1,6 +1,6 @@
 name: sqlcipher_flutter_libs
 description: Flutter plugin to include native SQLCipher libraries in your app
-version: 0.6.3
+version: 0.6.4
 homepage: https://github.com/simolus3/sqlite3.dart/tree/main/sqlcipher_flutter_libs
 issue_tracker: https://github.com/simolus3/sqlite3.dart/issues
 

sqlite3/CHANGELOG.md

@@ -1,12 +1,14 @@
 ## 2.4.6
 
-- Fix selecting large integers (being represented as a `BigInt` in Dart)
-  not working when compiled with dartdevc.
+- WebAssembly: Call `_initialize` function of sqlite3 module if one is present.
+- Support version 1.0.0 of `package:web`.
 
 ## 2.4.5
 
 - Fix a bug in the OPFS-locks implementation causing a deadlock when the `xSleep`
   VFS call is issued.
+- Fix selecting large integers (being represented as a `BigInt` in Dart)
+  not working when compiled with dartdevc.
 
 ## 2.4.4
 

sqlite3/README.md

@@ -175,7 +175,7 @@ With wasi in `/usr/share/wasi-sysroot` and the default clang compiler having the
 required builtins, you can setup the build with:
 
 ```
-cmake -S assets/wasm -B .dart_tool/sqlite3_build --toolchain toolchain.cmake
+cmake -S assets/wasm -B .dart_tool/sqlite3_build
 ```
 
 ##### macOS
@@ -196,7 +196,7 @@ Replace `clang/18` with the correct directory if you're using a different versio
 Then, set up the build with
 
 ```
-cmake -Dwasi_sysroot=/opt/wasi-sysroot -Dclang=/opt/homebrew/opt/llvm/bin/clang -S assets/wasm -B .dart_tool/sqlite3_build --toolchain toolchain.cmake
+cmake -Dwasi_sysroot=/opt/wasi-sysroot -Dclang=/opt/homebrew/opt/llvm/bin/clang -S assets/wasm -B .dart_tool/sqlite3_build
 ```
 
 #### Building