From ff6a2a29184386dec3abd98653de4c3f05dd5a3d Mon Sep 17 00:00:00 2001 From: ggurdin <46800240+ggurdin@users.noreply.github.com> Date: Mon, 16 Dec 2024 09:59:56 -0500 Subject: [PATCH] upgrade to flutter 3.27.0 (#1256) --- .github/workflows/versions.env | 2 +- .gitignore | 1 + lib/pages/chat/events/html_message.dart | 37 ------------- pubspec.lock | 69 ++++++++++--------------- pubspec.yaml | 6 ++- 5 files changed, 34 insertions(+), 81 deletions(-) diff --git a/.github/workflows/versions.env b/.github/workflows/versions.env index 2049a048e..bf9b00f05 100644 --- a/.github/workflows/versions.env +++ b/.github/workflows/versions.env @@ -1,2 +1,2 @@ -FLUTTER_VERSION=3.24.5 +FLUTTER_VERSION=3.27.0 JAVA_VERSION=17 diff --git a/.gitignore b/.gitignore index 62b5cdcf1..cbc271c84 100644 --- a/.gitignore +++ b/.gitignore @@ -54,6 +54,7 @@ docs/tailwind.css /key.jks /android/key.properties +/android/app/build/ **/android/app/.cxx android/key.jks android/keys.json diff --git a/lib/pages/chat/events/html_message.dart b/lib/pages/chat/events/html_message.dart index 73876ab55..29c7a6ae2 100644 --- a/lib/pages/chat/events/html_message.dart +++ b/lib/pages/chat/events/html_message.dart @@ -9,7 +9,6 @@ import 'package:flutter_highlighter/flutter_highlighter.dart'; import 'package:flutter_highlighter/themes/shades-of-purple.dart'; import 'package:flutter_html/flutter_html.dart'; // import 'package:flutter_html_table/flutter_html_table.dart'; -import 'package:flutter_math_fork/flutter_math.dart'; import 'package:html/dom.dart' as dom; import 'package:linkify/linkify.dart'; import 'package:matrix/matrix.dart'; @@ -164,9 +163,6 @@ class HtmlMessage extends StatelessWidget { extensions: [ RoomPillExtension(context, room, fontSize, linkColor), CodeExtension(fontSize: fontSize), - MatrixMathExtension( - style: TextStyle(fontSize: fontSize, color: textColor), - ), // #Pangea // const TableHtmlExtension(), // Pangea# @@ -366,39 +362,6 @@ class SpoilerExtension extends HtmlExtension { } } -class MatrixMathExtension extends HtmlExtension { - final TextStyle? style; - - MatrixMathExtension({this.style}); - @override - Set get supportedTags => {'div'}; - - @override - bool matches(ExtensionContext context) { - if (context.elementName != 'div') return false; - final mathData = context.element?.attributes['data-mx-maths']; - return mathData != null; - } - - @override - InlineSpan build(ExtensionContext context) { - final data = context.element?.attributes['data-mx-maths'] ?? ''; - return WidgetSpan( - child: Math.tex( - data, - textStyle: style, - onErrorFallback: (e) { - Logs().d('Flutter math parse error', e); - return Text( - data, - style: style, - ); - }, - ), - ); - } -} - class CodeExtension extends HtmlExtension { final double fontSize; diff --git a/pubspec.lock b/pubspec.lock index de1e51f4a..6f660f1c8 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -269,10 +269,10 @@ packages: dependency: "direct main" description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.0" colorize: dependency: transitive description: @@ -354,12 +354,13 @@ packages: source: hosted version: "1.0.8" dart_webrtc: - dependency: transitive + dependency: "direct overridden" description: - name: dart_webrtc - sha256: c664ad88d5646735753add421ee2118486c100febef5e92b7f59cdbabf6a51f6 - url: "https://pub.dev" - source: hosted + path: "." + ref: f27d27c7af41ceeebe31b295af4fb38e7b4d793e + resolved-ref: f27d27c7af41ceeebe31b295af4fb38e7b4d793e + url: "https://github.com/flutter-webrtc/dart-webrtc.git" + source: git version: "1.4.9" dbus: dependency: transitive @@ -800,14 +801,6 @@ packages: url: "https://pub.dev" source: hosted version: "6.2.1" - flutter_math_fork: - dependency: "direct main" - description: - name: flutter_math_fork - sha256: "94bee4642892a94939af0748c6a7de0ff8318feee588379dcdfea7dc5cba06c8" - url: "https://pub.dev" - source: hosted - version: "0.7.2" flutter_native_splash: dependency: "direct dev" description: @@ -1393,18 +1386,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" + sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06" url: "https://pub.dev" source: hosted - version: "10.0.5" + version: "10.0.7" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" + sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379" url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.8" leak_tracker_testing: dependency: transitive description: @@ -2194,7 +2187,7 @@ packages: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" slugify: dependency: "direct main" description: @@ -2279,10 +2272,10 @@ packages: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.0" stream_channel: dependency: transitive description: @@ -2295,10 +2288,10 @@ packages: dependency: transitive description: name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.0" string_validator: dependency: transitive description: @@ -2383,26 +2376,26 @@ packages: dependency: transitive description: name: test - sha256: "7ee44229615f8f642b68120165ae4c2a75fe77ae2065b1e55ae4711f6cf0899e" + sha256: "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f" url: "https://pub.dev" source: hosted - version: "1.25.7" + version: "1.25.8" test_api: dependency: transitive description: name: test_api - sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" + sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" url: "https://pub.dev" source: hosted - version: "0.7.2" + version: "0.7.3" test_core: dependency: transitive description: name: test_core - sha256: "55ea5a652e38a1dfb32943a7973f3681a60f872f8c3a05a14664ad54ef9c6696" + sha256: "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d" url: "https://pub.dev" source: hosted - version: "0.6.4" + version: "0.6.5" text_to_speech: dependency: "direct main" description: @@ -2467,14 +2460,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.0.5" - tuple: - dependency: transitive - description: - name: tuple - sha256: a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151 - url: "https://pub.dev" - source: hosted - version: "2.0.2" typed_data: dependency: transitive description: @@ -2727,10 +2712,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" + sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b url: "https://pub.dev" source: hosted - version: "14.2.5" + version: "14.3.0" wakelock_plus: dependency: "direct main" description: @@ -2775,10 +2760,10 @@ packages: dependency: transitive description: name: webdriver - sha256: "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e" + sha256: "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.4" webkit_inspection_protocol: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index dadde5725..50e4768e3 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -55,7 +55,6 @@ dependencies: flutter_localizations: sdk: flutter flutter_map: ^6.1.0 - flutter_math_fork: ^0.7.2 flutter_olm: 1.3.2 # Keep in sync with scripts/prepare-web.sh ! 1.4.0 does currently not build on Android flutter_openssl_crypto: ^0.3.0 flutter_ringtone_player: ^4.0.0+2 @@ -221,4 +220,9 @@ msix_config: install_certificate: false dependency_overrides: + # For Flutter 3.27 until https://github.com/flutter-webrtc/dart-webrtc/pull/54 is merged + dart_webrtc: + git: + url: https://github.com/flutter-webrtc/dart-webrtc.git + ref: f27d27c7af41ceeebe31b295af4fb38e7b4d793e win32: 5.5.3