From 30d4c9d7a8c3bbe3d392ff0e4af2fb84cf942259 Mon Sep 17 00:00:00 2001 From: Airyzz <36567925+Airyzz@users.noreply.github.com> Date: Sat, 2 Nov 2024 13:11:05 +1030 Subject: [PATCH 1/4] update flutter version --- .github/workflows/benchmark.yml | 2 +- .github/workflows/build.yml | 10 +- .github/workflows/integration-test.yml | 2 +- .github/workflows/release.yml | 14 +- .github/workflows/static-analysis.yml | 2 +- README.md | 2 +- commet/android/build.gradle | 13 + commet/android/gradle.properties | 1 + .../Flutter/GeneratedPluginRegistrant.swift | 2 +- commet/pubspec.lock | 618 +++++++++--------- commet/pubspec.yaml | 48 +- 11 files changed, 358 insertions(+), 356 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 28e83e3d..684d272e 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -25,7 +25,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2.8.0 with: - flutter-version: '3.22.3' + flutter-version: '3.22.4' channel: 'stable' - name: Setup Dependencies diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a7885ffe..1280d9ab 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2.8.0 with: - flutter-version: '3.22.3' + flutter-version: '3.22.4' channel: 'stable' - name: Configure Flutter @@ -48,7 +48,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2.8.0 with: - flutter-version: '3.22.3' + flutter-version: '3.22.4' channel: 'stable' - name: Setup Java @@ -82,7 +82,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2.8.0 with: - flutter-version: '3.22.3' + flutter-version: '3.22.4' channel: 'stable' - name: Setup Java @@ -117,7 +117,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2.8.0 with: - flutter-version: '3.22.3' + flutter-version: '3.22.4' channel: 'stable' - name: Setup Tools @@ -146,7 +146,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2.8.0 with: - flutter-version: '3.22.3' + flutter-version: '3.22.4' channel: 'stable' - name: Setup Tools diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index dd52feff..819d536c 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -22,7 +22,7 @@ jobs: - name: Setup Flutter ╰(✿˙ᗜ˙)੭━☆゚.*・。゚ uses: subosito/flutter-action@v2.8.0 with: - flutter-version: '3.22.3' + flutter-version: '3.22.4' channel: 'stable' - name: Setup Tools ᕙ|” ◉ ◡ ◉ ”|ᕗ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2c3a43b3..9cabf3b5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,7 +21,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2.8.0 with: - flutter-version: '3.22.3' + flutter-version: '3.22.4' channel: 'stable' - name: Clone Olm @@ -84,7 +84,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2.8.0 with: - flutter-version: '3.22.3' + flutter-version: '3.22.4' channel: 'stable' - name: Setup Java @@ -134,7 +134,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2.8.0 with: - flutter-version: '3.22.3' + flutter-version: '3.22.4' channel: 'stable' - name: Setup Java @@ -188,7 +188,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2.8.0 with: - flutter-version: '3.22.3' + flutter-version: '3.22.4' channel: 'stable' - name: Setup Tools @@ -239,7 +239,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2.8.0 with: - flutter-version: '3.22.3' + flutter-version: '3.22.4' channel: 'stable' - name: Setup Tools @@ -293,7 +293,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2.8.0 with: - flutter-version: '3.22.3' + flutter-version: '3.22.4' channel: 'stable' - name: Setup Tools @@ -338,7 +338,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2.8.0 with: - flutter-version: '3.22.3' + flutter-version: '3.22.4' channel: 'stable' - name: Setup Tools diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 4d81e337..5b435d5c 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -19,7 +19,7 @@ jobs: - name: Setup Flutter ╰(✿˙ᗜ˙)੭━☆゚.*・。゚ uses: subosito/flutter-action@v2.8.0 with: - flutter-version: '3.22.3' + flutter-version: '3.22.4' channel: 'stable' - name: Setup Tools ᕙ|” ◉ ◡ ◉ ”|ᕗ diff --git a/README.md b/README.md index 27afceaf..43ea1be2 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ Help translate Commet to your language on [Weblate](https://hosted.weblate.org/p # Development -Commet is built using [Flutter](https://flutter.dev), currently v3.22.3 +Commet is built using [Flutter](https://flutter.dev), currently v3.22.4 This repo currently has a monorepo structure, containing two flutter projects: Commet and Tiamat. Commet is the main client, and Tiamat is a sort of wrapper around Material with some extra goodies, which is used to maintain a consistent style across the app. Tiamat may eventually be moved to its own repo, but for now it is maintained here for ease of development. ## Building diff --git a/commet/android/build.gradle b/commet/android/build.gradle index 7b039210..e1c27fcf 100644 --- a/commet/android/build.gradle +++ b/commet/android/build.gradle @@ -23,6 +23,19 @@ rootProject.buildDir = '../build' subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" } + +subprojects { + afterEvaluate { project -> + if (project.plugins.hasPlugin("com.android.application") || + project.plugins.hasPlugin("com.android.library")) { + project.android { + compileSdkVersion 34 + buildToolsVersion "34.0.0" + } + } + } +} + subprojects { project.evaluationDependsOn(':app') } diff --git a/commet/android/gradle.properties b/commet/android/gradle.properties index 94adc3a3..f6afb800 100644 --- a/commet/android/gradle.properties +++ b/commet/android/gradle.properties @@ -1,3 +1,4 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true +org.gradle.java.installations.fromEnv=JAVA_8_HOME,JAVA_17_HOME \ No newline at end of file diff --git a/commet/macos/Flutter/GeneratedPluginRegistrant.swift b/commet/macos/Flutter/GeneratedPluginRegistrant.swift index 59b93449..213f26a9 100644 --- a/commet/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/commet/macos/Flutter/GeneratedPluginRegistrant.swift @@ -18,7 +18,7 @@ import path_provider_foundation import screen_brightness_macos import screen_retriever import shared_preferences_foundation -import sqflite +import sqflite_darwin import sqlite3_flutter_libs import url_launcher_macos import wakelock_plus diff --git a/commet/pubspec.lock b/commet/pubspec.lock index ebbe5a11..5b450db4 100644 --- a/commet/pubspec.lock +++ b/commet/pubspec.lock @@ -5,18 +5,23 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7" + sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834 url: "https://pub.dev" source: hosted - version: "67.0.0" + version: "72.0.0" + _macros: + dependency: transitive + description: dart + source: sdk + version: "0.3.2" analyzer: dependency: transitive description: name: analyzer - sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d" + sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139 url: "https://pub.dev" source: hosted - version: "6.4.1" + version: "6.7.0" analyzer_plugin: dependency: transitive description: @@ -37,18 +42,18 @@ packages: dependency: transitive description: name: args - sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596 + sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6 url: "https://pub.dev" source: hosted - version: "2.4.2" + version: "2.6.0" asn1lib: dependency: transitive description: name: asn1lib - sha256: c9c85fedbe2188b95133cbe960e16f5f448860f7133330e272edbbca5893ddc6 + sha256: "4bae5ae63e6d6dd17c4aac8086f3dec26c0236f6a0f03416c6c19d830c367cf5" url: "https://pub.dev" source: hosted - version: "1.5.2" + version: "1.5.8" async: dependency: transitive description: @@ -109,10 +114,10 @@ packages: dependency: transitive description: name: build_daemon - sha256: "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1" + sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9" url: "https://pub.dev" source: hosted - version: "4.0.1" + version: "4.0.2" build_resolvers: dependency: transitive description: @@ -125,18 +130,18 @@ packages: dependency: "direct dev" description: name: build_runner - sha256: "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7" + sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d" url: "https://pub.dev" source: hosted - version: "2.4.11" + version: "2.4.13" build_runner_core: dependency: transitive description: name: build_runner_core - sha256: "4ae8ffe5ac758da294ecf1802f2aff01558d8b1b00616aa7538ea9a8a5d50799" + sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0 url: "https://pub.dev" source: hosted - version: "7.3.0" + version: "7.3.2" built_collection: dependency: transitive description: @@ -189,10 +194,10 @@ packages: dependency: transitive description: name: cli_util - sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19 + sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c url: "https://pub.dev" source: hosted - version: "0.4.1" + version: "0.4.2" clock: dependency: transitive description: @@ -205,10 +210,10 @@ packages: dependency: transitive description: name: code_builder - sha256: f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37 + sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e" url: "https://pub.dev" source: hosted - version: "4.10.0" + version: "4.10.1" collection: dependency: transitive description: @@ -229,34 +234,34 @@ packages: dependency: transitive description: name: convert - sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68 url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.2" coverage: dependency: transitive description: name: coverage - sha256: "8acabb8306b57a409bf4c83522065672ee13179297a6bb0cb9ead73948df7c76" + sha256: "88b0fddbe4c92910fefc09cc0248f5e7f0cd23e450ded4c28f16ab8ee8f83268" url: "https://pub.dev" source: hosted - version: "1.7.2" + version: "1.10.0" cross_file: dependency: transitive description: name: cross_file - sha256: "55d7b444feb71301ef6b8838dbc1ae02e63dd48c8773f3810ff53bb1e2945b32" + sha256: "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670" url: "https://pub.dev" source: hosted - version: "0.3.4+1" + version: "0.3.4+2" crypto: dependency: "direct main" description: name: crypto - sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab + sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.6" cryptography: dependency: transitive description: @@ -277,18 +282,18 @@ packages: dependency: transitive description: name: cupertino_icons - sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d + sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6 url: "https://pub.dev" source: hosted - version: "1.0.6" + version: "1.0.8" dart_style: dependency: transitive description: name: dart_style - sha256: "1efa911ca7086affd35f463ca2fc1799584fb6aa89883cf0af8e3664d6a02d55" + sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.3.7" dbus: dependency: transitive description: @@ -297,14 +302,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.7.10" - dependency_validator: - dependency: transitive - description: - name: dependency_validator - sha256: f727a5627aa405965fab4aef4f468e50a9b632ba0737fd2f98c932fec6d712b9 - url: "https://pub.dev" - source: hosted - version: "3.2.3" desktop_drop: dependency: "direct main" description: @@ -333,26 +330,26 @@ packages: dependency: transitive description: name: device_info_plus_platform_interface - sha256: d3b01d5868b50ae571cd1dc6e502fc94d956b665756180f7b16ead09e836fd64 + sha256: "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba" url: "https://pub.dev" source: hosted - version: "7.0.0" + version: "7.0.1" drift: dependency: "direct main" description: name: drift - sha256: "6acedc562ffeed308049f78fb1906abad3d65714580b6745441ee6d50ec564cd" + sha256: df027d168a2985a2e9da900adeba2ab0136f0d84436592cf3cd5135f82c8579c url: "https://pub.dev" source: hosted - version: "2.18.0" + version: "2.21.0" drift_dev: dependency: "direct dev" description: name: drift_dev - sha256: d9b020736ea85fff1568699ce18b89fabb3f0f042e8a7a05e84a3ec20d39acde + sha256: "623649abe932fc17bd32e578e7e05f7ac5e7dd0b33e6c8669a0634105d1389bf" url: "https://pub.dev" source: hosted - version: "2.18.0" + version: "2.21.2" dropdown_button2: dependency: transitive description: @@ -383,7 +380,7 @@ packages: description: path: "." ref: HEAD - resolved-ref: "0e8659463acb585a94e656df72b8448a5e18643e" + resolved-ref: "38ae4d905739237277decea9c564d7b7ebf2d52e" url: "https://github.com/commetchat/encrypted_url_preview.git" source: git version: "1.0.0" @@ -415,10 +412,10 @@ packages: dependency: transitive description: name: ffi - sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21" + sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.3" file: dependency: transitive description: @@ -439,10 +436,10 @@ packages: dependency: transitive description: name: fixnum - sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" + sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" flutter: dependency: "direct main" description: flutter @@ -452,34 +449,34 @@ packages: dependency: "direct main" description: name: flutter_background_service - sha256: "94d9a143852729140e17254a53769383b03738cd92b6e588a8762003e6cd9dd9" + sha256: d32f078ec57647c9cfd6e1a8da9297f7d8f021d4dcc204a35aaad2cdbfe255f0 url: "https://pub.dev" source: hosted - version: "5.0.5" + version: "5.0.10" flutter_background_service_android: dependency: transitive description: name: flutter_background_service_android - sha256: "30863ebafd8214b8e76d5e5c9f27887dc5cc303fcf3e89f71534f621fc486782" + sha256: "39da42dddf877beeef82bc2583130d8bedb4d0765e99ca9e7b4a32e8c6abd239" url: "https://pub.dev" source: hosted - version: "6.2.2" + version: "6.2.7" flutter_background_service_ios: dependency: transitive description: name: flutter_background_service_ios - sha256: ab73657535876e16abc89e40f924df3e92ad3dee83f64d187081417e824709ed + sha256: "6037ffd45c4d019dab0975c7feb1d31012dd697e25edc05505a4a9b0c7dc9fba" url: "https://pub.dev" source: hosted - version: "5.0.0" + version: "5.0.3" flutter_background_service_platform_interface: dependency: transitive description: name: flutter_background_service_platform_interface - sha256: cd5720ff5b051d551a4734fae16683aace779bd0425e8d3f15d84a0cdcc2d8d9 + sha256: ca74aa95789a8304f4d3f57f07ba404faa86bed6e415f83e8edea6ad8b904a41 url: "https://pub.dev" source: hosted - version: "5.0.0" + version: "5.1.2" flutter_blurhash: dependency: "direct main" description: @@ -540,18 +537,18 @@ packages: dependency: transitive description: name: flutter_local_notifications_linux - sha256: "33f741ef47b5f63cc7f78fe75eeeac7e19f171ff3c3df054d84c1e38bedb6a03" + sha256: c49bd06165cad9beeb79090b18cd1eb0296f4bf4b23b84426e37dd7c027fc3af url: "https://pub.dev" source: hosted - version: "4.0.0+1" + version: "4.0.1" flutter_local_notifications_platform_interface: dependency: transitive description: name: flutter_local_notifications_platform_interface - sha256: "7cf643d6d5022f3baed0be777b0662cce5919c0a7b86e700299f22dc4ae660ef" + sha256: "85f8d07fe708c1bdcf45037f2c0109753b26ae077e9d9e899d55971711a4ea66" url: "https://pub.dev" source: hosted - version: "7.0.0+1" + version: "7.2.0" flutter_localizations: dependency: "direct main" description: flutter @@ -561,10 +558,10 @@ packages: dependency: "direct main" description: name: flutter_markdown - sha256: "31c12de79262b5431c5492e9c89948aa789158435f707d3519a7fdef6af28af7" + sha256: "04c4722cc36ec5af38acc38ece70d22d3c2123c61305d555750a091517bbe504" url: "https://pub.dev" source: hosted - version: "0.6.22+1" + version: "0.6.23" flutter_olm: dependency: "direct main" description: @@ -573,22 +570,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.4.1" - flutter_openssl_crypto: - dependency: "direct main" - description: - name: flutter_openssl_crypto - sha256: b64a0825d79f10b6d5f5951f7ce2d5ddc12ed532129fc5a7e0ce472f5b97d78e - url: "https://pub.dev" - source: hosted - version: "0.1.0" flutter_plugin_android_lifecycle: dependency: transitive description: name: flutter_plugin_android_lifecycle - sha256: "592dc01a18961a51c24ae5d963b724b2b7fa4a95c100fe8eb6ca8a5a4732cadf" + sha256: "9b78450b89f059e96c9ebb355fa6b3df1d6b330436e0b885fb49594c41721398" url: "https://pub.dev" source: hosted - version: "2.0.18" + version: "2.0.23" flutter_shortcuts: dependency: "direct main" description: @@ -610,10 +599,10 @@ packages: dependency: "direct main" description: name: flutter_svg - sha256: d39e7f95621fc84376bc0f7d504f05c3a41488c562f4a8ad410569127507402c + sha256: "1b7723a814d84fb65869ea7115cdb3ee7c3be5a27a755c1ec60e049f6b9fcbb2" url: "https://pub.dev" source: hosted - version: "2.0.9" + version: "2.0.11" flutter_test: dependency: "direct dev" description: flutter @@ -623,10 +612,10 @@ packages: dependency: "direct main" description: name: flutter_web_auth_2 - sha256: "3ea3a0cc539ca74319f4f2f7484f62742fe5b2ff9a0fca37575426d6e6f07901" + sha256: "4d3d2fd3d26bf1a26b3beafd4b4b899c0ffe10dc99af25abc58ffe24e991133c" url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.2" flutter_web_auth_2_platform_interface: dependency: transitive description: @@ -644,10 +633,10 @@ packages: dependency: transitive description: name: frontend_server_client - sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612" + sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694 url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "4.0.0" fuchsia_remote_debug_protocol: dependency: transitive description: flutter @@ -665,10 +654,10 @@ packages: dependency: transitive description: name: get_it - sha256: "36524bfb3f0b4ec952c3202466fdd69ad1f7ac1dd9b0a7564177707e45bfaeb9" + sha256: d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1 url: "https://pub.dev" source: hosted - version: "7.6.8" + version: "7.7.0" glob: dependency: transitive description: @@ -681,10 +670,10 @@ packages: dependency: transitive description: name: graphs - sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19 + sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.3.2" highlighter: dependency: transitive description: @@ -721,10 +710,10 @@ packages: dependency: "direct main" description: name: http - sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938" + sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010 url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" http_multi_server: dependency: transitive description: @@ -745,10 +734,10 @@ packages: dependency: "direct main" description: name: image - sha256: "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8" + sha256: f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d url: "https://pub.dev" source: hosted - version: "4.2.0" + version: "4.3.0" implicitly_animated_list: dependency: "direct main" description: @@ -806,10 +795,10 @@ packages: dependency: transitive description: name: json_annotation - sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467 + sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" url: "https://pub.dev" source: hosted - version: "4.8.1" + version: "4.9.0" just_the_tooltip: dependency: "direct main" description: @@ -822,18 +811,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" url: "https://pub.dev" source: hosted - version: "10.0.4" + version: "10.0.5" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.5" leak_tracker_testing: dependency: transitive description: @@ -870,18 +859,26 @@ packages: dependency: transitive description: name: logger - sha256: "8c94b8c219e7e50194efc8771cd0e9f10807d8d3e219af473d89b06cc2ee4e04" + sha256: "697d067c60c20999686a0add96cf6aba723b3aa1f83ecf806a8097231529ec32" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.4.0" logging: dependency: transitive description: name: logging - sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" + sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.0" + macros: + dependency: transitive + description: + name: macros + sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536" + url: "https://pub.dev" + source: hosted + version: "0.1.2-main.4" markdown: dependency: transitive description: @@ -902,10 +899,10 @@ packages: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.8.0" + version: "0.11.1" matrix: dependency: "direct main" description: @@ -919,116 +916,107 @@ packages: dependency: "direct main" description: path: "." - ref: HEAD - resolved-ref: "8e1e434df8a654f1a194c25ba57c57e1190c50d0" + ref: "update/flutter" + resolved-ref: "2d49d7d3242429b0b49a3e8eacaf0c74cd912176" url: "https://github.com/commetchat/matrix-dart-sdk-drift-db.git" source: git version: "0.0.1" media_kit: dependency: "direct main" description: - path: media_kit - ref: HEAD - resolved-ref: "398abfa23f9da201cd0af7b23a950f6a14c06ae3" - url: "https://github.com/Airyzz/media-kit.git" - source: git - version: "1.1.10+1" + name: media_kit + sha256: "1f1deee148533d75129a6f38251ff8388e33ee05fc2d20a6a80e57d6051b7b62" + url: "https://pub.dev" + source: hosted + version: "1.1.11" media_kit_libs_android_video: - dependency: "direct overridden" + dependency: transitive description: - path: "libs/android/media_kit_libs_android_video" - ref: HEAD - resolved-ref: "398abfa23f9da201cd0af7b23a950f6a14c06ae3" - url: "https://github.com/Airyzz/media-kit.git" - source: git + name: media_kit_libs_android_video + sha256: "9dd8012572e4aff47516e55f2597998f0a378e3d588d0fad0ca1f11a53ae090c" + url: "https://pub.dev" + source: hosted version: "1.3.6" media_kit_libs_ios_video: - dependency: "direct overridden" + dependency: transitive description: - path: "libs/ios/media_kit_libs_ios_video" - ref: HEAD - resolved-ref: "398abfa23f9da201cd0af7b23a950f6a14c06ae3" - url: "https://github.com/Airyzz/media-kit.git" - source: git + name: media_kit_libs_ios_video + sha256: b5382994eb37a4564c368386c154ad70ba0cc78dacdd3fb0cd9f30db6d837991 + url: "https://pub.dev" + source: hosted version: "1.1.4" media_kit_libs_linux: - dependency: "direct overridden" + dependency: transitive description: - path: "libs/linux/media_kit_libs_linux" - ref: HEAD - resolved-ref: "398abfa23f9da201cd0af7b23a950f6a14c06ae3" - url: "https://github.com/Airyzz/media-kit.git" - source: git + name: media_kit_libs_linux + sha256: e186891c31daa6bedab4d74dcdb4e8adfccc7d786bfed6ad81fe24a3b3010310 + url: "https://pub.dev" + source: hosted version: "1.1.3" media_kit_libs_macos_video: - dependency: "direct overridden" + dependency: transitive description: - path: "libs/macos/media_kit_libs_macos_video" - ref: HEAD - resolved-ref: "398abfa23f9da201cd0af7b23a950f6a14c06ae3" - url: "https://github.com/Airyzz/media-kit.git" - source: git + name: media_kit_libs_macos_video + sha256: f26aa1452b665df288e360393758f84b911f70ffb3878032e1aabba23aa1032d + url: "https://pub.dev" + source: hosted version: "1.1.4" media_kit_libs_video: dependency: "direct main" description: - path: "libs/universal/media_kit_libs_video" - ref: HEAD - resolved-ref: "398abfa23f9da201cd0af7b23a950f6a14c06ae3" - url: "https://github.com/Airyzz/media-kit.git" - source: git - version: "1.0.4" + name: media_kit_libs_video + sha256: "20bb4aefa8fece282b59580e1cd8528117297083a6640c98c2e98cfc96b93288" + url: "https://pub.dev" + source: hosted + version: "1.0.5" media_kit_libs_windows_video: - dependency: "direct overridden" + dependency: transitive description: - path: "libs/windows/media_kit_libs_windows_video" - ref: HEAD - resolved-ref: "398abfa23f9da201cd0af7b23a950f6a14c06ae3" - url: "https://github.com/Airyzz/media-kit.git" - source: git - version: "1.0.9" + name: media_kit_libs_windows_video + sha256: "32654572167825c42c55466f5d08eee23ea11061c84aa91b09d0e0f69bdd0887" + url: "https://pub.dev" + source: hosted + version: "1.0.10" media_kit_native_event_loop: - dependency: "direct overridden" + dependency: transitive description: - path: media_kit_native_event_loop - ref: HEAD - resolved-ref: "398abfa23f9da201cd0af7b23a950f6a14c06ae3" - url: "https://github.com/Airyzz/media-kit.git" - source: git - version: "1.0.8" + name: media_kit_native_event_loop + sha256: "7d82e3b3e9ded5c35c3146c5ba1da3118d1dd8ac3435bac7f29f458181471b40" + url: "https://pub.dev" + source: hosted + version: "1.0.9" media_kit_video: dependency: "direct main" description: - path: media_kit_video - ref: HEAD - resolved-ref: "398abfa23f9da201cd0af7b23a950f6a14c06ae3" - url: "https://github.com/Airyzz/media-kit.git" - source: git - version: "1.2.4" + name: media_kit_video + sha256: "2cc3b966679963ba25a4ce5b771e532a521ebde7c6aa20e9802bec95d9916c8f" + url: "https://pub.dev" + source: hosted + version: "1.2.5" meta: dependency: transitive description: name: meta - sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.15.0" mime: dependency: "direct main" description: name: mime - sha256: "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2" + sha256: "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a" url: "https://pub.dev" source: hosted - version: "1.0.5" + version: "1.0.6" msix: dependency: "direct dev" description: name: msix - sha256: "519b183d15dc9f9c594f247e2d2339d855cf0eaacc30e19b128e14f3ecc62047" + sha256: c50d6bd1aafe0d071a3c1e5a5ccb056404502935cb0a549e3178c4aae16caf33 url: "https://pub.dev" source: hosted - version: "3.16.7" + version: "3.16.8" nested: dependency: transitive description: @@ -1049,10 +1037,10 @@ packages: dependency: "direct main" description: name: olm - sha256: "37948a6576949256f3ee1d0063d5b408634ff7e452b9a5c2f6410f9d7ced1c20" + sha256: "3306bf534ceb914fd148b3b4a3d603fb5e067b2e6da8304025b47c24cfdf6b46" url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "2.0.4" package_config: dependency: transitive description: @@ -1065,18 +1053,18 @@ packages: dependency: transitive description: name: package_info_plus - sha256: "2c582551839386fa7ddbc7770658be7c0f87f388a4bff72066478f597c34d17f" + sha256: df3eb3e0aed5c1107bb0fdb80a8e82e778114958b1c5ac5644fb1ac9cae8a998 url: "https://pub.dev" source: hosted - version: "7.0.0" + version: "8.1.0" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - sha256: f49918f3433a3146047372f9d4f1f847511f2acd5cd030e1f44fe5a50036b70e + sha256: ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66 url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.0.1" pasteboard: dependency: "direct main" description: @@ -1097,34 +1085,34 @@ packages: dependency: transitive description: name: path_parsing - sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf + sha256: "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.1.0" path_provider: dependency: "direct main" description: name: path_provider - sha256: c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161 + sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd" url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "2.1.5" path_provider_android: dependency: transitive description: name: path_provider_android - sha256: "51f0d2c554cfbc9d6a312ab35152fc77e2f0b758ce9f1a444a3a1e5b8f3c6b7f" + sha256: c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.2.12" path_provider_foundation: dependency: transitive description: name: path_provider_foundation - sha256: "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f" + sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16 url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.0" path_provider_linux: dependency: transitive description: @@ -1145,10 +1133,10 @@ packages: dependency: transitive description: name: path_provider_windows - sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170" + sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.3.0" permission_handler: dependency: "direct main" description: @@ -1161,34 +1149,34 @@ packages: dependency: transitive description: name: permission_handler_android - sha256: "1acac6bae58144b442f11e66621c062aead9c99841093c38f5bcdcc24c1c3474" + sha256: "71bbecfee799e65aff7c744761a57e817e73b738fedf62ab7afd5593da21f9f1" url: "https://pub.dev" source: hosted - version: "12.0.5" + version: "12.0.13" permission_handler_apple: dependency: transitive description: name: permission_handler_apple - sha256: e9ad66020b89ff1b63908f247c2c6f931c6e62699b756ef8b3c4569350cd8662 + sha256: e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0 url: "https://pub.dev" source: hosted - version: "9.4.4" + version: "9.4.5" permission_handler_html: dependency: transitive description: name: permission_handler_html - sha256: "54bf176b90f6eddd4ece307e2c06cf977fb3973719c35a93b85cc7093eb6070d" + sha256: af26edbbb1f2674af65a8f4b56e1a6f526156bc273d0e65dd8075fab51c78851 url: "https://pub.dev" source: hosted - version: "0.1.1" + version: "0.1.3+2" permission_handler_platform_interface: dependency: transitive description: name: permission_handler_platform_interface - sha256: "48d4fcf201a1dad93ee869ab0d4101d084f49136ec82a8a06ed9cfeacab9fd20" + sha256: e9c8eadee926c4532d0305dff94b85bf961f16759c3af791486613152af4b4f9 url: "https://pub.dev" source: hosted - version: "4.2.1" + version: "4.2.3" permission_handler_windows: dependency: transitive description: @@ -1209,10 +1197,10 @@ packages: dependency: transitive description: name: platform - sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec" + sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65" url: "https://pub.dev" source: hosted - version: "3.1.4" + version: "3.1.5" plugin_platform_interface: dependency: transitive description: @@ -1225,10 +1213,10 @@ packages: dependency: "direct main" description: name: pointycastle - sha256: "70fe966348fe08c34bf929582f1d8247d9d9408130723206472b4687227e4333" + sha256: "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe" url: "https://pub.dev" source: hosted - version: "3.8.0" + version: "3.9.1" pool: dependency: transitive description: @@ -1281,26 +1269,26 @@ packages: dependency: "direct dev" description: name: pubspec_dependency_sorter - sha256: "515adbbe2fcf96a35b02957775c4e71db7197f4f8890ebeb9b42d8ccf72375a0" + sha256: d2114e92f003195de74a9ed3aeb9c59425ae9b7d637b802bb225b3fe3a4ba605 url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "1.0.5" pubspec_parse: dependency: transitive description: name: pubspec_parse - sha256: c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367 + sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8 url: "https://pub.dev" source: hosted - version: "1.2.3" + version: "1.3.0" quiver: dependency: transitive description: name: quiver - sha256: b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47 + sha256: ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2 url: "https://pub.dev" source: hosted - version: "3.2.1" + version: "3.2.2" random_string: dependency: transitive description: @@ -1409,58 +1397,58 @@ packages: dependency: "direct main" description: name: shared_preferences - sha256: "81429e4481e1ccfb51ede496e916348668fd0921627779233bd24cc3ff6abd02" + sha256: "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051" url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.3.2" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - sha256: "8568a389334b6e83415b6aae55378e158fbc2314e074983362d20c562780fb06" + sha256: "3b9febd815c9ca29c9e3520d50ec32f49157711e143b7a4ca039eb87e8ade5ab" url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.3.3" shared_preferences_foundation: dependency: transitive description: name: shared_preferences_foundation - sha256: "7708d83064f38060c7b39db12aefe449cb8cdc031d6062280087bc4cdb988f5c" + sha256: "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d" url: "https://pub.dev" source: hosted - version: "2.3.5" + version: "2.5.3" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux - sha256: "9f2cbcf46d4270ea8be39fa156d86379077c8a5228d9dfdb1164ae0bb93f1faa" + sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.1" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface - sha256: "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b" + sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.1" shared_preferences_web: dependency: transitive description: name: shared_preferences_web - sha256: "9aee1089b36bd2aafe06582b7d7817fd317ef05fc30e6ba14bff247d0933042a" + sha256: d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.4.2" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows - sha256: "841ad54f3c8381c480d0c9b508b89a34036f512482c407e6df7a9c4aa2ef8f59" + sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.1" shelf: dependency: transitive description: @@ -1481,18 +1469,18 @@ packages: dependency: transitive description: name: shelf_static - sha256: a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e + sha256: c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3 url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "1.1.3" shelf_web_socket: dependency: transitive description: name: shelf_web_socket - sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1" + sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611" url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "2.0.0" signal_sticker_api: dependency: "direct main" description: @@ -1527,10 +1515,10 @@ packages: dependency: transitive description: name: source_map_stack_trace - sha256: "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae" + sha256: c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" source_maps: dependency: transitive description: @@ -1559,50 +1547,74 @@ packages: dependency: "direct main" description: name: sqflite - sha256: "5ce2e1a15e822c3b4bfb5400455775e421da7098eed8adc8f26298ada7c9308c" + sha256: "79a297dc3cc137e758c6a4baf83342b039e5a6d2436fcdf3f96a00adaaf2ad62" url: "https://pub.dev" source: hosted - version: "2.3.3" + version: "2.4.0" + sqflite_android: + dependency: transitive + description: + name: sqflite_android + sha256: "78f489aab276260cdd26676d2169446c7ecd3484bbd5fead4ca14f3ed4dd9ee3" + url: "https://pub.dev" + source: hosted + version: "2.4.0" sqflite_common: dependency: transitive description: name: sqflite_common - sha256: "3da423ce7baf868be70e2c0976c28a1bb2f73644268b7ffa7d2e08eab71f16a4" + sha256: "4468b24876d673418a7b7147e5a08a715b4998a7ae69227acafaab762e0e5490" url: "https://pub.dev" source: hosted - version: "2.5.4" + version: "2.5.4+5" sqflite_common_ffi: dependency: "direct main" description: name: sqflite_common_ffi - sha256: "4d6137c29e930d6e4a8ff373989dd9de7bac12e3bc87bce950f6e844e8ad3bb5" + sha256: d316908f1537725427ff2827a5c5f3b2c1bc311caed985fe3c9b10939c9e11ca url: "https://pub.dev" source: hosted - version: "2.3.3" + version: "2.3.4" + sqflite_darwin: + dependency: transitive + description: + name: sqflite_darwin + sha256: "769733dddf94622d5541c73e4ddc6aa7b252d865285914b6fcd54a63c4b4f027" + url: "https://pub.dev" + source: hosted + version: "2.4.1-1" + sqflite_platform_interface: + dependency: transitive + description: + name: sqflite_platform_interface + sha256: "8dd4515c7bdcae0a785b0062859336de775e8c65db81ae33dd5445f35be61920" + url: "https://pub.dev" + source: hosted + version: "2.4.0" sqlite3: dependency: transitive description: name: sqlite3 - sha256: "1abbeb84bf2b1a10e5e1138c913123c8aa9d83cd64e5f9a0dd847b3c83063202" + sha256: bb174b3ec2527f9c5f680f73a89af8149dd99782fbb56ea88ad0807c5638f2ed url: "https://pub.dev" source: hosted - version: "2.4.2" + version: "2.4.7" sqlite3_flutter_libs: dependency: "direct main" description: name: sqlite3_flutter_libs - sha256: "9f89a7e7dc36eac2035808427eba1c3fbd79e59c3a22093d8dace6d36b1fe89e" + sha256: "7ae52b23366e5295005022e62fa093f64bfe190810223ea0ebf733a4cd140bce" url: "https://pub.dev" source: hosted - version: "0.5.23" + version: "0.5.26" sqlparser: dependency: transitive description: name: sqlparser - sha256: ade9a67fd70d0369329ed3373208de7ebd8662470e8c396fc8d0d60f9acdfc9f + sha256: d77749237609784e337ec36c979d41f6f38a7b279df98622ae23929c8eb954a4 url: "https://pub.dev" source: hosted - version: "0.36.0" + version: "0.39.2" stack_trace: dependency: transitive description: @@ -1655,10 +1667,10 @@ packages: dependency: transitive description: name: synchronized - sha256: "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558" + sha256: "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225" url: "https://pub.dev" source: hosted - version: "3.1.0+1" + version: "3.3.0+3" term_glyph: dependency: transitive description: @@ -1671,26 +1683,26 @@ packages: dependency: "direct main" description: name: test - sha256: "7ee446762c2c50b3bd4ea96fe13ffac69919352bd3b4b17bac3f3465edc58073" + sha256: "7ee44229615f8f642b68120165ae4c2a75fe77ae2065b1e55ae4711f6cf0899e" url: "https://pub.dev" source: hosted - version: "1.25.2" + version: "1.25.7" test_api: dependency: transitive description: name: test_api - sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" + sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" url: "https://pub.dev" source: hosted - version: "0.7.0" + version: "0.7.2" test_core: dependency: transitive description: name: test_core - sha256: "2bc4b4ecddd75309300d8096f781c0e3280ca1ef85beda558d33fcbedc2eead4" + sha256: "55ea5a652e38a1dfb32943a7973f3681a60f872f8c3a05a14664ad54ef9c6696" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.4" tiamat: dependency: "direct main" description: @@ -1702,10 +1714,10 @@ packages: dependency: transitive description: name: timezone - sha256: "1cfd8ddc2d1cfd836bc93e67b9be88c3adaeca6f40a00ca999104c30693cdca0" + sha256: "2236ec079a174ce07434e89fcd3fcda430025eb7692244139a9cf54fdcf1fc7d" url: "https://pub.dev" source: hosted - version: "0.9.2" + version: "0.9.4" timing: dependency: transitive description: @@ -1718,34 +1730,34 @@ packages: dependency: transitive description: name: typed_data - sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 url: "https://pub.dev" source: hosted - version: "1.3.2" + version: "1.4.0" unifiedpush: dependency: "direct main" description: name: unifiedpush - sha256: ef7f3ae6139d27169604e3844379ef7929af573a2be21d9e82187f44ab7b9a32 + sha256: "6dbed5a6305ca33f1865c7a3d814ae39476b79a2d23ca76a5708f023f405730f" url: "https://pub.dev" source: hosted - version: "5.0.1" + version: "5.0.2" unifiedpush_android: dependency: transitive description: name: unifiedpush_android - sha256: "610ad746294541f56d632adf9afba5d1c164c44e23ec0dd2162a41a6ff00a00e" + sha256: "7443dece0a850ae956514f809983eb2b39fc518c2c7d24dbfe817198bec89134" url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.3.0" unifiedpush_platform_interface: dependency: transitive description: name: unifiedpush_platform_interface - sha256: "7782b18a15d22bb184fa766ef1e0c675eef862055ff815453df7041dfd026146" + sha256: dd588d78a8b2bfc10430e30035526e98caa543d0b7364a6344b5eb4815721c6d url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.0.2" universal_html: dependency: "direct main" description: @@ -1766,10 +1778,10 @@ packages: dependency: transitive description: name: universal_platform - sha256: d315be0f6641898b280ffa34e2ddb14f3d12b1a37882557869646e0cc363d0cc + sha256: "64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec" url: "https://pub.dev" source: hosted - version: "1.0.0+1" + version: "1.1.0" unorm_dart: dependency: transitive description: @@ -1798,42 +1810,42 @@ packages: dependency: "direct main" description: name: url_launcher - sha256: "0ecc004c62fd3ed36a2ffcbe0dd9700aee63bd7532d0b642a488b1ec310f492e" + sha256: "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603" url: "https://pub.dev" source: hosted - version: "6.2.5" + version: "6.3.1" url_launcher_android: dependency: transitive description: name: url_launcher_android - sha256: d4ed0711849dd8e33eb2dd69c25db0d0d3fdc37e0a62e629fe32f57a22db2745 + sha256: "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193" url: "https://pub.dev" source: hosted - version: "6.3.0" + version: "6.3.14" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - sha256: "9149d493b075ed740901f3ee844a38a00b33116c7c5c10d7fb27df8987fb51d5" + sha256: e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e url: "https://pub.dev" source: hosted - version: "6.2.5" + version: "6.3.1" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - sha256: ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811 + sha256: e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.2.0" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - sha256: b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234 + sha256: "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672" url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.2.1" url_launcher_platform_interface: dependency: transitive description: @@ -1846,50 +1858,50 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: "3692a459204a33e04bc94f5fb91158faf4f2c8903281ddd82915adecdb1a901d" + sha256: "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e" url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.3.3" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - sha256: ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7 + sha256: "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4" url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.3" uuid: dependency: transitive description: name: uuid - sha256: "814e9e88f21a176ae1359149021870e87f7cddaf633ab678a5d2b0bff7fd1ba8" + sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff url: "https://pub.dev" source: hosted - version: "4.4.0" + version: "4.5.1" vector_graphics: dependency: transitive description: name: vector_graphics - sha256: "4ac59808bbfca6da38c99f415ff2d3a5d7ca0a6b4809c71d9cf30fba5daf9752" + sha256: "0b9149c6ddb013818075b072b9ddc1b89a5122fff1275d4648d297086b46c4f0" url: "https://pub.dev" source: hosted - version: "1.1.10+1" + version: "1.1.12" vector_graphics_codec: dependency: transitive description: name: vector_graphics_codec - sha256: f3247e7ab0ec77dc759263e68394990edc608fb2b480b80db8aa86ed09279e33 + sha256: "2430b973a4ca3c4dbc9999b62b8c719a160100dcbae5c819bae0cacce32c9cdb" url: "https://pub.dev" source: hosted - version: "1.1.10+1" + version: "1.1.12" vector_graphics_compiler: dependency: transitive description: name: vector_graphics_compiler - sha256: "18489bdd8850de3dd7ca8a34e0c446f719ec63e2bab2e7a8cc66a9028dd76c5a" + sha256: f3b9b6e4591c11394d4be4806c63e72d3a41778547b2c1e2a8a04fadcfd7d173 url: "https://pub.dev" source: hosted - version: "1.1.10+1" + version: "1.1.12" vector_math: dependency: transitive description: @@ -1902,26 +1914,26 @@ packages: dependency: transitive description: name: vm_service - sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" url: "https://pub.dev" source: hosted - version: "14.2.1" + version: "14.2.5" volume_controller: dependency: transitive description: name: volume_controller - sha256: "189bdc7a554f476b412e4c8b2f474562b09d74bc458c23667356bce3ca1d48c9" + sha256: c71d4c62631305df63b72da79089e078af2659649301807fa746088f365cb48e url: "https://pub.dev" source: hosted - version: "2.0.7" + version: "2.0.8" wakelock_plus: dependency: transitive description: name: wakelock_plus - sha256: c8b7cc80f045533b40a0e6c9109905494e3cf32c0fbd5c62616998e0de44003f + sha256: bf4ee6f17a2fa373ed3753ad0e602b7603f8c75af006d5b9bdade263928c0484 url: "https://pub.dev" source: hosted - version: "1.2.4" + version: "1.2.8" wakelock_plus_platform_interface: dependency: transitive description: @@ -1942,18 +1954,26 @@ packages: dependency: transitive description: name: web - sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27" + sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "1.1.0" + web_socket: + dependency: transitive + description: + name: web_socket + sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83" + url: "https://pub.dev" + source: hosted + version: "0.1.6" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42" + sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f" url: "https://pub.dev" source: hosted - version: "2.4.5" + version: "3.0.1" webdriver: dependency: transitive description: @@ -1982,42 +2002,42 @@ packages: dependency: transitive description: name: widgetbook_annotation - sha256: c2d881d0241525b36aa3777d0ac406d198528ed28b84ca73b7dd9f59189d6bb0 + sha256: "08570e3568275c4c283cdf78409c125f86c96c9b4f94f0a390d6a163349e9934" url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.2.0" win32: dependency: transitive description: name: win32 - sha256: "0a989dc7ca2bb51eac91e8fd00851297cfffd641aa7538b165c62637ca0eaa4a" + sha256: "10169d3934549017f0ae278ccb07f828f9d6ea21573bab0fb77b0e1ef0fce454" url: "https://pub.dev" source: hosted - version: "5.4.0" + version: "5.7.2" win32_registry: dependency: transitive description: name: win32_registry - sha256: "41fd8a189940d8696b1b810efb9abcf60827b6cbfab90b0c43e8439e3a39d85a" + sha256: "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852" url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "1.1.5" win_toast: dependency: "direct main" description: name: win_toast - sha256: "371d62b17b30489cad41e831e6340c2777202d2b4b2fd55a14ffc566b3df7518" + sha256: "7d0976d321ee034f3dfc79ec5b9ee7b8d8669413eea3559298e12c40ccea29d1" url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "0.3.1" window_manager: dependency: "direct main" description: name: window_manager - sha256: b3c895bdf936c77b83c5254bec2e6b3f066710c1f89c38b20b8acc382b525494 + sha256: "8699323b30da4cdbe2aa2e7c9de567a6abd8a97d9a5c850a3c86dcd0b34bbfbf" url: "https://pub.dev" source: hosted - version: "0.3.8" + version: "0.3.9" window_to_front: dependency: transitive description: @@ -2030,10 +2050,10 @@ packages: dependency: transitive description: name: xdg_directories - sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d + sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "1.1.0" xml: dependency: transitive description: @@ -2050,6 +2070,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.1.2" + yaml_writer: + dependency: transitive + description: + name: yaml_writer + sha256: "2ae2cd5f5a612a930ef2b1b40df540c819ab85e301f26dfaf0b6201b857db825" + url: "https://pub.dev" + source: hosted + version: "2.0.1" sdks: - dart: ">=3.4.0 <4.0.0" - flutter: ">=3.19.0" + dart: ">=3.5.0 <4.0.0" + flutter: ">=3.24.0" diff --git a/commet/pubspec.yaml b/commet/pubspec.yaml index 5e910893..a60392dc 100644 --- a/commet/pubspec.yaml +++ b/commet/pubspec.yaml @@ -17,7 +17,6 @@ dependencies: flutter_blurhash: ^0.8.2 flutter_markdown: ^0.6.9+1 flutter_olm: ^1.2.0 - flutter_openssl_crypto: ^0.1.0 flutter_staggered_grid_view: ^0.7.0 flutter_svg: ^2.0.7 html: ^0.15.2 @@ -28,9 +27,9 @@ dependencies: intl_translation: ^0.20.0 intl_utils: any just_the_tooltip: ^0.0.12 - media_kit: ^1.1.7 - media_kit_libs_video: ^1.0.1 - media_kit_video: ^1.1.8 + media_kit: ^1.1.11 + media_kit_video: ^1.2.5 + media_kit_libs_video: ^1.0.5 mime: ^1.0.4 olm: ^2.0.3 pasteboard: ^0.2.0 @@ -76,6 +75,7 @@ dependencies: matrix_dart_sdk_drift_db: git: url: https://github.com/commetchat/matrix-dart-sdk-drift-db.git + ref: update/flutter encrypted_url_preview: git: https://github.com/commetchat/encrypted_url_preview.git signal_sticker_api: @@ -107,46 +107,6 @@ dependency_overrides: url: https://github.com/commetchat/matrix-dart-sdk.git ref: main - media_kit: - git: - url: https://github.com/Airyzz/media-kit.git - path: ./media_kit - media_kit_video: - git: - url: https://github.com/Airyzz/media-kit.git - path: ./media_kit_video - - media_kit_native_event_loop: - git: - url: https://github.com/Airyzz/media-kit.git - path: ./media_kit_native_event_loop - - media_kit_libs_video: - git: - url: https://github.com/Airyzz/media-kit.git - path: ./libs/universal/media_kit_libs_video - - media_kit_libs_android_video: - git: - url: https://github.com/Airyzz/media-kit.git - path: ./libs/android/media_kit_libs_android_video - media_kit_libs_ios_video: - git: - url: https://github.com/Airyzz/media-kit.git - path: ./libs/ios/media_kit_libs_ios_video - media_kit_libs_macos_video: - git: - url: https://github.com/Airyzz/media-kit.git - path: ./libs/macos/media_kit_libs_macos_video - media_kit_libs_windows_video: - git: - url: https://github.com/Airyzz/media-kit.git - path: ./libs/windows/media_kit_libs_windows_video - media_kit_libs_linux: - git: - url: https://github.com/Airyzz/media-kit.git - path: ./libs/linux/media_kit_libs_linux - dev_dependencies: build_runner: ^2.4.11 flutter_launcher_icons: ^0.13.1 From 4a65b5ac903c53d053577cafe46c9f326acbe82a Mon Sep 17 00:00:00 2001 From: Airyzz <36567925+Airyzz@users.noreply.github.com> Date: Fri, 6 Dec 2024 23:17:19 +1030 Subject: [PATCH 2/4] update to 3.24.4 --- .github/workflows/benchmark.yml | 2 +- .github/workflows/build.yml | 10 +++++----- .github/workflows/integration-test.yml | 2 +- .github/workflows/release.yml | 14 +++++++------- .github/workflows/static-analysis.yml | 2 +- README.md | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 684d272e..19124c99 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -25,7 +25,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2.8.0 with: - flutter-version: '3.22.4' + flutter-version: '3.24.4' channel: 'stable' - name: Setup Dependencies diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1280d9ab..49b8f30e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2.8.0 with: - flutter-version: '3.22.4' + flutter-version: '3.24.4' channel: 'stable' - name: Configure Flutter @@ -48,7 +48,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2.8.0 with: - flutter-version: '3.22.4' + flutter-version: '3.24.4' channel: 'stable' - name: Setup Java @@ -82,7 +82,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2.8.0 with: - flutter-version: '3.22.4' + flutter-version: '3.24.4' channel: 'stable' - name: Setup Java @@ -117,7 +117,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2.8.0 with: - flutter-version: '3.22.4' + flutter-version: '3.24.4' channel: 'stable' - name: Setup Tools @@ -146,7 +146,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2.8.0 with: - flutter-version: '3.22.4' + flutter-version: '3.24.4' channel: 'stable' - name: Setup Tools diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 819d536c..ee7151ac 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -22,7 +22,7 @@ jobs: - name: Setup Flutter ╰(✿˙ᗜ˙)੭━☆゚.*・。゚ uses: subosito/flutter-action@v2.8.0 with: - flutter-version: '3.22.4' + flutter-version: '3.24.4' channel: 'stable' - name: Setup Tools ᕙ|” ◉ ◡ ◉ ”|ᕗ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9cabf3b5..7793928e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,7 +21,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2.8.0 with: - flutter-version: '3.22.4' + flutter-version: '3.24.4' channel: 'stable' - name: Clone Olm @@ -84,7 +84,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2.8.0 with: - flutter-version: '3.22.4' + flutter-version: '3.24.4' channel: 'stable' - name: Setup Java @@ -134,7 +134,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2.8.0 with: - flutter-version: '3.22.4' + flutter-version: '3.24.4' channel: 'stable' - name: Setup Java @@ -188,7 +188,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2.8.0 with: - flutter-version: '3.22.4' + flutter-version: '3.24.4' channel: 'stable' - name: Setup Tools @@ -239,7 +239,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2.8.0 with: - flutter-version: '3.22.4' + flutter-version: '3.24.4' channel: 'stable' - name: Setup Tools @@ -293,7 +293,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2.8.0 with: - flutter-version: '3.22.4' + flutter-version: '3.24.4' channel: 'stable' - name: Setup Tools @@ -338,7 +338,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2.8.0 with: - flutter-version: '3.22.4' + flutter-version: '3.24.4' channel: 'stable' - name: Setup Tools diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 5b435d5c..8f09f8c2 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -19,7 +19,7 @@ jobs: - name: Setup Flutter ╰(✿˙ᗜ˙)੭━☆゚.*・。゚ uses: subosito/flutter-action@v2.8.0 with: - flutter-version: '3.22.4' + flutter-version: '3.24.4' channel: 'stable' - name: Setup Tools ᕙ|” ◉ ◡ ◉ ”|ᕗ diff --git a/README.md b/README.md index 43ea1be2..6b5aa104 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ Help translate Commet to your language on [Weblate](https://hosted.weblate.org/p # Development -Commet is built using [Flutter](https://flutter.dev), currently v3.22.4 +Commet is built using [Flutter](https://flutter.dev), currently v3.24.4 This repo currently has a monorepo structure, containing two flutter projects: Commet and Tiamat. Commet is the main client, and Tiamat is a sort of wrapper around Material with some extra goodies, which is used to maintain a consistent style across the app. Tiamat may eventually be moved to its own repo, but for now it is maintained here for ease of development. ## Building From 87daf81a0a25e57e416876b8c5e5c6ce6831c0c9 Mon Sep 17 00:00:00 2001 From: Airyzz <36567925+Airyzz@users.noreply.github.com> Date: Fri, 6 Dec 2024 23:32:41 +1030 Subject: [PATCH 3/4] update flutter_local_notifications --- commet/pubspec.lock | 24 ++++++++++++------- .../windows/flutter/generated_plugins.cmake | 1 + 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/commet/pubspec.lock b/commet/pubspec.lock index 5b450db4..7d27d07a 100644 --- a/commet/pubspec.lock +++ b/commet/pubspec.lock @@ -529,26 +529,34 @@ packages: description: path: flutter_local_notifications ref: HEAD - resolved-ref: "2ed87e412371cb5aeaceaced0dd49bd812ea85be" + resolved-ref: "1d20109e9324f7218bd166aecf2f5665e8f25607" url: "https://github.com/commetchat/flutter_local_notifications.git" source: git - version: "16.1.0" + version: "19.0.0-dev.1" flutter_local_notifications_linux: dependency: transitive description: name: flutter_local_notifications_linux - sha256: c49bd06165cad9beeb79090b18cd1eb0296f4bf4b23b84426e37dd7c027fc3af + sha256: "265340ee321634e7cc11c740252cf8ba71dc5ffaf33e8c5da0ee4d1465d5a3eb" url: "https://pub.dev" source: hosted - version: "4.0.1" + version: "5.0.1-dev.1" flutter_local_notifications_platform_interface: dependency: transitive description: name: flutter_local_notifications_platform_interface - sha256: "85f8d07fe708c1bdcf45037f2c0109753b26ae077e9d9e899d55971711a4ea66" + sha256: "2e387899e2bf22a6e5de22c719701a067521c6f7a810d3b0fbb8bfaf5a2771c7" url: "https://pub.dev" source: hosted - version: "7.2.0" + version: "8.1.0-dev.1" + flutter_local_notifications_windows: + dependency: transitive + description: + name: flutter_local_notifications_windows + sha256: "0888485c7778ad5c69943831b5708edd141e8d745af219809b3d107ba7892522" + url: "https://pub.dev" + source: hosted + version: "1.0.0-dev.1" flutter_localizations: dependency: "direct main" description: flutter @@ -1714,10 +1722,10 @@ packages: dependency: transitive description: name: timezone - sha256: "2236ec079a174ce07434e89fcd3fcda430025eb7692244139a9cf54fdcf1fc7d" + sha256: ffc9d5f4d1193534ef051f9254063fa53d588609418c84299956c3db9383587d url: "https://pub.dev" source: hosted - version: "0.9.4" + version: "0.10.0" timing: dependency: transitive description: diff --git a/commet/windows/flutter/generated_plugins.cmake b/commet/windows/flutter/generated_plugins.cmake index 3b6b7556..8d8496a7 100644 --- a/commet/windows/flutter/generated_plugins.cmake +++ b/commet/windows/flutter/generated_plugins.cmake @@ -19,6 +19,7 @@ list(APPEND FLUTTER_PLUGIN_LIST ) list(APPEND FLUTTER_FFI_PLUGIN_LIST + flutter_local_notifications_windows media_kit_native_event_loop ) From 66ee1ed52ac0908a166eea68c66927f7df07b0fb Mon Sep 17 00:00:00 2001 From: Airyzz <36567925+Airyzz@users.noreply.github.com> Date: Sat, 7 Dec 2024 00:36:00 +1030 Subject: [PATCH 4/4] fix dependency constraints --- commet/pubspec.lock | 16 ++++++++-------- commet/pubspec.yaml | 8 +++----- commet/scripts/apply_google_services.patch | 4 ++-- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/commet/pubspec.lock b/commet/pubspec.lock index 7d27d07a..cd39afbd 100644 --- a/commet/pubspec.lock +++ b/commet/pubspec.lock @@ -338,18 +338,18 @@ packages: dependency: "direct main" description: name: drift - sha256: df027d168a2985a2e9da900adeba2ab0136f0d84436592cf3cd5135f82c8579c + sha256: c2d073d35ad441730812f4ea05b5dd031fb81c5f9786a4f5fb77ecd6307b6f74 url: "https://pub.dev" source: hosted - version: "2.21.0" + version: "2.22.1" drift_dev: dependency: "direct dev" description: name: drift_dev - sha256: "623649abe932fc17bd32e578e7e05f7ac5e7dd0b33e6c8669a0634105d1389bf" + sha256: f4ab5d6976b1e31551ceb82ff597a505bda7818ff4f7be08a1da9d55eb6e730c url: "https://pub.dev" source: hosted - version: "2.21.2" + version: "2.22.1" dropdown_button2: dependency: transitive description: @@ -924,8 +924,8 @@ packages: dependency: "direct main" description: path: "." - ref: "update/flutter" - resolved-ref: "2d49d7d3242429b0b49a3e8eacaf0c74cd912176" + ref: HEAD + resolved-ref: "59b86f5b420df8a45671d6c1db08242a9fe206f3" url: "https://github.com/commetchat/matrix-dart-sdk-drift-db.git" source: git version: "0.0.1" @@ -1619,10 +1619,10 @@ packages: dependency: transitive description: name: sqlparser - sha256: d77749237609784e337ec36c979d41f6f38a7b279df98622ae23929c8eb954a4 + sha256: "4cad4b2c5f63dc9ea1a8dcffb58cf762322bea5dd8836870164a65e913bdae41" url: "https://pub.dev" source: hosted - version: "0.39.2" + version: "0.40.0" stack_trace: dependency: transitive description: diff --git a/commet/pubspec.yaml b/commet/pubspec.yaml index a60392dc..fb578942 100644 --- a/commet/pubspec.yaml +++ b/commet/pubspec.yaml @@ -73,9 +73,7 @@ dependencies: url: https://github.com/commetchat/matrix-dart-sdk.git ref: main matrix_dart_sdk_drift_db: - git: - url: https://github.com/commetchat/matrix-dart-sdk-drift-db.git - ref: update/flutter + git: https://github.com/commetchat/matrix-dart-sdk-drift-db.git encrypted_url_preview: git: https://github.com/commetchat/encrypted_url_preview.git signal_sticker_api: @@ -85,7 +83,7 @@ dependencies: encrypt: ^5.0.3 pointycastle: ^3.7.4 flutter_web_auth_2: ^3.1.1 - drift: ^2.18.0 + drift: ^2.22.1 archive: ^3.6.1 exif: ^3.3.0 image: ^4.2.0 @@ -94,7 +92,7 @@ dependencies: ## ---- Probably good to keep this stuff at the bottom of the list ## Begin Google Services Dependencies #firebase_core: ^2.30.0 - #firebase_messaging: ^14.8.2 + #firebase_messaging: ^14.7.10 ## End Google Services Dependencies ## ---- ## ---- diff --git a/commet/scripts/apply_google_services.patch b/commet/scripts/apply_google_services.patch index 09ba289f..3801541b 100644 --- a/commet/scripts/apply_google_services.patch +++ b/commet/scripts/apply_google_services.patch @@ -65,9 +65,9 @@ index 8163da0..e3bb1c5 100644 ## ---- Probably good to keep this stuff at the bottom of the list ## Begin Google Services Dependencies - #firebase_core: ^2.30.0 -- #firebase_messaging: ^14.8.2 +- #firebase_messaging: ^14.7.10 + firebase_core: ^2.30.0 -+ firebase_messaging: ^14.8.2 ++ firebase_messaging: ^14.7.10 ## End Google Services Dependencies ## ---- ## ----