hexianglong/rustdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
Chieh Wang
2022-12-08 18:51:20 +08:00
committed by Asura
Unverified
parent 95775678ca
commit 49bcf8f794
6 changed files with 114 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
flutter/pubspec.lock
View File

@@ -7,7 +7,7 @@ packages:
name: _fe_analyzer_shared
url: "https://pub.dartlang.org"
source: hosted
version: "50.0.0"
version: "49.0.0"
after_layout:
dependency: transitive
description:
@@ -21,7 +21,7 @@ packages:
name: analyzer
url: "https://pub.dartlang.org"
source: hosted
version: "5.2.0"
version: "5.1.0"
animations:
dependency: transitive
description:
@@ -35,7 +35,7 @@ packages:
name: archive
url: "https://pub.dartlang.org"
source: hosted
version: "3.3.5"
version: "3.3.1"
args:
dependency: transitive
description:
@@ -64,6 +64,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "6.0.1"
bot_toast:
dependency: "direct main"
description:
name: bot_toast
url: "https://pub.dartlang.org"
source: hosted
version: "4.0.3"
build:
dependency: transitive
description:
@@ -77,7 +84,7 @@ packages:
name: build_config
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.1"
version: "1.1.0"
build_daemon:
dependency: transitive
description:
@@ -98,14 +105,14 @@ packages:
name: build_runner
url: "https://pub.dartlang.org"
source: hosted
version: "2.3.2"
version: "2.2.1"
build_runner_core:
dependency: transitive
description:
name: build_runner_core
url: "https://pub.dartlang.org"
source: hosted
version: "7.2.7"
version: "7.2.4"
built_collection:
dependency: transitive
description:
@@ -119,7 +126,7 @@ packages:
name: built_value
url: "https://pub.dartlang.org"
source: hosted
version: "8.4.2"
version: "8.4.1"
cached_network_image:
dependency: transitive
description:
@@ -196,7 +203,7 @@ packages:
name: convert
url: "https://pub.dartlang.org"
source: hosted
version: "3.1.0"
version: "3.0.2"
cross_file:
dependency: transitive
description:
@@ -257,8 +264,8 @@ packages:
dependency: "direct main"
description:
path: "."
ref: bf278fc8a8ff787e46fa3ab97674373bfaa20f23
resolved-ref: bf278fc8a8ff787e46fa3ab97674373bfaa20f23
ref: "82f9eab81cb2c7bfb938def7a1b399a6279bbc75"
resolved-ref: "82f9eab81cb2c7bfb938def7a1b399a6279bbc75"
url: "https://github.com/Kingtous/rustdesk_desktop_multi_window"
source: git
version: "0.1.0"
@@ -345,7 +352,7 @@ packages:
name: file_picker
url: "https://pub.dartlang.org"
source: hosted
version: "5.2.2"
version: "5.2.1"
fixnum:
dependency: transitive
description:
@@ -383,8 +390,8 @@ packages:
dependency: "direct main"
description:
path: "."
ref: dec2166e881c47d922e1edc484d10d2cd5c2103b
resolved-ref: dec2166e881c47d922e1edc484d10d2cd5c2103b
ref: "74b1b314142b6775c1243067a3503ac568ebc74b"
resolved-ref: "74b1b314142b6775c1243067a3503ac568ebc74b"
url: "https://github.com/Kingtous/rustdesk_flutter_custom_cursor"
source: git
version: "0.0.1"
@@ -436,7 +443,7 @@ packages:
name: flutter_svg
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.6"
version: "1.1.5"
flutter_web_plugins:
dependency: transitive
description: flutter
@@ -448,21 +455,21 @@ packages:
name: freezed
url: "https://pub.dartlang.org"
source: hosted
version: "2.2.1"
version: "2.1.1"
freezed_annotation:
dependency: "direct main"
description:
name: freezed_annotation
url: "https://pub.dartlang.org"
source: hosted
version: "2.2.0"
version: "2.1.0"
frontend_server_client:
dependency: transitive
description:
name: frontend_server_client
url: "https://pub.dartlang.org"
source: hosted
version: "3.2.0"
version: "2.1.3"
get:
dependency: "direct main"
description:
@@ -476,21 +483,21 @@ packages:
name: glob
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.1"
version: "2.1.0"
graphs:
dependency: transitive
description:
name: graphs
url: "https://pub.dartlang.org"
source: hosted
version: "2.2.0"
version: "2.1.0"
html:
dependency: transitive
description:
name: html
url: "https://pub.dartlang.org"
source: hosted
version: "0.15.1"
version: "0.15.0"
http:
dependency: "direct main"
description:
@@ -511,7 +518,7 @@ packages:
name: http_parser
url: "https://pub.dartlang.org"
source: hosted
version: "4.0.2"
version: "4.0.1"
icons_launcher:
dependency: "direct dev"
description:
@@ -525,7 +532,7 @@ packages:
name: image
url: "https://pub.dartlang.org"
source: hosted
version: "3.2.2"
version: "3.2.0"
image_picker:
dependency: "direct main"
description:
@@ -595,7 +602,7 @@ packages:
name: lints
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.1"
version: "2.0.0"
logging:
dependency: transitive
description:
@@ -728,7 +735,7 @@ packages:
name: path_provider_android
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.22"
version: "2.0.20"
path_provider_ios:
dependency: transitive
description:
@@ -792,13 +799,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.3"
pointycastle:
dependency: transitive
description:
name: pointycastle
url: "https://pub.dartlang.org"
source: hosted
version: "3.6.2"
pool:
dependency: transitive
description:
@@ -819,14 +819,14 @@ packages:
name: provider
url: "https://pub.dartlang.org"
source: hosted
version: "6.0.4"
version: "6.0.3"
pub_semver:
dependency: transitive
description:
name: pub_semver
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.3"
version: "2.1.1"
pubspec_parse:
dependency: transitive
description:
@@ -847,7 +847,7 @@ packages:
name: rxdart
url: "https://pub.dartlang.org"
source: hosted
version: "0.27.7"
version: "0.27.5"
screen_retriever:
dependency: transitive
description:
@@ -884,7 +884,7 @@ packages:
name: shelf_web_socket
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.3"
version: "1.0.2"
simple_observable:
dependency: transitive
description:
@@ -903,7 +903,7 @@ packages:
name: source_gen
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.6"
version: "1.2.5"
source_span:
dependency: transitive
description:
@@ -924,7 +924,7 @@ packages:
name: sqflite_common
url: "https://pub.dartlang.org"
source: hosted
version: "2.4.0"
version: "2.3.0"
stack_trace:
dependency: transitive
description:
@@ -945,7 +945,7 @@ packages:
name: stream_transform
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0"
version: "2.0.1"
string_scanner:
dependency: transitive
description:
@@ -1008,7 +1008,7 @@ packages:
name: uni_links_desktop
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.3"
version: "0.1.4"
uni_links_platform_interface:
dependency: transitive
description:
@@ -1036,14 +1036,14 @@ packages:
name: url_launcher
url: "https://pub.dartlang.org"
source: hosted
version: "6.1.7"
version: "6.1.6"
url_launcher_android:
dependency: transitive
description:
name: url_launcher_android
url: "https://pub.dartlang.org"
source: hosted
version: "6.0.22"
version: "6.0.19"
url_launcher_ios:
dependency: transitive
description:
@@ -1092,7 +1092,7 @@ packages:
name: uuid
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.7"
version: "3.0.6"
vector_math:
dependency: transitive
description:
@@ -1106,7 +1106,7 @@ packages:
name: video_player
url: "https://pub.dartlang.org"
source: hosted
version: "2.4.8"
version: "2.4.7"
video_player_android:
dependency: transitive
description:
@@ -1183,7 +1183,7 @@ packages:
name: watcher
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.2"
version: "1.0.1"
web_socket_channel:
dependency: transitive
description:
@@ -1197,7 +1197,7 @@ packages:
name: win32
url: "https://pub.dartlang.org"
source: hosted
version: "3.1.2"
version: "3.0.0"
win32_registry:
dependency: transitive
description: