GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2024-12-25 15:02:33 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'krille/update-sdk-correctly' into 'master'

Browse Source 
chore: update sdk

See merge request ChristianPauly/fluffychat-flutter!137
This commit is contained in:
Christian Pauly 2020-08-22 13:11:35 +00:00
commit b5d849bf6f
4 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/utils/database/cipher_db.dart
View File

@ -6,9 +6,9 @@ import 'dart:io';
import 'dart:math'; import 'dart:math';
import 'package:moor/backends.dart'; import 'package:moor/backends.dart';
import 'package:moor/ffi.dart';
import 'package:moor/moor.dart'; import 'package:moor/moor.dart';
import 'package:moor_ffi/moor_ffi.dart'; import 'package:sqlite3/open.dart';
import 'package:moor_ffi/open_helper.dart';
/// Tells `moor_ffi` to use `sqlcipher` instead of the regular `sqlite3`. /// Tells `moor_ffi` to use `sqlcipher` instead of the regular `sqlite3`.
/// ///

4
lib/utils/famedlysdk_store.dart
View File

@ -186,7 +186,9 @@ Future<void> migrate(String clientName, Database db, Store store) async {
entry.key, entry.key,
entry.value['inboundGroupSession'], entry.value['inboundGroupSession'],
json.encode(entry.value['content']), json.encode(entry.value['content']),
json.encode(entry.value['indexes'])); json.encode(entry.value['indexes']),
null,
null);
} }
} }
} }

15
pubspec.lock
View File

@ -180,8 +180,8 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
path: "." path: "."
ref: "50d97ebeb224dcbfa8e306b8cb50adcaee12d4db" ref: "09ffa0940484862139c3fe431d4c3ef3392f2232"
resolved-ref: "50d97ebeb224dcbfa8e306b8cb50adcaee12d4db" resolved-ref: "09ffa0940484862139c3fe431d4c3ef3392f2232"
url: "https://gitlab.com/famedly/famedlysdk.git" url: "https://gitlab.com/famedly/famedlysdk.git"
source: git source: git
version: "0.0.1" version: "0.0.1"
@ -502,14 +502,7 @@ packages:
name: moor name: moor
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "3.3.0" version: "3.3.1"
moor_ffi:
dependency: "direct main"
description:
name: moor_ffi
url: "https://pub.dartlang.org"
source: hosted
version: "0.5.0"
node_interop: node_interop:
dependency: transitive dependency: transitive
description: description:
@ -768,7 +761,7 @@ packages:
source: hosted source: hosted
version: "1.0.2+1" version: "1.0.2+1"
sqlite3: sqlite3:
dependency: transitive dependency: "direct main"
description: description:
name: sqlite3 name: sqlite3
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"

8
pubspec.yaml
View File

@ -27,7 +27,7 @@ dependencies:
famedlysdk: famedlysdk:
git: git:
url: https://gitlab.com/famedly/famedlysdk.git url: https://gitlab.com/famedly/famedlysdk.git
ref: 50d97ebeb224dcbfa8e306b8cb50adcaee12d4db ref: 09ffa0940484862139c3fe431d4c3ef3392f2232
localstorage: ^3.0.1+4 localstorage: ^3.0.1+4
bubble: ^1.1.9+1 bubble: ^1.1.9+1
@ -58,17 +58,15 @@ dependencies:
git: git:
url: https://github.com/Sorunome/flutter_matrix_html url: https://github.com/Sorunome/flutter_matrix_html
ref: 530df434b50002e04cbad63f53d6f0f5d5adbab5 ref: 530df434b50002e04cbad63f53d6f0f5d5adbab5
moor: ^3.0.2 moor: ^3.3.1
sqlite3: ^0.1.4
random_string: ^2.0.1 random_string: ^2.0.1
flutter_typeahead: ^1.8.1 flutter_typeahead: ^1.8.1
flutter_olm: ^1.0.1 flutter_olm: ^1.0.1
intl: ^0.16.0 intl: ^0.16.0
intl_translation: ^0.17.9 intl_translation: ^0.17.9
flutter_localizations: flutter_localizations:
sdk: flutter sdk: flutter
moor_ffi: ^0.5.0 # 0.6.0 and up have a bug that it doesn't build with --profile, see https://github.com/simolus3/moor/issues/581
sqflite: ^1.1.7 # Still used to obtain the database location sqflite: ^1.1.7 # Still used to obtain the database location
dev_dependencies: dev_dependencies: