From 04e466617fd9726252a8cec259f9c972f464efa7 Mon Sep 17 00:00:00 2001 From: td Date: Mon, 29 Aug 2022 10:27:37 +0530 Subject: [PATCH] chore: bump sdk to 0.12.2, fixes calls --- android/app/build.gradle | 2 +- lib/pages/bootstrap/bootstrap_dialog.dart | 2 +- pubspec.lock | 4 ++-- pubspec.yaml | 7 ++++++- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index fba903e3..2ea90145 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -32,7 +32,7 @@ if (keystorePropertiesFile.exists()) { } android { - compileSdkVersion 32 + compileSdkVersion 33 sourceSets { main.java.srcDirs += 'src/main/kotlin' diff --git a/lib/pages/bootstrap/bootstrap_dialog.dart b/lib/pages/bootstrap/bootstrap_dialog.dart index 09c221a5..8e37f62b 100644 --- a/lib/pages/bootstrap/bootstrap_dialog.dart +++ b/lib/pages/bootstrap/bootstrap_dialog.dart @@ -88,7 +88,7 @@ class BootstrapDialogState extends State { titleText = null; _recoveryKeyStored = false; bootstrap = - widget.client.encryption!.bootstrap(onUpdate: () => setState(() {})); + widget.client.encryption!.bootstrap(onUpdate: (_) => setState(() {})); final key = await const FlutterSecureStorage().read(key: _secureStorageKey); if (key == null) return; _recoveryKeyTextEditingController.text = key; diff --git a/pubspec.lock b/pubspec.lock index 2bf2fcf5..ccf02983 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1063,7 +1063,7 @@ packages: name: matrix url: "https://pub.dartlang.org" source: hosted - version: "0.11.2" + version: "0.12.2" matrix_api_lite: dependency: transitive description: @@ -1124,7 +1124,7 @@ packages: dependency: "direct main" description: path: "." - ref: HEAD + ref: "8c6a5afe2c965b79b5959bb4b49c4aad020cb980" resolved-ref: "8c6a5afe2c965b79b5959bb4b49c4aad020cb980" url: "https://gitlab.com/famedly/company/frontend/libraries/native_imaging.git" source: git diff --git a/pubspec.yaml b/pubspec.yaml index 51c9ad50..58f16c72 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -63,7 +63,7 @@ dependencies: latlong2: ^0.8.1 localstorage: ^4.0.0+1 lottie: ^1.2.2 - matrix: ^0.11.2 + matrix: ^0.12.2 matrix_homeserver_recommendations: ^0.3.0 matrix_link_text: ^1.0.2 native_imaging: @@ -169,3 +169,8 @@ dependency_overrides: git: url: https://github.com/TheOneWithTheBraid/keyboard_shortcuts.git ref: null-safety + # latest native_imaging needs ffi 2.0.0 but matrix is stuck with 1.0.0 + native_imaging: + git: + url: https://gitlab.com/famedly/company/frontend/libraries/native_imaging.git + ref: 8c6a5afe2c965b79b5959bb4b49c4aad020cb980