Merge pull request #619 from Npepperlinux/fix/pub_upgrade_android_con…

…flict_v2

[Android] pubspac.yamlの更新とそれに伴う修正

.github/workflows/aab_deploy.yml

@@ -26,9 +26,9 @@ jobs:
         - uses: actions/setup-java@v4
           with:
             distribution: 'zulu'
-            java-version: '11'
+            java-version: '17'
             cache: 'gradle'
-      
+
 
         - name: Cache pubspec dependencies
           uses: actions/cache@v4
@@ -53,14 +53,13 @@ jobs:
 
         - name: Run flutter test with coverage
           run: flutter test --coverage --coverage-path=~/coverage/lcov.info
-
 
         - name: Create aab file
           run: |
             echo -n "${{ secrets.ANDROID_KEYSTORE_BASE64 }}" | base64 -d > ./android/release.keystore
             export ANDROID_KEYSTORE_PASSWORD="${{ secrets.ANDROID_KEYSTORE_PASSWORD }}"
             export ANDROID_KEY_ALIAS="${{ secrets.ANDROID_KEY_ALIAS }}"
-            export ANDROID_KEY_PASSWORD="${{ secrets.ANDROID_KEY_PASSWORD }}"            
+            export ANDROID_KEY_PASSWORD="${{ secrets.ANDROID_KEY_PASSWORD }}"
             flutter build appbundle --no-tree-shake-icons --release
         - name: Upload artifact
           uses: actions/upload-artifact@v4
@@ -69,4 +68,4 @@ jobs:
             # 保存するファイル
             path: ./build/app/outputs/bundle/release/app-release.aab
             # 保存期間（日）
-            retention-days: 3
+            retention-days: 3

lib/providers.dart

@@ -2,7 +2,7 @@ import "package:dio/dio.dart";
 import "package:file/file.dart";
 import "package:file/local.dart";
 import "package:flutter/widgets.dart";
-import "package:flutter_cache_manager/flutter_cache_manager.dart";
+import "package:flutter_cache_manager/flutter_cache_manager.dart" hide FileSystem;
 import "package:freezed_annotation/freezed_annotation.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
 import "package:miria/model/account.dart";

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -17,9 +17,10 @@ import screen_brightness_macos
 import screen_retriever
 import share_plus
 import shared_preferences_foundation
-import sqflite
+import sqflite_darwin
 import url_launcher_macos
 import wakelock_plus
+import webview_flutter_wkwebview
 import window_manager
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
@@ -38,5 +39,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
   UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
   WakelockPlusMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockPlusMacosPlugin"))
+  FLTWebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "FLTWebViewFlutterPlugin"))
   WindowManagerPlugin.register(with: registry.registrar(forPlugin: "WindowManagerPlugin"))
 }