Skip to content

chore: flutter upgrade #2068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: flutter upgrade #2068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/versions.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
flutter_version=3.27.4
dart_version=3.6.2
flutter_version=3.29.2
dart_version=3.7.2
1 change: 0 additions & 1 deletion analysis_options.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ linter:
throw_in_finally: true
unawaited_futures: true
unnecessary_statements: true
unsafe_html: true

# Readability & Style
# These are opinionated choices, where Dart gives us 2 ways to express the same thing.
Expand Down
16 changes: 9 additions & 7 deletions lib/matrix_api_lite/utils/print_logs_web.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import 'dart:html';
import 'dart:js_interop';

import 'package:web/web.dart' as web;

import 'package:matrix/matrix_api_lite.dart';

Expand All @@ -13,22 +15,22 @@ extension PrintLogs on LogEvent {
}
switch (level) {
case Level.wtf:
window.console.error('!!!CRITICAL!!! $logsStr');
web.console.error('!!!CRITICAL!!! $logsStr'.toJS);
break;
case Level.error:
window.console.error(logsStr);
web.console.error(logsStr.toJS);
break;
case Level.warning:
window.console.warn(logsStr);
web.console.warn(logsStr.toJS);
break;
case Level.info:
window.console.info(logsStr);
web.console.info(logsStr.toJS);
break;
case Level.debug:
window.console.debug(logsStr);
web.console.debug(logsStr.toJS);
break;
case Level.verbose:
window.console.log(logsStr);
web.console.log(logsStr.toJS);
break;
}
}
Expand Down
2 changes: 2 additions & 0 deletions lib/src/database/indexeddb_box.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// ignore_for_file: deprecated_member_use
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, not sure if it wouldn't be better to directly migrate everything to web. In the SDK actually we don't need to rush for the dart upgrade. Maybe worth another issue I guess? @asabri97


import 'dart:async';
import 'dart:html';
import 'dart:indexed_db';
Expand Down
2 changes: 2 additions & 0 deletions lib/src/utils/crypto/subtle.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Copyright (c) 2020 Famedly GmbH
// SPDX-License-Identifier: AGPL-3.0-or-later

// ignore_for_file: deprecated_member_use

import 'dart:async';
import 'dart:js_util';
import 'dart:typed_data';
Expand Down
2 changes: 2 additions & 0 deletions lib/src/utils/web_worker/native_implementations_web_worker.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// ignore_for_file: deprecated_member_use

import 'dart:async';
import 'dart:collection';
import 'dart:html';
Expand Down
2 changes: 1 addition & 1 deletion lib/src/utils/web_worker/web_worker.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore_for_file: avoid_print
// ignore_for_file: avoid_print, deprecated_member_use

import 'dart:async';
import 'dart:html';
Expand Down
1 change: 1 addition & 0 deletions pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ dependencies:
sqflite_common: ^2.4.5
sqlite3: ^2.1.0
typed_data: ^1.3.2
web: ^1.1.1
webrtc_interface: ^1.2.2+hotfix.1

dev_dependencies:
Expand Down