Merge remote-tracking branch 'upstream/main'

Author: davidmartos96

.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

sqlite3/assets/wasm/CMakeLists.txt

@@ -1,27 +1,23 @@
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.24)
+
 set(PROJECT_NAME "sqlite3_web")
 project(${PROJECT_NAME} LANGUAGES C)
 
+set(triple wasm32-unknown-wasi)
+set(wasi_sysroot "/usr/share/wasi-sysroot" CACHE PATH "Path to wasi sysroot")
+set(clang "clang" CACHE FILEPATH "Path to wasm-capable clang executable")
+
 include(FetchContent)
-if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
-  # cmake 3.24.0 added the `DOWNLOAD_EXTRACT_TIMESTAMP` and prints an ugly warning when
-  # the default is used, so override it to the recommended behavior.
-  # We can't really ask users to use a cmake that recent, so there's this if here.
-  FetchContent_Declare(
+
+FetchContent_Declare(
     sqlite3
-    URL https://sqlite.org/2023/sqlite-autoconf-3440000.tar.gz
+    URL https://sqlite.org/2024/sqlite-autoconf-3460000.tar.gz
     DOWNLOAD_EXTRACT_TIMESTAMP NEW
-  )
-else()
-  FetchContent_Declare(
-    sqlite3
-    URL https://sqlite.org/2023/sqlite-autoconf-3440000.tar.gz
-  )
-endif()
+)
 
 FetchContent_MakeAvailable(sqlite3)
 
-set(wasm_visibility "__attribute__((visibility(\"default\")))")
+file(DOWNLOAD https://raw.githubusercontent.com/sqlite/sqlite/master/src/test_vfstrace.c "${CMAKE_BINARY_DIR}/vfstrace.c")
 
 get_filename_component(RS_LIB_DIR "${CMAKE_BINARY_DIR}/../../powersync-sqlite-core/" ABSOLUTE)
 set(RS_LIB "powersync")
@@ -31,28 +27,74 @@ set(RS_WASM_TGT_DIR "${RS_LIB_DIR}/target/${RS_WASM_TGT}")
 set(RS_RELEASE_OUT "${RS_WASM_TGT_DIR}/wasm/")
 set(RS_RELEASE_OUT_DEPS "${RS_WASM_TGT_DIR}/wasm/deps")
 set(RS_RELEASE_EXTENSION_OUT "${RS_RELEASE_OUT}/powersync-extension.o")
-set(RS_DEBUG_BC "${RS_WASM_TGT_DIR}/debug/deps/${RS_LIB}.bc")
-set(RS_BUILD_COMMAND "cargo build -p powersync_loadable --profile wasm --no-default-features --features \"powersync_core/static powersync_core/omit_load_extension sqlite_nostd/static sqlite_nostd/omit_load_extension\" -Z build-std=panic_abort,core,alloc --target ${RS_WASM_TGT}")
 
-file(GLOB BYTECODE_FILES "${RS_WASM_TGT_DIR}/wasm/deps/*.bc")
-file(GLOB OBJ_FILES "${RS_WASM_TGT_DIR}/wasm/deps/*.o" CONFIGURE_DEPENDS "*.o")
+# Generate symbols we need to export from the sqlite3.wasm build
+add_custom_command(
+    OUTPUT required_symbols.txt
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../
+    COMMAND dart run tool/wasm_symbols.dart ${CMAKE_CURRENT_BINARY_DIR}/required_symbols.txt
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../../tool/wasm_symbols.dart
+    VERBATIM
+)
+add_custom_target(required_symbols DEPENDS required_symbols.txt)
 
-macro(base_sqlite3_target name)
-    add_executable(${name}
-        "${sqlite3_SOURCE_DIR}/sqlite3.c"
-        os_web.c
-        helpers.c
-    )
+macro(base_sqlite3_target name debug)
+  set(clang_output ${name}.clang.wasm)
+  set(init_output ${name}.init.wasm)
+  set(output ${init_output})
 
-    target_link_libraries(${name} ${RS_RELEASE_EXTENSION_OUT})
-    target_link_options(${name} PRIVATE -nostartfiles -Wl,--import-memory -Wl,--no-entry -Wl,--export-dynamic)
-    target_include_directories(${name} PRIVATE "${PROJECT_SOURCE_DIR}/")
-    target_include_directories(${name} PRIVATE ${sqlite3_SOURCE_DIR})
-    target_compile_definitions(${name} PRIVATE
-        _HAVE_SQLITE_CONFIG_H
-        SQLITE_API=${wasm_visibility}
+  set(sources
+    ${CMAKE_CURRENT_SOURCE_DIR}/os_web.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/helpers.c
+    ${sqlite3_SOURCE_DIR}/sqlite3.c
+    ${RS_RELEASE_EXTENSION_OUT}
+  )
+  set(flags -Wall -Wextra -Wno-unused-parameter -Wno-unused-function)
+
+  if(${debug})
+    list(APPEND sources "${CMAKE_BINARY_DIR}/vfstrace.c")
+    list(APPEND flags "-g" "-DDEBUG")
+  else()
+    list(APPEND flags "-Oz" "-DNDEBUG" "-flto")
+  endif()
+
+  add_custom_command(
+    OUTPUT ${clang_output}
+    COMMAND ${clang} --target=${triple} -std=c23
+      ${flags}
+      -o ${clang_output}
+      -I ${PROJECT_SOURCE_DIR} -I ${sqlite3_SOURCE_DIR}
+      -D_HAVE_SQLITE_CONFIG_H
+      -mcpu=generic
+      -mexec-model=reactor
+      -fno-stack-protector -fno-stack-clash-protection
+      -Wl,--import-memory
+      --sysroot ${wasi_sysroot}
+      ${sources}
+      @${CMAKE_CURRENT_BINARY_DIR}/required_symbols.txt
+    DEPENDS ${sources} required_symbols
+    VERBATIM
+  )
+
+  add_custom_command(
+    OUTPUT ${init_output}
+    COMMAND wasm-ctor-eval -c _initialize ${clang_output} -o ${init_output}
+    VERBATIM
+    DEPENDS ${clang_output}
+  )
+
+  if(NOT ${debug})
+    set(output ${name}.wasm)
+
+    add_custom_command(
+        OUTPUT ${output}
+        COMMAND wasm-opt --strip --strip-producers -c -O4 ${init_output} -o ${output}
+        VERBATIM
+        DEPENDS ${init_output}
     )
-    set_property(TARGET ${name} PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
+  endif()
+
+  add_custom_target(${name} DEPENDS ${output})
 endmacro()
 
 # Script to use llc to get object code from bytecode
@@ -73,26 +115,13 @@ add_custom_target(
     COMMAND sh ${objectcode_script}
 )
 
-base_sqlite3_target(sqlite3_debug)
-file(DOWNLOAD https://raw.githubusercontent.com/sqlite/sqlite/version-3.44.0/src/test_vfstrace.c "${CMAKE_BINARY_DIR}/vfstrace.c")
-target_sources(sqlite3_debug PRIVATE "${CMAKE_BINARY_DIR}/vfstrace.c")
-target_compile_options(sqlite3_debug PRIVATE -g)
-target_compile_definitions(sqlite3_debug PRIVATE SQLITE_ENABLE_VFSTRACE SQLITE_ENABLE_API_ARMOR)
-set_target_properties(sqlite3_debug PROPERTIES OUTPUT_NAME "sqlite3" SUFFIX ".debug.wasm")
-
-base_sqlite3_target(sqlite3_opt)
-target_compile_options(sqlite3_opt PRIVATE -Oz)
-set_target_properties(sqlite3_opt PROPERTIES OUTPUT_NAME "sqlite3" SUFFIX ".tmp.wasm")
-add_custom_command(TARGET sqlite3_opt POST_BUILD
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../
-    COMMAND dart run tool/wasm_dce.dart ${CMAKE_CURRENT_BINARY_DIR}/sqlite3.tmp.wasm ${CMAKE_CURRENT_BINARY_DIR}/sqlite3.dce.wasm
-    COMMAND wasm-opt ${CMAKE_CURRENT_BINARY_DIR}/sqlite3.dce.wasm -O4 -o ${CMAKE_CURRENT_BINARY_DIR}/sqlite3.wasm
-)
+base_sqlite3_target(sqlite3_debug true)
+base_sqlite3_target(sqlite3_opt false)
 
 add_dependencies(sqlite3_opt powersync_core_bytecode)
 add_dependencies(sqlite3_debug powersync_core_bytecode)
 
 add_custom_target(output)
-add_custom_command(TARGET output COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/sqlite3.wasm ${PROJECT_SOURCE_DIR}/../../example/web/sqlite3.wasm DEPENDS)
-add_custom_command(TARGET output COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/sqlite3.debug.wasm ${PROJECT_SOURCE_DIR}/../../example/web/sqlite3.debug.wasm)
-add_dependencies(output sqlite3_debug sqlite3_opt powersync_core_bytecode)
+add_custom_command(TARGET output COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/sqlite3_opt.wasm ${PROJECT_SOURCE_DIR}/../../example/web/sqlite3.wasm)
+add_custom_command(TARGET output COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/sqlite3_debug.init.wasm ${PROJECT_SOURCE_DIR}/../../example/web/sqlite3.debug.wasm)
+add_dependencies(output sqlite3_debug sqlite3_opt powersync_core_bytecode)