Revert "bump deps"
This reverts commit f8938b8257. Needed until https://github.com/flutter/flutter/issues/196529 is fixed.
This commit is contained in:
parent
65890b8e00
commit
bebbf43a5e
9 changed files with 74 additions and 49 deletions
|
|
@ -75,7 +75,7 @@ android {
|
|||
|
||||
dependencies {
|
||||
implementation("org.unifiedpush.android:embedded-fcm-distributor:3.1.0")
|
||||
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
|
||||
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4")
|
||||
}
|
||||
|
||||
kotlin {
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@ pluginManagement {
|
|||
|
||||
plugins {
|
||||
id("dev.flutter.flutter-plugin-loader") version "1.0.0"
|
||||
id("com.android.application") version "9.5.1" apply false
|
||||
id("org.jetbrains.kotlin.android") version "2.4.21" apply false
|
||||
id("com.android.application") version "9.3.1" apply false
|
||||
id("org.jetbrains.kotlin.android") version "2.4.10" apply false
|
||||
}
|
||||
|
||||
include(":app")
|
||||
|
|
|
|||
17
flake.lock
generated
17
flake.lock
generated
|
|
@ -29,15 +29,16 @@
|
|||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1795368110,
|
||||
"narHash": "sha256-rIdyHJHv44OJD5B9Wo0CCIyR6Vecnxx5MuAPfanJ7n0=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "21f3f0c1ebcfad22e5a3ab497d2139a36bd77d6e",
|
||||
"revCount": 8275,
|
||||
"lastModified": 1794436491,
|
||||
"narHash": "sha256-1Gbe5ys68lljaWtwn8Z4RhkUnWDfw8AaHQJDKVzzmVA=",
|
||||
"ref": "ea3beb628a3cab6fbc4142b725c9edb043846eb6",
|
||||
"rev": "ea3beb628a3cab6fbc4142b725c9edb043846eb6",
|
||||
"revCount": 8146,
|
||||
"type": "git",
|
||||
"url": "https://forgejo.ellis.link/Continuwuation/Continuwuity"
|
||||
},
|
||||
"original": {
|
||||
"ref": "ea3beb628a3cab6fbc4142b725c9edb043846eb6",
|
||||
"type": "git",
|
||||
"url": "https://forgejo.ellis.link/Continuwuation/Continuwuity"
|
||||
}
|
||||
|
|
@ -173,11 +174,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1795234589,
|
||||
"narHash": "sha256-f/VVvxf5RsQgWVhUtefoca5ktVg0DA2bnkMOcmSnozo=",
|
||||
"lastModified": 1793540411,
|
||||
"narHash": "sha256-fiPJ88izTVucjeo2EQ3jk4aWmLg03I1D4vxnX2QjEgE=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2786a2a72088ecf32aea5b3ec52099e6a7cff78f",
|
||||
"rev": "0bb2eedc20e4739f29e8045034f2828ad7054f8f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
};
|
||||
# TEMPORARY: the e2e tests against Continuwuity from the forge, till there's a new full release in nixpkgs
|
||||
continuwuity = {
|
||||
url = "git+https://forgejo.ellis.link/Continuwuation/Continuwuity";
|
||||
url = "git+https://forgejo.ellis.link/Continuwuation/Continuwuity?ref=ea3beb628a3cab6fbc4142b725c9edb043846eb6";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4,7 +4,13 @@ extension SchemeToTheme on ColorScheme {
|
|||
ThemeData get theme {
|
||||
final textTheme = ThemeData(
|
||||
fontFamily: "bundled-sans",
|
||||
fontFamilyFallback: ["emoji"],
|
||||
fontFamilyFallback: [
|
||||
"emoji",
|
||||
// TODO: Remove once on Flutter 3.50, whose Linux arm64 engine uses
|
||||
// fontconfig and so understands the "emoji" alias
|
||||
"Noto Color Emoji",
|
||||
"Twemoji",
|
||||
],
|
||||
brightness: brightness,
|
||||
).textTheme;
|
||||
return .from(colorScheme: this).copyWith(
|
||||
|
|
|
|||
|
|
@ -45,6 +45,14 @@ New Value: ${newValue is AsyncData ? newValue.value : newValue}
|
|||
}
|
||||
|
||||
void showError(Object error, [StackTrace? stackTrace]) {
|
||||
// Harmless Flutter race in animated images (the assert in debug, a null check in release)
|
||||
if (error.toString().contains("'_nextFrame != null': is not true.") ||
|
||||
stackTrace.toString().contains(
|
||||
"MultiFrameImageStreamCompleter._handleAppFrame",
|
||||
)) {
|
||||
return;
|
||||
}
|
||||
|
||||
debugPrintStack(stackTrace: stackTrace, label: error.toString());
|
||||
if (navigatorKey.currentContext != null) {
|
||||
Future.delayed(
|
||||
|
|
|
|||
|
|
@ -63,7 +63,9 @@ flutter.buildFlutterApplication {
|
|||
fab_m3e = "sha256-5V9m6yY0jimx2gh7lQHYg4HDKQ4Wrl0ATmBhw5DkQMI=";
|
||||
fluttertagger = "sha256-tHUNU2+fBPkq5UK5YRi3SWs1zF2PIPz6RgSbwignU/I=";
|
||||
m3e_design = "sha256-5V9m6yY0jimx2gh7lQHYg4HDKQ4Wrl0ATmBhw5DkQMI=";
|
||||
native_toolchain_cmake = "sha256-/drnHZebmTnsCnHgC1xmlAe+U4PSrjw5Sm9axicuTrY=";
|
||||
navigation_rail_m3e = "sha256-5V9m6yY0jimx2gh7lQHYg4HDKQ4Wrl0ATmBhw5DkQMI=";
|
||||
pasteboard = "sha256-J3yray5n7XwVXMcOsvQ5+OvADEK2lPMeYniGg+yR704=";
|
||||
unifiedpush_linux = "sha256-KQKyBPL2ORK9O89C4K3RHGve/lvFaU1vIjSDnj6+bj4=";
|
||||
unifiedpush_platform_interface = "sha256-KQKyBPL2ORK9O89C4K3RHGve/lvFaU1vIjSDnj6+bj4=";
|
||||
xdg_desktop_portal = "sha256-8GgiXHGv+wy6hJgj/rZxbymMitNVmdDLAnedZm9STSc=";
|
||||
|
|
|
|||
64
pubspec.lock
64
pubspec.lock
|
|
@ -173,18 +173,18 @@ packages:
|
|||
dependency: transitive
|
||||
description:
|
||||
name: better_player_android
|
||||
sha256: "9e074251038a087c31683d371ee573c39f200d3e6f85454ea612320dba65688f"
|
||||
sha256: "2c7df9bfb1e7fa69c86d3bb91a1825bba30292968307724fa51869bc3a0bb75d"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.14.0"
|
||||
version: "1.13.2"
|
||||
better_player_ios:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: better_player_ios
|
||||
sha256: "03186ef3ecdeb37a120486cf988b005e0b46cdc52308037e7f4aee36bfee6f8d"
|
||||
sha256: "4b9c08690374aa84b15ba88ab5d6b695cda618fb895b445a6a4186c220599c84"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.16.0"
|
||||
version: "1.15.0"
|
||||
better_player_linux:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
|
@ -205,18 +205,18 @@ packages:
|
|||
dependency: transitive
|
||||
description:
|
||||
name: better_player_platform_interface
|
||||
sha256: "9ee3301e17e3a2a937760bfdd8c4b70800cd01bcc636c85c45a4be71bbaa1a45"
|
||||
sha256: e5218199dd12ffe6f43c01d5cdeecad0b53125926f8da8c3f4b90136d8b55ec1
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.8.1"
|
||||
version: "1.8.0"
|
||||
better_player_web:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: better_player_web
|
||||
sha256: e365a08e8041d56980fb87e577274e255543fcf377124c40880f189f00b6cf4b
|
||||
sha256: d7b365221f7724f22d3fef7840e45af2493a784e2429a30e980f807bcb7c9539
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.7.0"
|
||||
version: "1.6.1"
|
||||
better_player_windows:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
|
@ -333,10 +333,10 @@ packages:
|
|||
dependency: transitive
|
||||
description:
|
||||
name: cnativeapi
|
||||
sha256: "49662734cdf3dd1707b1ee35102ac1754e0ab3d450a2d30b066730f219dacc86"
|
||||
sha256: c43703998995e132b0656d2b8a95ed2bedc6b22ccee2c827bcdc075e0330e319
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.6.2"
|
||||
version: "0.5.10"
|
||||
code_assets:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
|
|
@ -1178,29 +1178,30 @@ packages:
|
|||
source: hosted
|
||||
version: "0.19.6"
|
||||
native_toolchain_cmake:
|
||||
dependency: transitive
|
||||
dependency: "direct overridden"
|
||||
description:
|
||||
name: native_toolchain_cmake
|
||||
sha256: b3501c56fa20328d57586317fdbbcfa2051a498175130ecd21c4a922de6a2c8d
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.3.3"
|
||||
path: "."
|
||||
ref: HEAD
|
||||
resolved-ref: d77984a36a16be22e911850de2cd2050610ff4ed
|
||||
url: "https://github.com/rainyl/native_toolchain_cmake"
|
||||
source: git
|
||||
version: "0.3.2"
|
||||
nativeapi:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: nativeapi
|
||||
sha256: "339b7a91a27ce5c33659cab92cf8e76736142985433652f91a63cc5348135bfb"
|
||||
sha256: "118045bb549cb6fabad472a3a22a537e7310bbf20097350f5027808b4a5853ce"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.6.2"
|
||||
version: "0.5.10"
|
||||
nativeapi_flutter:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: nativeapi_flutter
|
||||
sha256: b0507253748ba9690a295bc162208a91d348809185409e5aee7b09e77ab5d8a3
|
||||
sha256: "357a405c69212f5157da1bd3be183a53c2b841d0de0eb51f4a3947913712aec4"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.6.2"
|
||||
version: "0.5.10"
|
||||
navigation_rail_m3e:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
|
|
@ -1245,11 +1246,12 @@ packages:
|
|||
pasteboard:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: pasteboard
|
||||
sha256: "7b1c7ed83b4ff27acced26e96b87c16ac37fb6c57d7886eb3130faccb28b2cc2"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.6.2"
|
||||
path: "packages/pasteboard"
|
||||
ref: HEAD
|
||||
resolved-ref: e79a0ecc741b80575f38465c02eba9c553e12479
|
||||
url: "https://github.com/Henry-Hiles/flutter-plugins"
|
||||
source: git
|
||||
version: "0.6.1"
|
||||
path:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
|
|
@ -1611,10 +1613,10 @@ packages:
|
|||
dependency: transitive
|
||||
description:
|
||||
name: test_api
|
||||
sha256: "0a10344e901e5b2e63819567951cb6a06673ed6b84f40462188ff5a0c41f371f"
|
||||
sha256: "2a122cbe059f8b610d3a5415f42e255b6c17b1f21eee1d960f31080237fb4f11"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.7.14"
|
||||
version: "0.7.12"
|
||||
timeago:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
|
|
@ -1901,10 +1903,10 @@ packages:
|
|||
dependency: "direct main"
|
||||
description:
|
||||
name: window_manager
|
||||
sha256: "9504ae37e618d31524e337ad3cf9600d252acf11fffa3ddb9b0b5ced634542d9"
|
||||
sha256: bdd6b1a2c1ce50f3bba7ffbaa0d5dc5feb6b6a24fd20269da4de90244f77a471
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.7.1"
|
||||
version: "0.6.0"
|
||||
wkt_parser:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
|
@ -1955,5 +1957,5 @@ packages:
|
|||
source: hosted
|
||||
version: "2.2.4"
|
||||
sdks:
|
||||
dart: "3.14.0"
|
||||
flutter: "3.50.1"
|
||||
dart: "3.13.3"
|
||||
flutter: "3.47.4"
|
||||
|
|
|
|||
16
pubspec.yaml
16
pubspec.yaml
|
|
@ -16,14 +16,16 @@ flutter:
|
|||
uses-material-design: true
|
||||
|
||||
environment:
|
||||
sdk: 3.14.0
|
||||
flutter: 3.50.1
|
||||
sdk: 3.13.3
|
||||
flutter: 3.47.4
|
||||
|
||||
dependency_overrides:
|
||||
dynamic_color: 2.1.0
|
||||
code_assets: 2.2.0 # webcrypto requires ^1.0.0, but works with 2.x
|
||||
webcrypto: 0.6.2
|
||||
window_manager: 0.7.1 # unifiedpush_linux requires ^0.6.0, 0.7 has the Dart 3.14 nativeapi fix
|
||||
native_toolchain_cmake:
|
||||
git:
|
||||
url: https://github.com/rainyl/native_toolchain_cmake # Fixes native aarch64 linux builds, unreleased
|
||||
m3e_design:
|
||||
git:
|
||||
url: https://github.com/Henry-Hiles/material_3_expressive
|
||||
|
|
@ -42,6 +44,10 @@ dependency_overrides:
|
|||
url: https://codeberg.org/Henry-Hiles/flutter-connector
|
||||
ref: quad/nexus
|
||||
path: unifiedpush_platform_interface
|
||||
pasteboard:
|
||||
git:
|
||||
url: https://github.com/Henry-Hiles/flutter-plugins # FileTransfer portal support on Linux, unreleased
|
||||
path: packages/pasteboard
|
||||
linkify:
|
||||
git:
|
||||
url: https://github.com/appelladev/linkify
|
||||
|
|
@ -63,7 +69,7 @@ dependencies:
|
|||
path: 1.9.1
|
||||
dynamic_color: 2.1.0
|
||||
collection: 1.19.1
|
||||
window_manager: 0.7.1
|
||||
window_manager: 0.6.0
|
||||
color_hash: 1.0.1
|
||||
flutter_widget_from_html_core: 0.18.0-beta.1
|
||||
flutter_svg: 2.5.0
|
||||
|
|
@ -107,7 +113,7 @@ dependencies:
|
|||
git:
|
||||
url: https://github.com/Henry-Hiles/xdg_desktop_portal.dart
|
||||
ref: quad/nexus
|
||||
pasteboard: 0.6.2
|
||||
pasteboard: 0.6.0
|
||||
flutter_file_dialog: 3.3.6
|
||||
mime: 2.1.0
|
||||
avif_native: 0.2.0
|
||||
|
|
|
|||
Loading…
Reference in a new issue