diff --git a/app/android/app/build.gradle.kts b/app/android/app/build.gradle.kts index 15d7a5705..be6056fb1 100644 --- a/app/android/app/build.gradle.kts +++ b/app/android/app/build.gradle.kts @@ -44,12 +44,12 @@ android { // Flag to enable support for the new language APIs isCoreLibraryDesugaringEnabled = true // End flutter_local_notifications - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() + jvmTarget = JavaVersion.VERSION_17.toString() } signingConfigs { diff --git a/app/ios/Flutter/AppFrameworkInfo.plist b/app/ios/Flutter/AppFrameworkInfo.plist index 1dc6cf765..391a902b2 100644 --- a/app/ios/Flutter/AppFrameworkInfo.plist +++ b/app/ios/Flutter/AppFrameworkInfo.plist @@ -20,7 +20,5 @@ ???? CFBundleVersion 1.0 - MinimumOSVersion - 13.0 diff --git a/app/ios/Podfile.lock b/app/ios/Podfile.lock index e75d1a49e..8cda409e9 100644 --- a/app/ios/Podfile.lock +++ b/app/ios/Podfile.lock @@ -14,8 +14,9 @@ PODS: - Flutter - flutter_native_splash (2.4.3): - Flutter - - flutter_secure_storage (6.0.0): + - flutter_secure_storage_darwin (10.0.0): - Flutter + - FlutterMacOS - flutter_timezone (0.0.1): - Flutter - flutter_web_auth_2 (3.0.0): @@ -60,7 +61,7 @@ DEPENDENCIES: - flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`) - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`) - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`) - - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`) + - flutter_secure_storage_darwin (from `.symlinks/plugins/flutter_secure_storage_darwin/darwin`) - flutter_timezone (from `.symlinks/plugins/flutter_timezone/ios`) - flutter_web_auth_2 (from `.symlinks/plugins/flutter_web_auth_2/ios`) - just_audio (from `.symlinks/plugins/just_audio/darwin`) @@ -96,8 +97,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/flutter_local_notifications/ios" flutter_native_splash: :path: ".symlinks/plugins/flutter_native_splash/ios" - flutter_secure_storage: - :path: ".symlinks/plugins/flutter_secure_storage/ios" + flutter_secure_storage_darwin: + :path: ".symlinks/plugins/flutter_secure_storage_darwin/darwin" flutter_timezone: :path: ".symlinks/plugins/flutter_timezone/ios" flutter_web_auth_2: @@ -131,11 +132,10 @@ SPEC CHECKSUMS: camera_avfoundation: 968a9a5323c79a99c166ad9d7866bfd2047b5a9b Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467 flutter_file_dialog: ca8d7fbd1772d4f0c2777b4ab20a7787ef4e7dd8 - flutter_local_notifications: 643a3eda1ce1c0599413ca31672536d423dee214 flutter_keyboard_visibility: 4625131e43015dbbe759d9b20daaf77e0e3f6619 - flutter_local_notifications: a5a732f069baa862e728d839dd2ebb904737effb + flutter_local_notifications: 643a3eda1ce1c0599413ca31672536d423dee214 flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf - flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13 + flutter_secure_storage_darwin: acdb3f316ed05a3e68f856e0353b133eec373a23 flutter_timezone: 7c838e17ffd4645d261e87037e5bebf6d38fe544 flutter_web_auth_2: 5c8d9dcd7848b5a9efb086d24e7a9adcae979c80 just_audio: 4e391f57b79cad2b0674030a00453ca5ce817eed diff --git a/app/lib/l10n/app_localizations_de.dart b/app/lib/l10n/app_localizations_de.dart index b058323e0..7b1e9da25 100644 --- a/app/lib/l10n/app_localizations_de.dart +++ b/app/lib/l10n/app_localizations_de.dart @@ -1,6 +1,5 @@ // ignore: unused_import import 'package:intl/intl.dart' as intl; - import 'app_localizations.dart'; // ignore_for_file: type=lint diff --git a/flutter_common/lib/envs/.env.dev b/flutter_common/lib/envs/.env.dev index 3738415b9..3b8957f2a 100644 --- a/flutter_common/lib/envs/.env.dev +++ b/flutter_common/lib/envs/.env.dev @@ -1,5 +1,5 @@ STUDYU_SUPABASE_URLS=https://studyu-02.dhc-lab.hpi.de -STUDYU_SUPABASE_PUBLIC_ANON_KEY=eyJhbGciOiAiSFMyNTYiLCJ0eXAiOiAiSldUIn0.eyJyb2xlIjogImFub24iLCJpc3MiOiAic3VwYWJhc2UiLCJpYXQiOiAxNzY1MDEzMTIyLCJleHAiOiAxNzk2NTQ5MTIyfQ.d8cyoFZ_E3ymZyKEjZCP1VktnlMFntOaaosSwjjPFMY +STUDYU_SUPABASE_PUBLIC_ANON_KEY=eyJhbGciOiAiSFMyNTYiLCJ0eXAiOiAiSldUIn0.eyJyb2xlIjogImFub24iLCJpc3MiOiAic3VwYWJhc2UiLCJpYXQiOiAxNzU3Mzk3MDI5LCJleHAiOiAxNzg4OTMzMDI5fQ.BQwOLCX6h7RBvZ0xTdt2o-3Hw6YJxalI7EuCVwH69yo STUDYU_PROJECT_GENERATOR_URL= STUDYU_APP_URL=https://app.dev.studyu.health STUDYU_DESIGNER_URL=https://designer.dev.studyu.health diff --git a/flutter_common/lib/src/utils/storage.dart b/flutter_common/lib/src/utils/storage.dart index d4c9ae51b..87485bdba 100755 --- a/flutter_common/lib/src/utils/storage.dart +++ b/flutter_common/lib/src/utils/storage.dart @@ -36,9 +36,7 @@ class SupabaseStorage extends LocalStorage { } class SecureStorage { - static const storage = FlutterSecureStorage( - // aOptions: AndroidOptions(encryptedSharedPreferences: true), - ); + static const storage = FlutterSecureStorage(); static Future containsKey(String key) async { return await storageLock.synchronized(() async { diff --git a/flutter_common/pubspec.yaml b/flutter_common/pubspec.yaml index 94cc03797..d6e7a723f 100644 --- a/flutter_common/pubspec.yaml +++ b/flutter_common/pubspec.yaml @@ -12,7 +12,7 @@ dependencies: flutter: sdk: flutter flutter_dotenv: ^6.0.0 - flutter_secure_storage: 9.2.2 # Has critical bugs in later versions + flutter_secure_storage: ^10.0.0 lint: ^2.8.0 shared_preferences: ^2.5.4 studyu_core: ^4.8.0 diff --git a/pubspec.lock b/pubspec.lock index 8d761820b..5825c4454 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -9,14 +9,6 @@ packages: url: "https://pub.dev" source: hosted version: "92.0.0" - adaptive_number: - dependency: transitive - description: - name: adaptive_number - sha256: "3a567544e9b5c9c803006f51140ad544aedc79604fd4f3f2c1380003f97c1d77" - url: "https://pub.dev" - source: hosted - version: "1.0.0" analyzer: dependency: transitive description: @@ -413,10 +405,10 @@ packages: dependency: transitive description: name: dart_jsonwebtoken - sha256: c6ecb3bb991c459b91c5adf9e871113dcb32bbe8fe7ca2c92723f88ffc1e0b7a + sha256: cb79ed79baa02b4f59a597bf365873cbd83f9bb15273d63f7803802d21717c7d url: "https://pub.dev" source: hosted - version: "3.3.2" + version: "3.4.0" dart_style: dependency: transitive description: @@ -497,14 +489,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.8.1" - ed25519_edwards: - dependency: transitive - description: - name: ed25519_edwards - sha256: "6ce0112d131327ec6d42beede1e5dfd526069b18ad45dcf654f15074ad9276cd" - url: "https://pub.dev" - source: hosted - version: "0.3.1" equatable: dependency: transitive description: @@ -733,50 +717,50 @@ packages: dependency: transitive description: name: flutter_secure_storage - sha256: "165164745e6afb5c0e3e3fcc72a012fb9e58496fb26ffb92cf22e16a821e85d0" + sha256: da922f2aab2d733db7e011a6bcc4a825b844892d4edd6df83ff156b09a9b2e40 url: "https://pub.dev" source: hosted - version: "9.2.2" - flutter_secure_storage_linux: + version: "10.0.0" + flutter_secure_storage_darwin: dependency: transitive description: - name: flutter_secure_storage_linux - sha256: be76c1d24a97d0b98f8b54bce6b481a380a6590df992d0098f868ad54dc8f688 + name: flutter_secure_storage_darwin + sha256: "8878c25136a79def1668c75985e8e193d9d7d095453ec28730da0315dc69aee3" url: "https://pub.dev" source: hosted - version: "1.2.3" - flutter_secure_storage_macos: + version: "0.2.0" + flutter_secure_storage_linux: dependency: transitive description: - name: flutter_secure_storage_macos - sha256: "6c0a2795a2d1de26ae202a0d78527d163f4acbb11cde4c75c670f3a0fc064247" + name: flutter_secure_storage_linux + sha256: "2b5c76dce569ab752d55a1cee6a2242bcc11fdba927078fb88c503f150767cda" url: "https://pub.dev" source: hosted - version: "3.1.3" + version: "3.0.0" flutter_secure_storage_platform_interface: dependency: transitive description: name: flutter_secure_storage_platform_interface - sha256: cf91ad32ce5adef6fba4d736a542baca9daf3beac4db2d04be350b87f69ac4a8 + sha256: "8ceea1223bee3c6ac1a22dabd8feefc550e4729b3675de4b5900f55afcb435d6" url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "2.0.1" flutter_secure_storage_web: dependency: transitive description: name: flutter_secure_storage_web - sha256: f4ebff989b4f07b2656fb16b47852c0aab9fed9b4ec1c70103368337bc1886a9 + sha256: "6a1137df62b84b54261dca582c1c09ea72f4f9a4b2fcee21b025964132d5d0c3" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "2.1.0" flutter_secure_storage_windows: dependency: transitive description: name: flutter_secure_storage_windows - sha256: b20b07cb5ed4ed74fc567b78a72936203f587eba460af1df11281c9326cd3709 + sha256: "3b7c8e068875dfd46719ff57c90d8c459c87f2302ed6b00ff006b3c9fcad1613" url: "https://pub.dev" source: hosted - version: "3.1.2" + version: "4.1.0" flutter_svg: dependency: transitive description: @@ -1053,14 +1037,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.14.2" - js: - dependency: transitive - description: - name: js - sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 - url: "https://pub.dev" - source: hosted - version: "0.6.7" json_annotation: dependency: transitive description: