diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml index 478832f..9a8f9fc 100644 --- a/.github/workflows/Release.yml +++ b/.github/workflows/Release.yml @@ -61,7 +61,7 @@ jobs: flutter_version: '2.10.3' - target: ios host: macos-latest - flutter_version: '3.0.0' + flutter_version: '3.0.3' - target: android-arm32 host: ubuntu-latest flutter_version: '2.10.3' @@ -73,13 +73,13 @@ jobs: flutter_version: '2.10.3' - target: android-arm32 host: ubuntu-latest - flutter_version: '3.0.0' + flutter_version: '3.0.3' - target: android-arm64 host: ubuntu-latest - flutter_version: '3.0.0' + flutter_version: '3.0.3' - target: android-x86_64 host: ubuntu-latest - flutter_version: '3.0.0' + flutter_version: '3.0.3' runs-on: ${{ matrix.config.host }} @@ -209,18 +209,22 @@ jobs: cd ci cp version.code.txt ../lib/assets/version.txt - - name: Upgrade deps version (Android) - if: steps.check_asset.outputs.skip_build != 'true' && matrix.config.host != 'macos-latest' && startsWith(matrix.config.flutter_version, '3') + - name: Upgrade deps version (flutter2 non-mac) + if: steps.check_asset.outputs.skip_build != 'true' && matrix.config.host != 'macos-latest' && startsWith(matrix.config.flutter_version, '2') run: | - sed -i "s/another_xlider: 1.0.1+2/another_xlider: ^1.0.1+2/g" pubspec.yaml - sed -i "s/flutter_styled_toast: 2.0.0/flutter_styled_toast: ^2.0.0/g" pubspec.yaml + sed -i "s/another_xlider: ^1.0.1+2/another_xlider: 1.0.1+2/g" pubspec.yaml + sed -i "s/flutter_styled_toast: ^2.0.0/flutter_styled_toast: 2.0.0/g" pubspec.yaml + sed -i "s/filesystem_picker: ^3.0.0-beta.1/filesystem_picker: ^2.0.1/g" pubspec.yaml + flutter pub get - - name: Upgrade deps version (iOS) - if: steps.check_asset.outputs.skip_build != 'true' && matrix.config.host == 'macos-latest' && startsWith(matrix.config.flutter_version, '3') + - name: Upgrade deps version (flutter2 mac) + if: steps.check_asset.outputs.skip_build != 'true' && matrix.config.host == 'macos-latest' && startsWith(matrix.config.flutter_version, '2') run: | brew install gnu-sed - gsed -i "s/another_xlider: 1.0.1+2/another_xlider: ^1.0.1+2/g" pubspec.yaml - gsed -i "s/flutter_styled_toast: 2.0.0/flutter_styled_toast: ^2.0.0/g" pubspec.yaml + gsed -i "s/another_xlider: ^1.0.1+2/another_xlider: 1.0.1+2/g" pubspec.yaml + gsed -i "s/flutter_styled_toast: ^2.0.0/flutter_styled_toast: 2.0.0/g" pubspec.yaml + gsed -i "s/filesystem_picker: ^3.0.0-beta.1/filesystem_picker: ^2.0.1/g" pubspec.yaml + flutter pub get - name: Build (windows) if: steps.check_asset.outputs.skip_build != 'true' && matrix.config.target == 'windows' diff --git a/ci/version.code.txt b/ci/version.code.txt index 01558e3..b4e1736 100644 --- a/ci/version.code.txt +++ b/ci/version.code.txt @@ -1 +1 @@ -v1.5.3 \ No newline at end of file +v1.5.4 \ No newline at end of file diff --git a/ci/version.info.txt b/ci/version.info.txt index 32a47ff..7217012 100644 --- a/ci/version.info.txt +++ b/ci/version.info.txt @@ -1,2 +1,11 @@ -- [x] 修复一些错别字 -- [x] 解决了漫画和游戏下拉刷新页面延迟重载的问题 \ No newline at end of file +更新 + +- [x] 苹果手机支持导出导出了 +- [x] 修复了安卓导入时不能选择文件 (AOSP个别机型的问题) +- [x] 增加了导出 PKI/PKZ 等格式 +- [x] 苹果/安卓 在文件管理器中可以直接打开 PKI/PKZ 导入或观看 +- [x] 增加了骑士榜 + +计划 + +- [ ] 本地骑士书签 (漫画书签?/快捷搜索书签?) diff --git a/lib/basic/config/shadowCategoriesMode.dart b/lib/basic/config/ShadowCategoriesMode.dart similarity index 100% rename from lib/basic/config/shadowCategoriesMode.dart rename to lib/basic/config/ShadowCategoriesMode.dart diff --git a/pubspec.lock b/pubspec.lock index afc4da3..48deebf 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,7 +7,7 @@ packages: name: another_xlider url: "https://pub.dartlang.org" source: hosted - version: "1.0.1+2" + version: "1.1.1" archive: dependency: transitive description: @@ -126,7 +126,7 @@ packages: name: filesystem_picker url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "3.0.0-beta.1" flutter: dependency: "direct main" description: flutter @@ -171,7 +171,7 @@ packages: name: flutter_styled_toast url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.3" flutter_svg: dependency: "direct main" description: @@ -336,13 +336,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.0" - pedantic: - dependency: transitive - description: - name: pedantic - url: "https://pub.dartlang.org" - source: hosted - version: "1.11.1" permission_handler: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 508157f..dc536fe 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -32,8 +32,8 @@ dependencies: event: ^2.0.5 flutter_search_bar: ^3.0.0-dev.1 flutter_svg: ^1.0.3 - flutter_styled_toast: 2.0.0 - another_xlider: 1.0.1+2 + flutter_styled_toast: ^2.0.0 + another_xlider: ^1.0.1+2 scrollable_positioned_list: ^0.2.0-nullsafety.0 permission_handler: ^8.3.0 url_launcher: ^6.0.9 @@ -50,7 +50,7 @@ dependencies: path: ^1.8.0 uri_to_file: ^0.2.0 uni_links: ^0.5.1 - filesystem_picker: ^2.0.1 + filesystem_picker: ^3.0.0-beta.1 dev_dependencies: flutter_test: