diff --git a/android/app/build.gradle b/android/app/build.gradle index 93069f7..718fead 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -51,7 +51,7 @@ android { defaultConfig { applicationId "cz.hernikplays.opencanteen" - minSdkVersion 18 + minSdkVersion 19 targetSdkVersion 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName diff --git a/android/build.gradle b/android/build.gradle index 83ae220..69456e1 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.6.10' + ext.kotlin_version = '1.9.10' repositories { google() mavenCentral() @@ -26,6 +26,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/lib/okna/nastaveni.dart b/lib/okna/nastaveni.dart index 6d19ad6..ada6201 100644 --- a/lib/okna/nastaveni.dart +++ b/lib/okna/nastaveni.dart @@ -8,7 +8,6 @@ import 'package:flutter_native_timezone/flutter_native_timezone.dart'; import 'package:opencanteen/pw/platformbutton.dart'; import 'package:opencanteen/pw/platformdialog.dart'; import 'package:opencanteen/pw/platformfield.dart'; -import 'package:opencanteen/pw/platformswitch.dart'; import 'package:path_provider/path_provider.dart'; import 'package:settings_ui/settings_ui.dart'; import 'package:shared_preferences/shared_preferences.dart'; diff --git a/pubspec.lock b/pubspec.lock index e161b38..20b1d66 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -372,50 +372,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" path: dependency: transitive description: @@ -705,10 +673,10 @@ packages: dependency: transitive description: name: win32 - sha256: a6f0236dbda0f63aa9a25ad1ff9a9d8a4eaaa5012da0dc59d21afdb1dc361ca4 + sha256: "9e82a402b7f3d518fb9c02d0e9ae45952df31b9bf34d77baf19da2de03fc2aaa" url: "https://pub.dev" source: hosted - version: "3.1.4" + version: "5.0.7" xdg_directories: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 943c79c..473500d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -12,27 +12,27 @@ environment: sdk: ">=2.18.2 <3.0.0" dependencies: + canteenlib: ^1.1.2 flutter: sdk: flutter - flutter_localizations: - sdk: flutter - canteenlib: ^1.1.2 - flutter_secure_storage: ^7.0.1 - url_launcher: ^6.0.20 - path_provider: ^2.0.9 - shared_preferences: ^2.0.13 - introduction_screen: ^3.0.1 flutter_local_notifications: ^12.0.3+1 - timezone: ^0.9.0 + flutter_localizations: + sdk: flutter flutter_native_timezone: ^2.0.0 - intl: ^0.18.0 - package_info_plus: ^1.4.3+1 + flutter_secure_storage: ^7.0.1 fluttertoast: ^8.1.2 + intl: ^0.18.0 + introduction_screen: ^3.0.1 + package_info_plus: ^4.1.0 + path_provider: ^2.0.9 settings_ui: ^2.0.2 + shared_preferences: ^2.0.13 + timezone: ^0.9.0 + url_launcher: ^6.0.20 dev_dependencies: - flutter_lints: ^2.0.1 flutter_launcher_icons: ^0.13.0 + flutter_lints: ^2.0.1 flutter_icons: android: true @@ -48,10 +48,8 @@ flutter: # To add assets to your application, add an assets section, like this: assets: - assets/ - # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware. - # To add custom fonts to your application, add a fonts section here, # in this "flutter" section. Each entry in this list should have a # "family" key with the font family name, and a "fonts" key with a