From a742e78077241a5b8c9ad65eb331ffb3ee6b4fde Mon Sep 17 00:00:00 2001 From: niuhuan Date: Sun, 29 Sep 2024 11:32:51 +0800 Subject: [PATCH] :arrow_up: upgrade flutter --- android/build.gradle | 13 +++++++ lib/commons.dart | 2 +- lib/screens/app_screen.dart | 2 +- pubspec.lock | 68 +++++++++++++++++++++++++------------ pubspec.yaml | 18 +++++----- rust/Cargo.lock | 1 + rust/Cargo.toml | 3 ++ rust/build.rs | 11 ++++-- 8 files changed, 83 insertions(+), 35 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index d2ffbff..cefc2cb 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -9,6 +9,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/lib/commons.dart b/lib/commons.dart index d2271e0..53bb735 100644 --- a/lib/commons.dart +++ b/lib/commons.dart @@ -10,7 +10,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_colorpicker/flutter_colorpicker.dart'; import 'package:flutter_styled_toast/flutter_styled_toast.dart'; import 'package:permission_handler/permission_handler.dart'; -import 'package:uni_links/uni_links.dart'; +import 'package:uni_links3/uni_links.dart'; import 'cross.dart'; diff --git a/lib/screens/app_screen.dart b/lib/screens/app_screen.dart index 94f1102..b3608d5 100644 --- a/lib/screens/app_screen.dart +++ b/lib/screens/app_screen.dart @@ -5,7 +5,7 @@ import 'package:daisy/screens/comics_screen.dart'; import 'package:daisy/screens/novels_screen.dart'; import 'package:event/event.dart'; import 'package:flutter/material.dart'; -import 'package:uni_links/uni_links.dart'; +import 'package:uni_links3/uni_links.dart'; import '../commons.dart'; import '../configs/last_module.dart'; diff --git a/pubspec.lock b/pubspec.lock index 2af38d0..b48b2c3 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -29,10 +29,10 @@ packages: dependency: "direct main" description: name: awesome_select - sha256: "2f47dd6c63829ad9893a7b3c6b6161940fe90518fc53eb8080eb5ee9596c7078" + sha256: b7ea3886c29f07db559688feca329961aa8115c97ecc0615b11db8b8705160c3 url: "https://pub.dev" source: hosted - version: "5.2.0" + version: "6.0.0" boolean_selector: dependency: transitive description: @@ -109,10 +109,10 @@ packages: dependency: "direct main" description: name: event - sha256: eb4814de94cbf6a10da9c4f652bc654087d7066e33566b5036822e6c0b24befb + sha256: "5809a742e6274146a23d9cba63c24caf2f4c87a9a781fdf16ef07f052becaf72" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "3.1.0" fake_async: dependency: transitive description: @@ -137,6 +137,14 @@ packages: url: "https://pub.dev" source: hosted version: "7.0.0" + fixnum: + dependency: transitive + description: + name: fixnum + sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" + url: "https://pub.dev" + source: hosted + version: "1.1.0" flutter: dependency: "direct main" description: flutter @@ -336,42 +344,50 @@ packages: dependency: "direct main" description: name: permission_handler - sha256: bc56bfe9d3f44c3c612d8d393bd9b174eb796d706759f9b495ac254e4294baa5 + sha256: "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb" url: "https://pub.dev" source: hosted - version: "10.4.5" + version: "11.3.1" permission_handler_android: dependency: transitive description: name: permission_handler_android - sha256: "59c6322171c29df93a22d150ad95f3aa19ed86542eaec409ab2691b8f35f9a47" + sha256: "76e4ab092c1b240d31177bb64d2b0bea43f43d0e23541ec866151b9f7b2490fa" url: "https://pub.dev" source: hosted - version: "10.3.6" + version: "12.0.12" permission_handler_apple: dependency: transitive description: name: permission_handler_apple - sha256: "99e220bce3f8877c78e4ace901082fb29fa1b4ebde529ad0932d8d664b34f3f5" + sha256: e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0 url: "https://pub.dev" source: hosted - version: "9.1.4" + version: "9.4.5" + permission_handler_html: + dependency: transitive + description: + name: permission_handler_html + sha256: af26edbbb1f2674af65a8f4b56e1a6f526156bc273d0e65dd8075fab51c78851 + url: "https://pub.dev" + source: hosted + version: "0.1.3+2" permission_handler_platform_interface: dependency: transitive description: name: permission_handler_platform_interface - sha256: "6760eb5ef34589224771010805bea6054ad28453906936f843a8cc4d3a55c4a4" + sha256: e9c8eadee926c4532d0305dff94b85bf961f16759c3af791486613152af4b4f9 url: "https://pub.dev" source: hosted - version: "3.12.0" + version: "4.2.3" permission_handler_windows: dependency: transitive description: name: permission_handler_windows - sha256: cc074aace208760f1eee6aa4fae766b45d947df85bc831cde77009cdb4720098 + sha256: "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e" url: "https://pub.dev" source: hosted - version: "0.1.3" + version: "0.2.1" petitparser: dependency: transitive description: @@ -384,10 +400,10 @@ packages: dependency: "direct main" description: name: photo_view - sha256: "8036802a00bae2a78fc197af8a158e3e2f7b500561ed23b4c458107685e645bb" + sha256: "1fc3d970a91295fbd1364296575f854c9863f225505c28c46e0a03e48960c75e" url: "https://pub.dev" source: hosted - version: "0.14.0" + version: "0.15.0" platform: dependency: transitive description: @@ -440,6 +456,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.10.0" + sprintf: + dependency: transitive + description: + name: sprintf + sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23" + url: "https://pub.dev" + source: hosted + version: "7.0.0" stack_trace: dependency: transitive description: @@ -496,14 +520,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.2" - uni_links: + uni_links3: dependency: "direct main" description: - name: uni_links - sha256: "051098acfc9e26a9fde03b487bef5d3d228ca8f67693480c6f33fd4fbb8e2b6e" + name: uni_links3 + sha256: fc719f055d010538c015dd41f9359c910ca69e413a1acf731fe5541c63ad8814 url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.5.3" uni_links_platform_interface: dependency: transitive description: @@ -588,10 +612,10 @@ packages: dependency: "direct main" description: name: uuid - sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313" + sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff url: "https://pub.dev" source: hosted - version: "3.0.7" + version: "4.5.1" vector_math: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 54d996d..14c91ca 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -17,23 +17,23 @@ dependencies: rust_lib_daisy: path: rust_builder flutter_rust_bridge: 2.4.0 - date_format: ^2.0.5 - uuid: ^3.0.6 - awesome_select: ^5.2.0 another_xlider: ^1.0.1+2 - event: ^2.1.2 modal_bottom_sheet: ^3.0.0-pre - photo_view: ^0.14.0 + photo_view: ^0.15.0 scrollable_positioned_list: ^0.2.3 - permission_handler: ^10.1.0 - flutter_styled_toast: ^2.1.3 + permission_handler: ^11.3.1 + flutter_styled_toast: ^2.2.1 flutter_svg: ^1.0.3 - url_launcher: ^6.1.2 flutter_colorpicker: ^1.0.3 crypto: ^3.0.2 ffi: 2.0.1 - uni_links: ^0.5.1 + uni_links3: ^0.5.3 flutter_html: ^3.0.0-beta.2 + awesome_select: ^6.0.0 + url_launcher: ^6.3.0 + uuid: ^4.5.1 + date_format: ^2.0.9 + event: ^3.1.0 dev_dependencies: flutter_test: diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 1502c3c..b24cc7a 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -1730,6 +1730,7 @@ dependencies = [ "anyhow", "async_once", "base64", + "build-target", "bytes", "chrono", "flutter_rust_bridge", diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 6bc70d4..a5ad807 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -35,3 +35,6 @@ tokio = { version = "1.33.0", features = ["full"] } reqwest = { version = "0.11.22", features = ["tokio-rustls", "rustls", "rustls-tls"], default-features = false } sea-orm = { version = "0.12.4", features = ["sqlx-sqlite", "macros", "runtime-tokio-rustls"], default-features = false } +[build-dependencies] +build-target = "0.4.0" + diff --git a/rust/build.rs b/rust/build.rs index 2c76881..403678b 100644 --- a/rust/build.rs +++ b/rust/build.rs @@ -1,4 +1,11 @@ +use build_target::Os; + fn main() { - #[cfg(target_os = "macos")] - println!("cargo:rustc-link-lib=framework=SystemConfiguration"); + let os = build_target::target_os().unwrap(); + match os { + Os::MacOs => { + println!("cargo:rustc-link-lib=framework=SystemConfiguration"); + } + _ => {} + } }