Upgrade flutter: 3.10.6

2023-08-18 20:03:33 +05:30 · 2023-08-18 20:03:33 +05:30 · cdd8d7906b
parent 384f37bb07
commit cdd8d7906b
7 changed files with 64 additions and 94 deletions
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -81,14 +81,16 @@ PODS:
    - Flutter
    - MTBBarcodeScanner
  - Reachability (3.2)
-  - SDWebImage (5.15.0):
-    - SDWebImage/Core (= 5.15.0)
-  - SDWebImage/Core (5.15.0)
-  - Sentry/HybridSDK (7.31.5)
+  - SDWebImage (5.17.0):
+    - SDWebImage/Core (= 5.17.0)
+  - SDWebImage/Core (5.17.0)
+  - Sentry/HybridSDK (8.9.1):
+    - SentryPrivate (= 8.9.1)
  - sentry_flutter (0.0.1):
    - Flutter
    - FlutterMacOS
-    - Sentry/HybridSDK (= 7.31.5)
+    - Sentry/HybridSDK (= 8.9.1)
+  - SentryPrivate (8.9.1)
  - share_plus (0.0.1):
    - Flutter
  - shared_preferences_foundation (0.0.1):
@ -121,11 +123,11 @@ DEPENDENCIES:
  - move_to_background (from `.symlinks/plugins/move_to_background/ios`)
  - open_filex (from `.symlinks/plugins/open_filex/ios`)
  - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
-  - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/ios`)
+  - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
  - qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`)
  - sentry_flutter (from `.symlinks/plugins/sentry_flutter/ios`)
  - share_plus (from `.symlinks/plugins/share_plus/ios`)
-  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/ios`)
+  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
  - sqflite (from `.symlinks/plugins/sqflite/ios`)
  - uni_links (from `.symlinks/plugins/uni_links/ios`)
  - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
@ -140,6 +142,7 @@ SPEC REPOS:
    - Reachability
    - SDWebImage
    - Sentry
+    - SentryPrivate
    - SwiftyGif
    - Toast

@ -177,7 +180,7 @@ EXTERNAL SOURCES:
  package_info_plus:
    :path: ".symlinks/plugins/package_info_plus/ios"
  path_provider_foundation:
-    :path: ".symlinks/plugins/path_provider_foundation/ios"
+    :path: ".symlinks/plugins/path_provider_foundation/darwin"
  qr_code_scanner:
    :path: ".symlinks/plugins/qr_code_scanner/ios"
  sentry_flutter:
@ -185,7 +188,7 @@ EXTERNAL SOURCES:
  share_plus:
    :path: ".symlinks/plugins/share_plus/ios"
  shared_preferences_foundation:
-    :path: ".symlinks/plugins/shared_preferences_foundation/ios"
+    :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
  sqflite:
    :path: ".symlinks/plugins/sqflite/ios"
  uni_links:
@ -214,13 +217,14 @@ SPEC CHECKSUMS:
  MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
  open_filex: 6e26e659846ec990262224a12ef1c528bb4edbe4
  OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
-  package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
+  package_info_plus: fd030dabf36271f146f1f3beacd48f564b0f17f7
  path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
  qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e
  Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
-  SDWebImage: 9bec4c5cdd9579e1f57104735ee0c37df274d593
-  Sentry: 4c9babff9034785067c896fd580b1f7de44da020
-  sentry_flutter: 1346a880b24c0240807b53b10cf50ddad40f504e
+  SDWebImage: 750adf017a315a280c60fde706ab1e552a3ae4e9
+  Sentry: e3203780941722a1fcfee99e351de14244c7f806
+  sentry_flutter: 8f0ffd53088e6a4d50c095852c5cad9e4405025c
+  SentryPrivate: 5e3683390f66611fc7c6215e27645873adb55d13
  share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
  shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
  sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
--- a/lib/core/logging/super_logging.dart
+++ b/lib/core/logging/super_logging.dart
@ -204,7 +204,7 @@ class SuperLogging {

  static void setUserID(String userID) async {
    if (config.sentryDsn != null) {
-      Sentry.configureScope((scope) => scope.user = SentryUser(id: userID));
+      Sentry.configureScope((scope) => scope.setUser(SentryUser(id: userID)));
      $.info("setting sentry user ID to: $userID");
    }
  }
--- a/lib/core/logging/tunneled_transport.dart
+++ b/lib/core/logging/tunneled_transport.dart
@ -22,11 +22,11 @@ class TunneledTransport implements Transport {
      : _dsn = _options.dsn != null ? Dsn.parse(_options.dsn!) : null,
        _headers = _buildHeaders(
          _options.platformChecker.isWeb,
-          _options.sdk.identifier,
+          _options.sentryClientName,
        ) {
    _credentialBuilder = _CredentialBuilder(
      _dsn,
-      _options.sdk.identifier,
+      _options.sentryClientName,
      _options.clock,
    );
  }
--- a/lib/ente_theme_data.dart
+++ b/lib/ente_theme_data.dart
@ -15,7 +15,6 @@ final lightThemeData = ThemeData(
    primary: Colors.black,
    secondary: Color.fromARGB(255, 163, 163, 163),
  ),
-  accentColor: const Color.fromRGBO(0, 0, 0, 0.6),
  outlinedButtonTheme: buildOutlinedButtonThemeData(
    bgDisabled: const Color.fromRGBO(158, 158, 158, 1),
    bgEnabled: const Color.fromRGBO(0, 0, 0, 1),
@ -91,7 +90,6 @@ final darkThemeData = ThemeData(
      const IconThemeData(color: Colors.red, opacity: 1.0, size: 50.0),
  hintColor: const Color.fromRGBO(158, 158, 158, 1),
  colorScheme: const ColorScheme.dark(primary: Colors.white),
-  accentColor: const Color.fromRGBO(45, 194, 98, 0.2),
  buttonTheme: const ButtonThemeData().copyWith(
    buttonColor: const Color.fromRGBO(45, 194, 98, 1.0),
  ),
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@ -9,7 +9,7 @@ import connectivity_macos
 import device_info_plus
 import flutter_local_notifications
 import flutter_secure_storage_macos
-import package_info_plus_macos
+import package_info_plus
 import path_provider_foundation
 import sentry_flutter
 import share_plus_macos
--- a/pubspec.lock
+++ b/pubspec.lock
@ -45,10 +45,10 @@ packages:
    dependency: transitive
    description:
      name: async
-      sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
      url: "https://pub.dev"
    source: hosted
-    version: "2.10.0"
+    version: "2.11.0"
  base32:
    dependency: "direct main"
    description:
@ -157,10 +157,10 @@ packages:
    dependency: transitive
    description:
      name: characters
-      sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
      url: "https://pub.dev"
    source: hosted
-    version: "1.2.1"
+    version: "1.3.0"
  checked_yaml:
    dependency: transitive
    description:
@ -197,10 +197,10 @@ packages:
    dependency: "direct main"
    description:
      name: collection
-      sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
+      sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
      url: "https://pub.dev"
    source: hosted
-    version: "1.17.0"
+    version: "1.17.1"
  computer:
    dependency: "direct main"
    description:
@ -382,10 +382,10 @@ packages:
    dependency: "direct main"
    description:
      name: expansion_tile_card
-      sha256: "0812d52e4a2effa4957286b9037c81394e1881ac49bcd8f006f631f2ea5ef6eb"
+      sha256: "27ce4cb518f00e21d0f2309aaa6462b26b148e93cee2029a73088cecf42b1eb0"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.0"
+    version: "3.0.0"
  fake_async:
    dependency: transitive
    description:
@ -414,10 +414,10 @@ packages:
    dependency: "direct main"
    description:
      name: file_picker
-      sha256: b85eb92b175767fdaa0c543bf3b0d1f610fe966412ea72845fe5ba7801e763ff
+      sha256: "9d6e95ec73abbd31ec54d0e0df8a961017e165aba1395e462e5b31ea0c165daf"
      url: "https://pub.dev"
    source: hosted
-    version: "5.2.10"
+    version: "5.3.1"
  fixnum:
    dependency: transitive
    description:
@ -699,10 +699,10 @@ packages:
    dependency: "direct main"
    description:
      name: intl
-      sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91"
+      sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6
      url: "https://pub.dev"
    source: hosted
-    version: "0.17.0"
+    version: "0.18.0"
  io:
    dependency: transitive
    description:
@ -715,10 +715,10 @@ packages:
    dependency: transitive
    description:
      name: js
-      sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
+      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
      url: "https://pub.dev"
    source: hosted
-    version: "0.6.5"
+    version: "0.6.7"
  json_annotation:
    dependency: "direct main"
    description:
@ -795,10 +795,10 @@ packages:
    dependency: transitive
    description:
      name: matcher
-      sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
+      sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
      url: "https://pub.dev"
    source: hosted
-    version: "0.12.13"
+    version: "0.12.15"
  material_color_utilities:
    dependency: transitive
    description:
@ -811,10 +811,10 @@ packages:
    dependency: transitive
    description:
      name: meta
-      sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
+      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
      url: "https://pub.dev"
    source: hosted
-    version: "1.8.0"
+    version: "1.9.1"
  mime:
    dependency: transitive
    description:
@ -891,50 +891,18 @@ packages:
    dependency: "direct main"
    description:
      name: package_info_plus
-      sha256: f62d7253edc197fe3c88d7c2ddab82d68f555e778d55390ccc3537eca8e8d637
+      sha256: "6ff267fcd9d48cb61c8df74a82680e8b82e940231bb5f68356672fde0397334a"
      url: "https://pub.dev"
    source: hosted
-    version: "1.4.3+1"
-  package_info_plus_linux:
-    dependency: transitive
-    description:
-      name: package_info_plus_linux
-      sha256: "04b575f44233d30edbb80a94e57cad9107aada334fc02aabb42b6becd13c43fc"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.5"
-  package_info_plus_macos:
-    dependency: transitive
-    description:
-      name: package_info_plus_macos
-      sha256: a2ad8b4acf4cd479d4a0afa5a74ea3f5b1c7563b77e52cc32b3ee6956d5482a6
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.0"
+    version: "4.1.0"
  package_info_plus_platform_interface:
    dependency: transitive
    description:
      name: package_info_plus_platform_interface
-      sha256: f7a0c8f1e7e981bc65f8b64137a53fd3c195b18d429fba960babc59a5a1c7ae8
+      sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6"
      url: "https://pub.dev"
    source: hosted
-    version: "1.0.2"
-  package_info_plus_web:
-    dependency: transitive
-    description:
-      name: package_info_plus_web
-      sha256: f0829327eb534789e0a16ccac8936a80beed4e2401c4d3a74f3f39094a822d3b
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.6"
-  package_info_plus_windows:
-    dependency: transitive
-    description:
-      name: package_info_plus_windows
-      sha256: "79524f11c42dd9078b96d797b3cf79c0a2883a50c4920dc43da8562c115089bc"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.0"
+    version: "2.0.1"
  password_strength:
    dependency: "direct main"
    description:
@ -947,10 +915,10 @@ packages:
    dependency: transitive
    description:
      name: path
-      sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
+      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
      url: "https://pub.dev"
    source: hosted
-    version: "1.8.2"
+    version: "1.8.3"
  path_drawing:
    dependency: transitive
    description:
@ -1131,18 +1099,18 @@ packages:
    dependency: "direct main"
    description:
      name: sentry
-      sha256: a1529c545fcbc899e5dcc7c94ff1c6ad0c334dfc99a3cda366b1da98af7c5678
+      sha256: "39c23342fc96105da449914f7774139a17a0ca8a4e70d9ad5200171f7e47d6ba"
      url: "https://pub.dev"
    source: hosted
-    version: "6.22.0"
+    version: "7.9.0"
  sentry_flutter:
    dependency: "direct main"
    description:
      name: sentry_flutter
-      sha256: cab07e99a8f27af94f399cabceaff6968011660505b30a0e2286728a81bc476c
+      sha256: ff68ab31918690da004a42e20204242a3ad9ad57da7e2712da8487060ac9767f
      url: "https://pub.dev"
    source: hosted
-    version: "6.22.0"
+    version: "7.9.0"
  share_plus:
    dependency: "direct main"
    description:
@ -1408,26 +1376,26 @@ packages:
    dependency: transitive
    description:
      name: test
-      sha256: a5fcd2d25eeadbb6589e80198a47d6a464ba3e2049da473943b8af9797900c2d
+      sha256: "3dac9aecf2c3991d09b9cdde4f98ded7b30804a88a0d7e4e7e1678e78d6b97f4"
      url: "https://pub.dev"
    source: hosted
-    version: "1.22.0"
+    version: "1.24.1"
  test_api:
    dependency: transitive
    description:
      name: test_api
-      sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
+      sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
      url: "https://pub.dev"
    source: hosted
-    version: "0.4.16"
+    version: "0.5.1"
  test_core:
    dependency: transitive
    description:
      name: test_core
-      sha256: "0ef9755ec6d746951ba0aabe62f874b707690b5ede0fecc818b138fcc9b14888"
+      sha256: "5138dbffb77b2289ecb12b81c11ba46036590b72a64a7a90d6ffb880f1a29e93"
      url: "https://pub.dev"
    source: hosted
-    version: "0.4.20"
+    version: "0.5.1"
  timezone:
    dependency: transitive
    description:
@ -1632,10 +1600,10 @@ packages:
    dependency: transitive
    description:
      name: win32
-      sha256: a6f0236dbda0f63aa9a25ad1ff9a9d8a4eaaa5012da0dc59d21afdb1dc361ca4
+      sha256: "5a751eddf9db89b3e5f9d50c20ab8612296e4e8db69009788d6c8b060a84191c"
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.4"
+    version: "4.1.4"
  xdg_directories:
    dependency: transitive
    description:
@ -1669,5 +1637,5 @@ packages:
    source: hosted
    version: "3.1.2"
 sdks:
-  dart: ">=2.19.0 <3.0.0"
+  dart: ">=3.0.0 <4.0.0"
  flutter: ">=3.7.0"
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -4,7 +4,7 @@ version: 1.0.55+55
 publish_to: none

 environment:
-  sdk: ">=2.17.0 <3.0.0"
+  sdk: ">=3.0.0 <4.0.0"

 dependencies:
  adaptive_theme: ^3.1.0 # done
@ -25,7 +25,7 @@ dependencies:
  email_validator: ^2.0.1
  event_bus: ^2.0.0
  expandable: ^5.0.1
-  expansion_tile_card: ^2.0.0
+  expansion_tile_card: ^3.0.0
  file_picker: ^5.2.4
  fk_user_agent: ^2.1.0
  flutter:
@ -48,7 +48,7 @@ dependencies:
  fluttertoast: ^8.1.1
  google_nav_bar: ^5.0.5 #supported
  http: ^0.13.4
-  intl: ^0.17.0
+  intl: ^0.18.0
  json_annotation: ^4.5.0
  local_auth: ^2.1.3
  logging: ^1.0.1
@ -56,7 +56,7 @@ dependencies:
  move_to_background: ^1.0.2
  open_filex: ^4.3.2
  otp: ^3.1.1
-  package_info_plus: ^1.0.1
+  package_info_plus: ^4.1.0
  password_strength: ^0.2.0
  path_provider: ^2.0.11
  pinput: ^1.2.2
@ -64,8 +64,8 @@ dependencies:
  protobuf: ^3.0.0
  qr_code_scanner: ^1.0.1
  qr_flutter: 4.0.0
-  sentry: ^6.12.1
-  sentry_flutter: ^6.12.1
+  sentry: ^7.9.0
+  sentry_flutter: ^7.9.0
  share_plus: ^4.4.0
  shared_preferences: ^2.0.5
  sqflite: ^2.1.0