From 2c9e4c1da6b27e12559b8dc139d7fb71c6e93a5f Mon Sep 17 00:00:00 2001 From: Arianne Orpilla Date: Sat, 26 Oct 2024 23:13:40 +1000 Subject: [PATCH] Flutter 3.10.6 Legacy fixes 2.8.10 --- yuuna/.fvmrc | 3 ++ yuuna/.gitignore | 3 ++ yuuna/android/app/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../implementations/player_source_page.dart | 1 - yuuna/pubspec.lock | 42 +++++++++++++------ yuuna/pubspec.yaml | 2 +- 7 files changed, 38 insertions(+), 17 deletions(-) create mode 100644 yuuna/.fvmrc diff --git a/yuuna/.fvmrc b/yuuna/.fvmrc new file mode 100644 index 000000000..8973bdf9b --- /dev/null +++ b/yuuna/.fvmrc @@ -0,0 +1,3 @@ +{ + "flutter": "3.10.6" +} \ No newline at end of file diff --git a/yuuna/.gitignore b/yuuna/.gitignore index a1345d017..73cdbb58e 100644 --- a/yuuna/.gitignore +++ b/yuuna/.gitignore @@ -43,3 +43,6 @@ app.*.map.json /android/app/debug /android/app/profile /android/app/release + +# FVM Version Cache +.fvm/ \ No newline at end of file diff --git a/yuuna/android/app/build.gradle b/yuuna/android/app/build.gradle index 3db5e883f..d871c8aa5 100644 --- a/yuuna/android/app/build.gradle +++ b/yuuna/android/app/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 33 + compileSdkVersion 34 ndkVersion '21.4.7075529' compileOptions { diff --git a/yuuna/android/gradle/wrapper/gradle-wrapper.properties b/yuuna/android/gradle/wrapper/gradle-wrapper.properties index 595fb867a..752ce5bc4 100644 --- a/yuuna/android/gradle/wrapper/gradle-wrapper.properties +++ b/yuuna/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip diff --git a/yuuna/lib/src/pages/implementations/player_source_page.dart b/yuuna/lib/src/pages/implementations/player_source_page.dart index 8a67ecae6..6f2aabcba 100644 --- a/yuuna/lib/src/pages/implementations/player_source_page.dart +++ b/yuuna/lib/src/pages/implementations/player_source_page.dart @@ -177,7 +177,6 @@ class _PlayerSourcePageState extends BaseSourcePageState break; case AppLifecycleState.paused: case AppLifecycleState.detached: - case AppLifecycleState.hidden: _lifecycleActive = false; if (!appModel.playerBackgroundPlay) { _session.setActive(false); diff --git a/yuuna/pubspec.lock b/yuuna/pubspec.lock index 7b244e9b8..5ca999097 100644 --- a/yuuna/pubspec.lock +++ b/yuuna/pubspec.lock @@ -947,18 +947,18 @@ packages: dependency: "direct main" description: name: json_annotation - sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467 + sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" url: "https://pub.dev" source: hosted - version: "4.8.1" + version: "4.9.0" json_serializable: dependency: "direct main" description: name: json_serializable - sha256: "61a60716544392a82726dd0fa1dd6f5f1fd32aec66422b6e229e7b90d52325c4" + sha256: ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b url: "https://pub.dev" source: hosted - version: "6.7.0" + version: "6.8.0" just_audio: dependency: "direct main" description: @@ -1007,6 +1007,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.0" + lists: + dependency: transitive + description: + name: lists + sha256: "4ca5c19ae4350de036a7e996cdd1ee39c93ac0a2b840f4915459b7d0a7d4ab27" + url: "https://pub.dev" + source: hosted + version: "1.0.1" local_assets_server: dependency: "direct main" description: @@ -1019,10 +1027,10 @@ packages: dependency: transitive description: name: logging - sha256: "04094f2eb032cbb06c6f6e8d3607edcfcb0455e2bb6cbc010cb01171dcb64e6d" + sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.2.0" marquee: dependency: "direct main" description: @@ -1043,10 +1051,10 @@ packages: dependency: transitive description: name: material_color_utilities - sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec + sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 url: "https://pub.dev" source: hosted - version: "0.11.1" + version: "0.2.0" material_floating_search_bar: dependency: "direct main" description: @@ -1068,10 +1076,10 @@ packages: dependency: transitive description: name: meta - sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.9.1" mime: dependency: transitive description: @@ -1682,6 +1690,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.2" + unicode: + dependency: transitive + description: + name: unicode + sha256: "0f69e46593d65245774d4f17125c6084d2c20b4e473a983f6e21b7d7762218f1" + url: "https://pub.dev" + source: hosted + version: "0.3.1" universal_io: dependency: transitive description: @@ -1921,10 +1937,10 @@ packages: dependency: "direct main" description: name: youtube_explode_dart - sha256: "28dca07fefb4b6518beab95f0c1ef81031f921ed0fe87ebcd9c51378546edfee" + sha256: "6d5f9a0a55d02743e59ca495887432814bddb6b11400b08ee0eeaf69c83d0089" url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.3.5" sdks: - dart: ">=3.3.0-0 <4.0.0" + dart: ">=3.0.0 <4.0.0" flutter: ">=3.10.6" diff --git a/yuuna/pubspec.yaml b/yuuna/pubspec.yaml index b4bcf2033..83ef7ec8f 100644 --- a/yuuna/pubspec.yaml +++ b/yuuna/pubspec.yaml @@ -134,7 +134,7 @@ dependencies: ref: 40464c75e908f57f458597ef4912f5273ab89b1a path: wakelock web_socket_channel: ^2.3.0 - youtube_explode_dart: ^2.2.3 + youtube_explode_dart: ^2.3.5 dependency_overrides: ffi: ^2.0.0