Skip to content

Commit

Permalink
chore: Upgrade deps and Kotlin version
Browse files Browse the repository at this point in the history
  • Loading branch information
0niel committed Sep 13, 2023
1 parent 12cc7b8 commit 57a494d
Show file tree
Hide file tree
Showing 17 changed files with 86 additions and 43 deletions.
27 changes: 22 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -23,7 +23,7 @@
.classpath
.project
.settings/
.vscode/
.vscode/*

# Flutter repo-specific
/bin/cache/
Expand All @@ -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
Expand All @@ -54,6 +55,7 @@ analysis_benchmark.json
.flutter-plugins-dependencies
**/generated_plugin_registrant.dart
.packages
.pub-preload-cache/
.pub-cache/
.pub/
build/
Expand All @@ -64,7 +66,7 @@ unlinked_spec.ds

# Android related
**/android/**/gradle-wrapper.jar
**/android/.gradle
.gradle/
**/android/captures/
**/android/gradlew
**/android/gradlew.bat
Expand Down Expand Up @@ -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/
Expand All @@ -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
!/dev/ci/**/Gemfile.lock
!.vscode/settings.json
30 changes: 28 additions & 2 deletions .metadata
Original file line number Diff line number Diff line change
@@ -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'
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"java.configuration.updateBuildConfiguration": "interactive"
}
6 changes: 3 additions & 3 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -28,6 +28,6 @@ subprojects {
project.evaluationDependsOn(':app')
}

task clean(type: Delete) {
tasks.register("clean", Delete) {
delete rootProject.buildDir
}
6 changes: 3 additions & 3 deletions android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
zipStoreBase=GRADLE_USER_HOME
2 changes: 1 addition & 1 deletion lib/presentation/pages/profile/profile_nfc_pass_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ class _NfcNotAviable extends StatelessWidget {
TextOutlinedButton(
content: "Включить NFC",
onPressed: () {
AppSettings.openNFCSettings();
AppSettings.openAppSettings(type: AppSettingsType.nfc);
},
),
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion linux/flutter/ephemeral/.plugin_symlinks/connectivity_plus
2 changes: 1 addition & 1 deletion linux/flutter/ephemeral/.plugin_symlinks/device_info_plus
2 changes: 1 addition & 1 deletion linux/flutter/ephemeral/.plugin_symlinks/package_info_plus
2 changes: 1 addition & 1 deletion linux/flutter/ephemeral/.plugin_symlinks/sentry_flutter
35 changes: 16 additions & 19 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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.
Expand All @@ -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,
Expand All @@ -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

Expand Down Expand Up @@ -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

Expand All @@ -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
Expand Down

0 comments on commit 57a494d

Please sign in to comment.