Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Oct 18, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2becd58
(Android) Android Apkのビルドに対応するためのpubspac.yaml更新など
Npepperlinux Oct 18, 2024
8ba1768
(workflow) aabビルドにおけるjavaバージョンの更新
Npepperlinux Oct 18, 2024
dc2986f
Merge branch 'feature/miria_v2' into fix/pub_upgrade_android_conflict_v2
shiosyakeyakini-info Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions .github/workflows/aab_deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -69,4 +68,4 @@ jobs:
# 保存するファイル
path: ./build/app/outputs/bundle/release/app-release.aab
# 保存期間（日）
retention-days: 3
retention-days: 3
2 changes: 1 addition & 1 deletion lib/providers.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
4 changes: 3 additions & 1 deletion macos/Flutter/GeneratedPluginRegistrant.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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"))
}
Loading