xt / Flutter-ReserveApp · Commits

Go to a project

Commit 5cba28f3f827bbe822aba5a318a82b56135f7f12

Authored by weixin_45529955
1 parent 32799f2f

iOS 安卓版本和鸿蒙端插件版本尽量保持一致

Inline Side-by-side
Showing 5 changed files with 46 additions and 55 deletions
@@ -2,6 +2,7 @@ distributionBase=GRADLE_USER_HOME @@ -2,6 +2,7 @@ distributionBase=GRADLE_USER_HOME
2 distributionPath=wrapper/dists 2 distributionPath=wrapper/dists
3 # distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip 3 # distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
4 # distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip 4 # distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
  5 +; distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
5 distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip 6 distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
6 zipStoreBase=GRADLE_USER_HOME 7 zipStoreBase=GRADLE_USER_HOME
7 zipStorePath=wrapper/dists 8 zipStorePath=wrapper/dists
@@ -80,6 +80,7 @@ PODS: @@ -80,6 +80,7 @@ PODS:
80 - Flutter 80 - Flutter
81 - fluttertoast (0.0.2): 81 - fluttertoast (0.0.2):
82 - Flutter 82 - Flutter
  83 + - Toast
83 - fluwx (0.0.1): 84 - fluwx (0.0.1):
84 - Flutter 85 - Flutter
85 - fluwx/pay (= 0.0.1) 86 - fluwx/pay (= 0.0.1)
@@ -140,10 +141,11 @@ PODS: @@ -140,10 +141,11 @@ PODS:
140 - FlutterMacOS 141 - FlutterMacOS
141 - sign_in_with_apple (0.0.1): 142 - sign_in_with_apple (0.0.1):
142 - Flutter 143 - Flutter
143 - - sqflite_darwin (0.0.4): 144 + - sqflite (0.0.3):
144 - Flutter 145 - Flutter
145 - FlutterMacOS 146 - FlutterMacOS
146 - SwiftProtobuf (1.33.1) 147 - SwiftProtobuf (1.33.1)
  148 + - Toast (4.1.1)
147 - TOCropViewController (2.7.4) 149 - TOCropViewController (2.7.4)
148 - TPNS-iOS (1.4.0.5) 150 - TPNS-iOS (1.4.0.5)
149 - tpns_flutter_plugin (1.3.4): 151 - tpns_flutter_plugin (1.3.4):
@@ -203,7 +205,7 @@ DEPENDENCIES: @@ -203,7 +205,7 @@ DEPENDENCIES:
203 - sendsms (from `.symlinks/plugins/sendsms/ios`) 205 - sendsms (from `.symlinks/plugins/sendsms/ios`)
204 - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) 206 - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
205 - sign_in_with_apple (from `.symlinks/plugins/sign_in_with_apple/ios`) 207 - sign_in_with_apple (from `.symlinks/plugins/sign_in_with_apple/ios`)
206 - - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`) 208 + - sqflite (from `.symlinks/plugins/sqflite/darwin`)
207 - tpns_flutter_plugin (from `.symlinks/plugins/tpns_flutter_plugin/ios`) 209 - tpns_flutter_plugin (from `.symlinks/plugins/tpns_flutter_plugin/ios`)
208 - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) 210 - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
209 - video_compress (from `.symlinks/plugins/video_compress/ios`) 211 - video_compress (from `.symlinks/plugins/video_compress/ios`)
@@ -227,6 +229,7 @@ SPEC REPOS: @@ -227,6 +229,7 @@ SPEC REPOS:
227 - SDWebImage 229 - SDWebImage
228 - SDWebImageWebPCoder 230 - SDWebImageWebPCoder
229 - SwiftProtobuf 231 - SwiftProtobuf
  232 + - Toast
230 - TOCropViewController 233 - TOCropViewController
231 - TPNS-iOS 234 - TPNS-iOS
232 - WechatOpenSDK-XCFramework 235 - WechatOpenSDK-XCFramework
@@ -310,8 +313,8 @@ EXTERNAL SOURCES: @@ -310,8 +313,8 @@ EXTERNAL SOURCES:
310 :path: ".symlinks/plugins/shared_preferences_foundation/darwin" 313 :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
311 sign_in_with_apple: 314 sign_in_with_apple:
312 :path: ".symlinks/plugins/sign_in_with_apple/ios" 315 :path: ".symlinks/plugins/sign_in_with_apple/ios"
313 - sqflite_darwin:  
314 - :path: ".symlinks/plugins/sqflite_darwin/darwin" 316 + sqflite:
  317 + :path: ".symlinks/plugins/sqflite/darwin"
315 tpns_flutter_plugin: 318 tpns_flutter_plugin:
316 :path: ".symlinks/plugins/tpns_flutter_plugin/ios" 319 :path: ".symlinks/plugins/tpns_flutter_plugin/ios"
317 url_launcher_ios: 320 url_launcher_ios:
@@ -356,7 +359,7 @@ SPEC CHECKSUMS: @@ -356,7 +359,7 @@ SPEC CHECKSUMS:
356 flutter_native_image: c0f200e4bc5da392b15878df38654cc85a78b090 359 flutter_native_image: c0f200e4bc5da392b15878df38654cc85a78b090
357 flutter_sms: bb63bc226f41fad2b7cc9f0b1d0c15f7730a8310 360 flutter_sms: bb63bc226f41fad2b7cc9f0b1d0c15f7730a8310
358 flutter_statusbarcolor_ns: 28ea17050f37c962fe05a4722a6d43afc4fca76b 361 flutter_statusbarcolor_ns: 28ea17050f37c962fe05a4722a6d43afc4fca76b
359 - fluttertoast: 2c67e14dce98bbdb200df9e1acf610d7a6264ea1 362 + fluttertoast: 76fea30fcf04176325f6864c87306927bd7d2038
360 fluwx: 2ef787502fccb3f3596b380509001a8ea71cbbff 363 fluwx: 2ef787502fccb3f3596b380509001a8ea71cbbff
361 foundation_fluttify: f4349a7e72691ddf460062127ef64f3a221868a5 364 foundation_fluttify: f4349a7e72691ddf460062127ef64f3a221868a5
362 image_cropper: c4326ea50132b1e1564499e5d32a84f01fb03537 365 image_cropper: c4326ea50132b1e1564499e5d32a84f01fb03537
@@ -378,8 +381,9 @@ SPEC CHECKSUMS: @@ -378,8 +381,9 @@ SPEC CHECKSUMS:
378 sendsms: 43a465a88ce570d59cc10ef0f3bdb922cc303c7b 381 sendsms: 43a465a88ce570d59cc10ef0f3bdb922cc303c7b
379 shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7 382 shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
380 sign_in_with_apple: c5dcc141574c8c54d5ac99dd2163c0c72ad22418 383 sign_in_with_apple: c5dcc141574c8c54d5ac99dd2163c0c72ad22418
381 - sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0 384 + sqflite: c35dad70033b8862124f8337cc994a809fcd9fa3
382 SwiftProtobuf: 533a18409c3ca3a6156b2b1e46afd0f69e751aba 385 SwiftProtobuf: 533a18409c3ca3a6156b2b1e46afd0f69e751aba
  386 + Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e
383 TOCropViewController: 80b8985ad794298fb69d3341de183f33d1853654 387 TOCropViewController: 80b8985ad794298fb69d3341de183f33d1853654
384 TPNS-iOS: 757b0439d967beb8c5d6be6a8e9ad23e11d1e36c 388 TPNS-iOS: 757b0439d967beb8c5d6be6a8e9ad23e11d1e36c
385 tpns_flutter_plugin: 54270cae525b4a255f9140b9b7f745724601646a 389 tpns_flutter_plugin: 54270cae525b4a255f9140b9b7f745724601646a
@@ -16,7 +16,7 @@ import path_provider_foundation @@ -16,7 +16,7 @@ import path_provider_foundation
16 import photo_manager 16 import photo_manager
17 import shared_preferences_foundation 17 import shared_preferences_foundation
18 import sign_in_with_apple 18 import sign_in_with_apple
19 -import sqflite_darwin 19 +import sqflite
20 import url_launcher_macos 20 import url_launcher_macos
21 import video_compress 21 import video_compress
22 import video_player_avfoundation 22 import video_player_avfoundation
@@ -938,10 +938,10 @@ packages: @@ -938,10 +938,10 @@ packages:
938 dependency: "direct main" 938 dependency: "direct main"
939 description: 939 description:
940 name: fluttertoast 940 name: fluttertoast
941 - sha256: "90778fe0497fe3a09166e8cf2e0867310ff434b794526589e77ec03cf08ba8e8" 941 + sha256: "95f349437aeebe524ef7d6c9bde3e6b4772717cf46a0eb6a3ceaddc740b297cc"
942 url: "https://pub.flutter-io.cn" 942 url: "https://pub.flutter-io.cn"
943 source: hosted 943 source: hosted
944 - version: "8.2.14" 944 + version: "8.2.8"
945 fluwx: 945 fluwx:
946 dependency: "direct main" 946 dependency: "direct main"
947 description: 947 description:
@@ -1306,10 +1306,10 @@ packages: @@ -1306,10 +1306,10 @@ packages:
1306 dependency: "direct main" 1306 dependency: "direct main"
1307 description: 1307 description:
1308 name: open_filex 1308 name: open_filex
1309 - sha256: "9976da61b6a72302cf3b1efbce259200cd40232643a467aac7370addf94d6900" 1309 + sha256: ba425ea49affd0a98a234aa9344b9ea5d4c4f7625a1377961eae9fe194c3d523
1310 url: "https://pub.flutter-io.cn" 1310 url: "https://pub.flutter-io.cn"
1311 source: hosted 1311 source: hosted
1312 - version: "4.7.0" 1312 + version: "4.5.0"
1313 package_config: 1313 package_config:
1314 dependency: transitive 1314 dependency: transitive
1315 description: 1315 description:
@@ -1402,10 +1402,10 @@ packages: @@ -1402,10 +1402,10 @@ packages:
1402 dependency: "direct main" 1402 dependency: "direct main"
1403 description: 1403 description:
1404 name: permission_handler 1404 name: permission_handler
1405 - sha256: "59adad729136f01ea9e35a48f5d1395e25cba6cea552249ddbe9cf950f5d7849" 1405 + sha256: "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb"
1406 url: "https://pub.flutter-io.cn" 1406 url: "https://pub.flutter-io.cn"
1407 source: hosted 1407 source: hosted
1408 - version: "11.4.0" 1408 + version: "11.3.1"
1409 permission_handler_android: 1409 permission_handler_android:
1410 dependency: transitive 1410 dependency: transitive
1411 description: 1411 description:
@@ -1798,18 +1798,10 @@ packages: @@ -1798,18 +1798,10 @@ packages:
1798 dependency: "direct main" 1798 dependency: "direct main"
1799 description: 1799 description:
1800 name: sqflite 1800 name: sqflite
1801 - sha256: "2d7299468485dca85efeeadf5d38986909c5eb0cd71fd3db2c2f000e6c9454bb" 1801 + sha256: a43e5a27235518c03ca238e7b4732cf35eabe863a369ceba6cbefa537a66f16d
1802 url: "https://pub.flutter-io.cn" 1802 url: "https://pub.flutter-io.cn"
1803 source: hosted 1803 source: hosted
1804 - version: "2.4.1"  
1805 - sqflite_android:  
1806 - dependency: transitive  
1807 - description:  
1808 - name: sqflite_android  
1809 - sha256: "78f489aab276260cdd26676d2169446c7ecd3484bbd5fead4ca14f3ed4dd9ee3"  
1810 - url: "https://pub.flutter-io.cn"  
1811 - source: hosted  
1812 - version: "2.4.0" 1804 + version: "2.3.3+1"
1813 sqflite_common: 1805 sqflite_common:
1814 dependency: transitive 1806 dependency: transitive
1815 description: 1807 description:
@@ -1818,22 +1810,6 @@ packages: @@ -1818,22 +1810,6 @@ packages:
1818 url: "https://pub.flutter-io.cn" 1810 url: "https://pub.flutter-io.cn"
1819 source: hosted 1811 source: hosted
1820 version: "2.5.4+6" 1812 version: "2.5.4+6"
1821 - sqflite_darwin:  
1822 - dependency: transitive  
1823 - description:  
1824 - name: sqflite_darwin  
1825 - sha256: "22adfd9a2c7d634041e96d6241e6e1c8138ca6817018afc5d443fef91dcefa9c"  
1826 - url: "https://pub.flutter-io.cn"  
1827 - source: hosted  
1828 - version: "2.4.1+1"  
1829 - sqflite_platform_interface:  
1830 - dependency: transitive  
1831 - description:  
1832 - name: sqflite_platform_interface  
1833 - sha256: "8dd4515c7bdcae0a785b0062859336de775e8c65db81ae33dd5445f35be61920"  
1834 - url: "https://pub.flutter-io.cn"  
1835 - source: hosted  
1836 - version: "2.4.0"  
1837 stack_trace: 1813 stack_trace:
1838 dependency: transitive 1814 dependency: transitive
1839 description: 1815 description:
@@ -49,10 +49,10 @@ dependencies: @@ -49,10 +49,10 @@ dependencies:
49 fluro: ^2.0.5 49 fluro: ^2.0.5
50 # Toast提示 50 # Toast提示
51 # fluttertoast: ^3.1.3 51 # fluttertoast: ^3.1.3
52 - fluttertoast: ^8.2.5 52 + fluttertoast: 8.2.8
53 # 权限管理 53 # 权限管理
54 # permission_handler: ^10.0.0 54 # permission_handler: ^10.0.0
55 - permission_handler: ^11.0.1 55 + permission_handler: 11.3.1
56 # permission_handler: ^11.2.0 56 # permission_handler: ^11.2.0
57 # permission_handler: ^5.0.1 57 # permission_handler: ^5.0.1
58 # permission_handler: ^5.0.1+1 ^6.1.1 4.4.0 58 # permission_handler: ^5.0.1+1 ^6.1.1 4.4.0
@@ -73,7 +73,7 @@ dependencies: @@ -73,7 +73,7 @@ dependencies:
73 # websocket 73 # websocket
74 web_socket_channel: ^2.4.0 74 web_socket_channel: ^2.4.0
75 # sqlite数据库 75 # sqlite数据库
76 - sqflite: ^2.2.8+4 76 + sqflite: 2.3.3+1
77 # Bugly 77 # Bugly
78 flutter_bugly: ^1.0.7+1 78 flutter_bugly: ^1.0.7+1
79 # 设置状态栏颜色 79 # 设置状态栏颜色
@@ -100,7 +100,7 @@ dependencies: @@ -100,7 +100,7 @@ dependencies:
100 url_launcher: 6.1.11 100 url_launcher: 6.1.11
101 # 滚轮选择器 101 # 滚轮选择器
102 # flutter_picker: ^2.1.0 102 # flutter_picker: ^2.1.0
103 - flutter_picker_plus: ^1.3.0 103 + flutter_picker_plus: 1.3.0
104 # 网络状态 104 # 网络状态
105 # connectivity: ^0.4.8 105 # connectivity: ^0.4.8
106 # connectivity: ^3.0.6 106 # connectivity: ^3.0.6
@@ -159,7 +159,7 @@ dependencies: @@ -159,7 +159,7 @@ dependencies:
159 #苹果登陆 159 #苹果登陆
160 # sign_in_with_apple: ^3.0.0 160 # sign_in_with_apple: ^3.0.0
161 # sign_in_with_apple: 4.2.0 161 # sign_in_with_apple: 4.2.0
162 - 162 + #版本和鸿蒙未保持一致，鸿蒙适配版本比较老旧
163 sign_in_with_apple: ^6.1.4 163 sign_in_with_apple: ^6.1.4
164 video_thumbnail: ^0.5.3 164 video_thumbnail: ^0.5.3
165 # video_player: ^2.4.7 165 # video_player: ^2.4.7
@@ -209,15 +209,16 @@ dependencies: @@ -209,15 +209,16 @@ dependencies:
209 # webview 209 # webview
210 210
211 # webview_flutter: ^4.2.2 211 # webview_flutter: ^4.2.2
212 - # flutter_inappwebview: ^6.1.5 212 + # flutter_inappwebview: 6.0.0
213 flutter_inappwebview: ^6.2.0-beta.2 213 flutter_inappwebview: ^6.2.0-beta.2
214 214
  215 +
215 # flutter_inappwebview: ^6.0.0 216 # flutter_inappwebview: ^6.0.0
216 flutter_downloader: 1.10.5 217 flutter_downloader: 1.10.5
217 # android_path_provider: 0.3.0 218 # android_path_provider: 0.3.0
218 # open_file: ^3.2.1 219 # open_file: ^3.2.1
219 # open_file: ^3.3.2 220 # open_file: ^3.3.2
220 - open_filex: ^4.6.0 221 + open_filex: 4.5.0
221 # open_file_plus: ^3.3.0 222 # open_file_plus: ^3.3.0
222 # flutter_filereader: ^3.0.0 223 # flutter_filereader: ^3.0.0
223 flutter_draggable_gridview: 0.0.8 224 flutter_draggable_gridview: 0.0.8
@@ -364,7 +365,7 @@ dependency_overrides: @@ -364,7 +365,7 @@ dependency_overrides:
364 # flutter_downloader: 365 # flutter_downloader:
365 # git: 366 # git:
366 # url: https://gitcode.com/openharmony-sig/fluttertpc_flutter_downloader.git 367 # url: https://gitcode.com/openharmony-sig/fluttertpc_flutter_downloader.git
367 - # ref: br_v1.11.8_ohos 368 +
368 369
369 # flutter_native_image: 370 # flutter_native_image:
370 # git: 371 # git:
@@ -396,7 +397,13 @@ dependency_overrides: @@ -396,7 +397,13 @@ dependency_overrides:
396 # url: "https://gitee.com/openharmony-sig/flutter_plus_plugins.git" 397 # url: "https://gitee.com/openharmony-sig/flutter_plus_plugins.git"
397 # path: "packages/device_info_plus/device_info_plus" 398 # path: "packages/device_info_plus/device_info_plus"
398 399
399 - # package_info_plus: 400 + # package_info: 二选一 2.0.2版本 鸿蒙版和工程版本一致，但是比较老旧
  401 + # git:
  402 + # url: "https://gitcode.com/openharmony-sig/flutter_plus_plugins.git"
  403 + # path: "packages/package_info_plus/package_info_plus"
  404 +
  405 +
  406 + # package_info_plus: 二选一
400 # git: 407 # git:
401 # url: "https://gitee.com/openharmony-sig/flutter_plus_plugins.git" 408 # url: "https://gitee.com/openharmony-sig/flutter_plus_plugins.git"
402 # path: "packages/package_info_plus/package_info_plus" 409 # path: "packages/package_info_plus/package_info_plus"
@@ -410,15 +417,15 @@ dependency_overrides: @@ -410,15 +417,15 @@ dependency_overrides:
410 # git: 417 # git:
411 # url: "https://gitee.com/openharmony-sig/flutter_plus_plugins.git" 418 # url: "https://gitee.com/openharmony-sig/flutter_plus_plugins.git"
412 # path: "packages/connectivity_plus/connectivity_plus" 419 # path: "packages/connectivity_plus/connectivity_plus"
413 - # ref: br_connectivity_plus-v6.1.0_ohos  
414 420
415 - # fluwx: 5.7.3 421 +
  422 + # fluwx: 5.7.1
416 423
417 # audioplayers: 424 # audioplayers:
418 # git: 425 # git:
419 # url: "https://gitcode.com/openharmony-sig/flutter_audioplayers.git" 426 # url: "https://gitcode.com/openharmony-sig/flutter_audioplayers.git"
420 # path: "packages/audioplayers" 427 # path: "packages/audioplayers"
421 - # ref: br_v6.5.0_ohos 428 + # ref: br_audioplayers-v6.1.0_ohos
422 429
423 430
424 431
@@ -442,7 +449,7 @@ dependency_overrides: @@ -442,7 +449,7 @@ dependency_overrides:
442 # git: 449 # git:
443 # url: "https://gitcode.com/openharmony-tpc/flutter_packages.git" 450 # url: "https://gitcode.com/openharmony-tpc/flutter_packages.git"
444 # path: "packages/shared_preferences/shared_preferences" 451 # path: "packages/shared_preferences/shared_preferences"
445 - # ref: br_shared_preferences-v2.3.2_ohos 452 +
446 453
447 # flutter_inappwebview: 454 # flutter_inappwebview:
448 # git: 455 # git:
@@ -454,13 +461,16 @@ dependency_overrides: @@ -454,13 +461,16 @@ dependency_overrides:
454 # git: 461 # git:
455 # url: "https://gitcode.com/openharmony-tpc/flutter_packages.git" 462 # url: "https://gitcode.com/openharmony-tpc/flutter_packages.git"
456 # path: "packages/url_launcher/url_launcher" 463 # path: "packages/url_launcher/url_launcher"
457 - # ref: br_url_launcher-v6.3.0_ohos 464 +
458 465
459 # path_provider: 466 # path_provider:
460 # git: 467 # git:
461 # url: "https://gitcode.com/openharmony-tpc/flutter_packages.git" 468 # url: "https://gitcode.com/openharmony-tpc/flutter_packages.git"
462 # path: "packages/path_provider/path_provider" 469 # path: "packages/path_provider/path_provider"
463 - # ref: br_path_provider-v2.1.5_ohos 470 +
  471 +
  472 +
  473 +
464 474
465 # sqflite: 475 # sqflite:
466 # git: 476 # git:
@@ -473,7 +483,7 @@ dependency_overrides: @@ -473,7 +483,7 @@ dependency_overrides:
473 # git: 483 # git:
474 # url: "https://gitcode.com/openharmony-tpc/flutter_packages.git" 484 # url: "https://gitcode.com/openharmony-tpc/flutter_packages.git"
475 # path: "packages/video_player/video_player" 485 # path: "packages/video_player/video_player"
476 - # ref: br_video_player-v2.9.2_ohos 486 +
477 487
478 dev_dependencies: 488 dev_dependencies:
479 flutter_test: 489 flutter_test: