Skip to content

Commit

Permalink
Merge pull request #18 from powersync-ja/feat/update-upstream-sqlite
Browse files Browse the repository at this point in the history
Update upstream sqlite package to 2.6.0.
  • Loading branch information
simolus3 authored Jan 15, 2025
2 parents 8ef40f3 + 4d77722 commit 38a9a7d
Show file tree
Hide file tree
Showing 138 changed files with 4,122 additions and 190 deletions.
13 changes: 7 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ jobs:
name: Compile sqlite3 for ${{ matrix.os }}
runs-on: ${{ matrix.os }}
env:
SQLITE_YEAR: "2023"
SQLITE_VERSION: "3420000"
SQLITE_YEAR: "2024"
SQLITE_VERSION: "3470200"

steps:
- uses: actions/cache@v4
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
needs: [compile_sqlite3]
strategy:
matrix:
package: [sqlite3]
package: [sqlite3, sqlite3_test]
dart: [stable]

name: Analyze on Dart ${{ matrix.dart }}
Expand Down Expand Up @@ -182,12 +182,13 @@ jobs:
- name: Test sqlite3_test package
run: |
dart pub get
dart test -P ci
working-directory: sqlite3/
dart test
working-directory: sqlite3_test/

- name: Web tests
run: |
curl https://storage.googleapis.com/simon-public-euw3/assets/sqlite3/wasm/2.4.6/sqlite3.wasm -o example/web/sqlite3.wasm
curl https://simon-public.fsn1.your-objectstorage.com/assets/sqlite3/2.6.0/sqlite3.wasm -o example/web/sqlite3.wasm
curl https://simon-public.fsn1.your-objectstorage.com/assets/sqlite3/2.6.0/sqlite3mc.wasm -o example/web/sqlite3mc.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.
Expand Down
2 changes: 2 additions & 0 deletions integration_tests/flutter_libs/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@
*.swp
.DS_Store
.atom/
.build/
.buildlog/
.history
.svn/
.swiftpm/
migrate_working_dir/

# IntelliJ related
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
// swift-tools-version: 5.9
// The swift-tools-version declares the minimum version of Swift required to build this package.
//
// Generated file. Do not edit.
//

import PackageDescription

let package = Package(
name: "FlutterGeneratedPluginSwiftPackage",
platforms: [
.iOS("12.0")
],
products: [
.library(name: "FlutterGeneratedPluginSwiftPackage", type: .static, targets: ["FlutterGeneratedPluginSwiftPackage"])
],
dependencies: [
.package(name: "integration_test", path: "/Users/simon/fvm/versions/master/packages/integration_test/ios/integration_test"),
.package(name: "sqlite3_flutter_libs", path: "/Users/simon/src/sqlite3.dart/sqlite3_flutter_libs/darwin/sqlite3_flutter_libs")
],
targets: [
.target(
name: "FlutterGeneratedPluginSwiftPackage",
dependencies: [
.product(name: "integration-test", package: "integration_test"),
.product(name: "sqlite3-flutter-libs", package: "sqlite3_flutter_libs")
]
)
]
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
//
// Generated file. Do not edit.
//
30 changes: 17 additions & 13 deletions integration_tests/flutter_libs/macos/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,27 +1,31 @@
PODS:
- FlutterMacOS (1.0.0)
- sqlite3 (3.44.0):
- sqlite3/common (= 3.44.0)
- sqlite3/common (3.44.0)
- sqlite3/fts5 (3.44.0):
- sqlite3 (3.47.0):
- sqlite3/common (= 3.47.0)
- sqlite3/common (3.47.0)
- sqlite3/dbstatvtab (3.47.0):
- sqlite3/common
- sqlite3/perf-threadsafe (3.44.0):
- sqlite3/fts5 (3.47.0):
- sqlite3/common
- sqlite3/rtree (3.44.0):
- sqlite3/perf-threadsafe (3.47.0):
- sqlite3/common
- sqlite3/spellfix1 (3.44.0):
- sqlite3/rtree (3.47.0):
- sqlite3/common
- sqlite3/spellfix1 (3.47.0):
- sqlite3/common
- sqlite3_flutter_libs (0.0.1):
- Flutter
- FlutterMacOS
- sqlite3 (~> 3.44.0)
- sqlite3 (~> 3.47.0)
- sqlite3/dbstatvtab
- sqlite3/fts5
- sqlite3/perf-threadsafe
- sqlite3/rtree

DEPENDENCIES:
- FlutterMacOS (from `Flutter/ephemeral`)
- sqlite3/spellfix1
- sqlite3_flutter_libs (from `Flutter/ephemeral/.symlinks/plugins/sqlite3_flutter_libs/macos`)
- sqlite3_flutter_libs (from `Flutter/ephemeral/.symlinks/plugins/sqlite3_flutter_libs/darwin`)

SPEC REPOS:
trunk:
Expand All @@ -31,13 +35,13 @@ EXTERNAL SOURCES:
FlutterMacOS:
:path: Flutter/ephemeral
sqlite3_flutter_libs:
:path: Flutter/ephemeral/.symlinks/plugins/sqlite3_flutter_libs/macos
:path: Flutter/ephemeral/.symlinks/plugins/sqlite3_flutter_libs/darwin

SPEC CHECKSUMS:
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
sqlite3: 6e2d4a4879854d0ec86b476bf3c3e30870bac273
sqlite3_flutter_libs: a25f3a0f522fdcd8fef6a4a50a3d681dd43d8dea
sqlite3: 0aa20658a9b238a3b1ff7175eb7bdd863b0ab4fd
sqlite3_flutter_libs: 4ed45d66960c84b1616c887c9818c832d4289092

PODFILE CHECKSUM: 61e9fedf3423d4f00828847139028f442a455364

COCOAPODS: 1.14.2
COCOAPODS: 1.14.3
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
C13042E460707A005C110913 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91E41AE44FFF9BE5EAFC9EF5 /* Pods_Runner.framework */; };
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -80,6 +81,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */,
C13042E460707A005C110913 /* Pods_Runner.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -175,6 +177,9 @@

/* Begin PBXNativeTarget section */
33CC10EC2044A3C60003C045 /* Runner */ = {
packageProductDependencies = (
78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
);
isa = PBXNativeTarget;
buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */;
buildPhases = (
Expand All @@ -200,10 +205,13 @@

/* Begin PBXProject section */
33CC10E52044A3C60003C045 /* Project object */ = {
packageReferences = (
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */,
);
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0920;
LastUpgradeCheck = 1430;
LastUpgradeCheck = 1510;
ORGANIZATIONNAME = "";
TargetAttributes = {
33CC10EC2044A3C60003C045 = {
Expand Down Expand Up @@ -628,6 +636,18 @@
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
/* Begin XCLocalSwiftPackageReference section */
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = {
isa = XCLocalSwiftPackageReference;
relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
};
/* End XCLocalSwiftPackageReference section */
/* Begin XCSwiftPackageProductDependency section */
78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
isa = XCSwiftPackageProductDependency;
productName = FlutterGeneratedPluginSwiftPackage;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = 33CC10E52044A3C60003C045 /* Project object */;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"originHash" : "f753fb27fa26d31d71ae095b813ee3082cbd650203f170450c96e6158cc8e4cb",
"pins" : [
{
"identity" : "csqlite",
"kind" : "remoteSourceControl",
"location" : "https://github.com/sbooth/CSQLite.git",
"state" : {
"revision" : "f9bc82fd757667a5d1819db4fbb073c97488eb85",
"version" : "3.47.1"
}
}
],
"version" : 3
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1430"
LastUpgradeVersion = "1510"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<PreActions>
<ExecutionAction
ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
<ActionContent
title = "Run Prepare Flutter Framework Script"
scriptText = "&quot;$FLUTTER_ROOT&quot;/packages/flutter_tools/bin/macos_assemble.sh prepare&#10;">
<EnvironmentBuildable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "33CC10EC2044A3C60003C045"
BuildableName = "flutter_libs.app"
BlueprintName = "Runner"
ReferencedContainer = "container:Runner.xcodeproj">
</BuildableReference>
</EnvironmentBuildable>
</ActionContent>
</ExecutionAction>
</PreActions>
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
Expand Down Expand Up @@ -48,6 +66,7 @@
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
enableGPUValidationMode = "1"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"originHash" : "f753fb27fa26d31d71ae095b813ee3082cbd650203f170450c96e6158cc8e4cb",
"pins" : [
{
"identity" : "csqlite",
"kind" : "remoteSourceControl",
"location" : "https://github.com/sbooth/CSQLite.git",
"state" : {
"revision" : "f9bc82fd757667a5d1819db4fbb073c97488eb85",
"version" : "3.47.1"
}
}
],
"version" : 3
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
import Cocoa
import FlutterMacOS

@NSApplicationMain
@main
class AppDelegate: FlutterAppDelegate {
override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
return true
}

override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {
return true
}
}
4 changes: 4 additions & 0 deletions integration_tests/flutter_libs/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@ description: Integration tests for the sqlite3_flutter_libs package
publish_to: 'none'
version: 1.0.0+1

flutter:
disable-swift-package-manager: true

environment:
sdk: ^3.5.0
flutter: ^3.24.0

dependencies:
sqlite3_flutter_libs:
Expand Down
45 changes: 45 additions & 0 deletions integration_tests/flutter_libs_swiftpm/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# Miscellaneous
*.class
*.log
*.pyc
*.swp
.DS_Store
.atom/
.build/
.buildlog/
.history
.svn/
.swiftpm/
migrate_working_dir/

# IntelliJ related
*.iml
*.ipr
*.iws
.idea/

# The .vscode folder contains launch configuration and tasks you configure in
# VS Code which you may wish to be included in version control, so this line
# is commented out by default.
#.vscode/

# Flutter/Dart/Pub related
**/doc/api/
**/ios/Flutter/.last_build_id
.dart_tool/
.flutter-plugins
.flutter-plugins-dependencies
.pub-cache/
.pub/
/build/

# Symbolication related
app.*.symbols

# Obfuscation related
app.*.map.json

# Android Studio will place build artifacts here
/android/app/debug
/android/app/profile
/android/app/release
45 changes: 45 additions & 0 deletions integration_tests/flutter_libs_swiftpm/.metadata
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# This file tracks properties of this Flutter project.
# Used by Flutter tool to assess capabilities and perform upgrades etc.
#
# This file should be version controlled and should not be manually edited.

version:
revision: "03aeaf158a7bb4b6b51fe8730a673829d64a517c"
channel: "master"

project_type: app

# Tracks metadata for the flutter migrate command
migration:
platforms:
- platform: root
create_revision: 03aeaf158a7bb4b6b51fe8730a673829d64a517c
base_revision: 03aeaf158a7bb4b6b51fe8730a673829d64a517c
- platform: android
create_revision: 03aeaf158a7bb4b6b51fe8730a673829d64a517c
base_revision: 03aeaf158a7bb4b6b51fe8730a673829d64a517c
- platform: ios
create_revision: 03aeaf158a7bb4b6b51fe8730a673829d64a517c
base_revision: 03aeaf158a7bb4b6b51fe8730a673829d64a517c
- platform: linux
create_revision: 03aeaf158a7bb4b6b51fe8730a673829d64a517c
base_revision: 03aeaf158a7bb4b6b51fe8730a673829d64a517c
- platform: macos
create_revision: 03aeaf158a7bb4b6b51fe8730a673829d64a517c
base_revision: 03aeaf158a7bb4b6b51fe8730a673829d64a517c
- platform: web
create_revision: 03aeaf158a7bb4b6b51fe8730a673829d64a517c
base_revision: 03aeaf158a7bb4b6b51fe8730a673829d64a517c
- platform: windows
create_revision: 03aeaf158a7bb4b6b51fe8730a673829d64a517c
base_revision: 03aeaf158a7bb4b6b51fe8730a673829d64a517c

# User provided section

# List of Local paths (relative to this file) that should be
# ignored by the migrate tool.
#
# Files that are not part of the templates will be ignored by default.
unmanaged_files:
- 'lib/main.dart'
- 'ios/Runner.xcodeproj/project.pbxproj'
Loading

0 comments on commit 38a9a7d

Please sign in to comment.