From 57a494d416825ba62d23ddf3e517cbf128ce0a27 Mon Sep 17 00:00:00 2001 From: Sergey Dmitriev <51058739+0niel@users.noreply.github.com> Date: Wed, 13 Sep 2023 17:07:51 +0300 Subject: [PATCH] chore: Upgrade deps and Kotlin version --- .gitignore | 27 +++++++++++--- .metadata | 30 ++++++++++++++-- .vscode/settings.json | 3 ++ android/build.gradle | 6 ++-- .../gradle/wrapper/gradle-wrapper.properties | 6 ++-- .../pages/profile/profile_nfc_pass_page.dart | 2 +- .../schedule/widgets/stories_wrapper.dart | 2 +- .../.plugin_symlinks/connectivity_plus | 2 +- .../.plugin_symlinks/device_info_plus | 2 +- .../flutter_secure_storage_linux | 2 +- .../.plugin_symlinks/flutter_web_auth_2 | 2 +- .../.plugin_symlinks/package_info_plus | 2 +- .../.plugin_symlinks/path_provider_linux | 2 +- .../ephemeral/.plugin_symlinks/sentry_flutter | 2 +- .../.plugin_symlinks/shared_preferences_linux | 2 +- .../.plugin_symlinks/url_launcher_linux | 2 +- pubspec.yaml | 35 +++++++++---------- 17 files changed, 86 insertions(+), 43 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.gitignore b/.gitignore index cbfc4963..7502fbb7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -# Custom -.fvm/ +# Do not remove or rename entries in this file, only add new ones +# See https://github.com/flutter/flutter/issues/128635 for more context. # Miscellaneous *.class @@ -23,7 +23,7 @@ .classpath .project .settings/ -.vscode/ +.vscode/* # Flutter repo-specific /bin/cache/ @@ -35,6 +35,7 @@ /dev/bots/android_tools/ /dev/devicelab/ABresults*.json /dev/docs/doc/ +/dev/docs/api_docs.zip /dev/docs/flutter.docs.zip /dev/docs/lib/ /dev/docs/pubspec.yaml @@ -54,6 +55,7 @@ analysis_benchmark.json .flutter-plugins-dependencies **/generated_plugin_registrant.dart .packages +.pub-preload-cache/ .pub-cache/ .pub/ build/ @@ -64,7 +66,7 @@ unlinked_spec.ds # Android related **/android/**/gradle-wrapper.jar -**/android/.gradle +.gradle/ **/android/captures/ **/android/gradlew **/android/gradlew.bat @@ -104,7 +106,21 @@ unlinked_spec.ds **/ios/Runner/GeneratedPluginRegistrant.* # macOS +**/Flutter/ephemeral/ +**/Pods/ **/macos/Flutter/GeneratedPluginRegistrant.swift +**/macos/Flutter/ephemeral +**/xcuserdata/ + +# Windows +**/windows/flutter/generated_plugin_registrant.cc +**/windows/flutter/generated_plugin_registrant.h +**/windows/flutter/generated_plugins.cmake + +# Linux +**/linux/flutter/generated_plugin_registrant.cc +**/linux/flutter/generated_plugin_registrant.h +**/linux/flutter/generated_plugins.cmake # Coverage coverage/ @@ -118,4 +134,5 @@ app.*.symbols !**/ios/**/default.pbxuser !**/ios/**/default.perspectivev3 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages -!/dev/ci/**/Gemfile.lock \ No newline at end of file +!/dev/ci/**/Gemfile.lock +!.vscode/settings.json \ No newline at end of file diff --git a/.metadata b/.metadata index be749857..9abf315c 100644 --- a/.metadata +++ b/.metadata @@ -1,10 +1,36 @@ # This file tracks properties of this Flutter project. # Used by Flutter tool to assess capabilities and perform upgrades etc. # -# This file should be version controlled and should not be manually edited. +# This file should be version controlled. version: - revision: adc687823a831bbebe28bdccfac1a628ca621513 + revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 channel: stable project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + - platform: linux + create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + - platform: macos + create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + - platform: windows + create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8 + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..c5f3f6b9 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.configuration.updateBuildConfiguration": "interactive" +} \ No newline at end of file diff --git a/android/build.gradle b/android/build.gradle index 86c61dc8..de9cdb14 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.7.10' + ext.kotlin_version = '1.9.10' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.2.0' + classpath 'com.android.tools.build:gradle:7.3.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" classpath 'com.google.gms:google-services:4.3.15' @@ -28,6 +28,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index f903c591..893d988d 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jun 23 08:50:38 CEST 2017 +#Sat Feb 18 16:22:23 MSK 2023 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip \ No newline at end of file +zipStoreBase=GRADLE_USER_HOME diff --git a/lib/presentation/pages/profile/profile_nfc_pass_page.dart b/lib/presentation/pages/profile/profile_nfc_pass_page.dart index 653b68d1..025af550 100644 --- a/lib/presentation/pages/profile/profile_nfc_pass_page.dart +++ b/lib/presentation/pages/profile/profile_nfc_pass_page.dart @@ -690,7 +690,7 @@ class _NfcNotAviable extends StatelessWidget { TextOutlinedButton( content: "Включить NFC", onPressed: () { - AppSettings.openNFCSettings(); + AppSettings.openAppSettings(type: AppSettingsType.nfc); }, ), ], diff --git a/lib/presentation/pages/schedule/widgets/stories_wrapper.dart b/lib/presentation/pages/schedule/widgets/stories_wrapper.dart index 7c37479d..fdd5c8ee 100644 --- a/lib/presentation/pages/schedule/widgets/stories_wrapper.dart +++ b/lib/presentation/pages/schedule/widgets/stories_wrapper.dart @@ -3,9 +3,9 @@ import 'package:dismissible_page/dismissible_page.dart'; import 'package:firebase_analytics/firebase_analytics.dart'; import 'package:flutter/material.dart'; import 'package:rtu_mirea_app/common/utils/utils.dart'; -import 'package:story/story_page_view/story_page_view.dart'; import 'package:rtu_mirea_app/domain/entities/story.dart'; import 'package:rtu_mirea_app/presentation/widgets/buttons/primary_button.dart'; +import 'package:story/story.dart'; import 'package:url_launcher/url_launcher_string.dart'; import 'package:rtu_mirea_app/presentation/typography.dart'; diff --git a/linux/flutter/ephemeral/.plugin_symlinks/connectivity_plus b/linux/flutter/ephemeral/.plugin_symlinks/connectivity_plus index af28af46..2de1745a 120000 --- a/linux/flutter/ephemeral/.plugin_symlinks/connectivity_plus +++ b/linux/flutter/ephemeral/.plugin_symlinks/connectivity_plus @@ -1 +1 @@ -C:/Users/foran/AppData/Local/Pub/Cache/hosted/pub.dev/connectivity_plus-4.0.0/ \ No newline at end of file +C:/Users/foran/AppData/Local/Pub/Cache/hosted/pub.dev/connectivity_plus-4.0.2/ \ No newline at end of file diff --git a/linux/flutter/ephemeral/.plugin_symlinks/device_info_plus b/linux/flutter/ephemeral/.plugin_symlinks/device_info_plus index 5ab93d7b..29bebb80 120000 --- a/linux/flutter/ephemeral/.plugin_symlinks/device_info_plus +++ b/linux/flutter/ephemeral/.plugin_symlinks/device_info_plus @@ -1 +1 @@ -C:/Users/foran/AppData/Local/Pub/Cache/hosted/pub.dev/device_info_plus-9.0.0/ \ No newline at end of file +C:/Users/foran/AppData/Local/Pub/Cache/hosted/pub.dev/device_info_plus-9.0.3/ \ No newline at end of file diff --git a/linux/flutter/ephemeral/.plugin_symlinks/flutter_secure_storage_linux b/linux/flutter/ephemeral/.plugin_symlinks/flutter_secure_storage_linux index b4c4aae2..c9e97b07 120000 --- a/linux/flutter/ephemeral/.plugin_symlinks/flutter_secure_storage_linux +++ b/linux/flutter/ephemeral/.plugin_symlinks/flutter_secure_storage_linux @@ -1 +1 @@ -C:/Users/foran/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_secure_storage_linux-1.1.3/ \ No newline at end of file +C:/Users/foran/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_secure_storage_linux-1.2.0/ \ No newline at end of file diff --git a/linux/flutter/ephemeral/.plugin_symlinks/flutter_web_auth_2 b/linux/flutter/ephemeral/.plugin_symlinks/flutter_web_auth_2 index 66c1a0c3..ed6719dc 120000 --- a/linux/flutter/ephemeral/.plugin_symlinks/flutter_web_auth_2 +++ b/linux/flutter/ephemeral/.plugin_symlinks/flutter_web_auth_2 @@ -1 +1 @@ -C:/Users/foran/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_web_auth_2-2.1.4/ \ No newline at end of file +C:/Users/foran/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_web_auth_2-2.2.1/ \ No newline at end of file diff --git a/linux/flutter/ephemeral/.plugin_symlinks/package_info_plus b/linux/flutter/ephemeral/.plugin_symlinks/package_info_plus index 4fe4e02d..73c632c7 120000 --- a/linux/flutter/ephemeral/.plugin_symlinks/package_info_plus +++ b/linux/flutter/ephemeral/.plugin_symlinks/package_info_plus @@ -1 +1 @@ -C:/Users/foran/AppData/Local/Pub/Cache/hosted/pub.dev/package_info_plus-3.1.2/ \ No newline at end of file +C:/Users/foran/AppData/Local/Pub/Cache/hosted/pub.dev/package_info_plus-4.1.0/ \ No newline at end of file diff --git a/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux b/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux index 8b234d5f..fdd4fd67 120000 --- a/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux +++ b/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux @@ -1 +1 @@ -C:/Users/foran/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_linux-2.1.10/ \ No newline at end of file +C:/Users/foran/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_linux-2.2.1/ \ No newline at end of file diff --git a/linux/flutter/ephemeral/.plugin_symlinks/sentry_flutter b/linux/flutter/ephemeral/.plugin_symlinks/sentry_flutter index 6affc845..cf1c37e2 120000 --- a/linux/flutter/ephemeral/.plugin_symlinks/sentry_flutter +++ b/linux/flutter/ephemeral/.plugin_symlinks/sentry_flutter @@ -1 +1 @@ -C:/Users/foran/AppData/Local/Pub/Cache/hosted/pub.dev/sentry_flutter-7.6.1/ \ No newline at end of file +C:/Users/foran/AppData/Local/Pub/Cache/hosted/pub.dev/sentry_flutter-7.9.0/ \ No newline at end of file diff --git a/linux/flutter/ephemeral/.plugin_symlinks/shared_preferences_linux b/linux/flutter/ephemeral/.plugin_symlinks/shared_preferences_linux index 48f04bfe..799d2673 120000 --- a/linux/flutter/ephemeral/.plugin_symlinks/shared_preferences_linux +++ b/linux/flutter/ephemeral/.plugin_symlinks/shared_preferences_linux @@ -1 +1 @@ -C:/Users/foran/AppData/Local/Pub/Cache/hosted/pub.dev/shared_preferences_linux-2.2.0/ \ No newline at end of file +C:/Users/foran/AppData/Local/Pub/Cache/hosted/pub.dev/shared_preferences_linux-2.3.1/ \ No newline at end of file diff --git a/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux b/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux index ca759c22..46c954e5 120000 --- a/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux +++ b/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux @@ -1 +1 @@ -C:/Users/foran/AppData/Local/Pub/Cache/hosted/pub.dev/url_launcher_linux-3.0.5/ \ No newline at end of file +C:/Users/foran/AppData/Local/Pub/Cache/hosted/pub.dev/url_launcher_linux-3.0.6/ \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml index 9b3cb160..c52e9859 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: 'none' version: 1.3.4+28 environment: - sdk: ">=2.19.0 <3.0.0" + sdk: ">=3.1.1" dependencies: flutter: @@ -87,15 +87,15 @@ dependencies: # dates or a range of dates. It has four built-in views that allow quick # navigation to the desired date. # See https://pub.dev/packages/syncfusion_flutter_datepicker - syncfusion_flutter_datepicker: ^21.2.4 + syncfusion_flutter_datepicker: ^22.2.12 # A Flutter widget rendering static HTML and CSS as Flutter widgets. # See https://pub.dev/packages/flutter_html - flutter_html: ^3.0.0-beta.1 + flutter_html: ^3.0.0-beta.2 # Iframe widget for flutter_html # See https://pub.dev/packages/flutter_html_iframe - flutter_html_iframe: ^3.0.0-beta.1 + flutter_html_iframe: ^3.0.0-beta.2 # The Font Awesome Icon pack available as Flutter Icons. # Provides 1600 additional icons to use in your apps. @@ -113,10 +113,7 @@ dependencies: # Instagram stories like UI with rich animations and customizability. # See https://pub.dev/packages/story - story: - git: - url: https://github.com/0niel/story.git - ref: main + story: ^1.1.0 # Official extension image, support placeholder(loading)/ failed state, # cache network, zoom/pan, photo view, slide out page, @@ -125,17 +122,17 @@ dependencies: # A package provides an easy way to add shimmer effect in Flutter project # See https://pub.dev/packages/shimmer - shimmer: ^2.0.0 + shimmer: ^3.0.0 # Load and cache network images with with placeholder and error widgets. # See https://pub.dev/packages/cached_network_image cached_network_image: ^3.2.0 - syncfusion_flutter_datagrid: ^21.2.4 - syncfusion_flutter_core: ^21.2.4 - syncfusion_flutter_sliders: ^21.2.4 - syncfusion_flutter_charts: ^21.2.4 - syncfusion_flutter_gauges: ^21.2.4 + syncfusion_flutter_datagrid: ^22.2.12 + syncfusion_flutter_core: ^22.2.12 + syncfusion_flutter_sliders: ^22.2.12 + syncfusion_flutter_charts: ^22.2.12 + syncfusion_flutter_gauges: ^22.2.12 auto_route: ^5.0.4 @@ -165,7 +162,7 @@ dependencies: get_storage: # https://pub.dev/packages/home_widget - home_widget: ^0.2.0+1 + home_widget: ^0.3.0 freezed_annotation: ^2.1.0 @@ -191,11 +188,11 @@ dependencies: # A Flutter plugin for opening iOS and Android phone settings from an app. # See https://pub.dev/packages/app_settings - app_settings: ^4.2.0 + app_settings: ^5.0.0 - sentry_flutter: ^7.6.3 - sentry_dio: ^7.6.3 - sentry_logging: ^7.6.3 + sentry_flutter: ^7.9.0 + sentry_dio: ^7.9.0 + sentry_logging: ^7.9.0 logging: ^1.1.1 # 1000+ beautiful icons to use in you dream project, with all the customization Flutter