diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml index c08a14f..6974578 100644 --- a/.github/workflows/Release.yml +++ b/.github/workflows/Release.yml @@ -66,16 +66,16 @@ jobs: config: - target: linux host: ubuntu-latest - flutter_version: '3.3.10' + flutter_version: '3.7.3' - target: windows host: windows-latest - flutter_version: '3.3.10' + flutter_version: '3.7.3' - target: macos host: macos-11 - flutter_version: '3.3.10' + flutter_version: '3.7.3' - target: ios host: macos-11 - flutter_version: '3.3.10' + flutter_version: '3.7.3' - target: android-arm32 host: ubuntu-latest flutter_version: '2.10.5' @@ -87,13 +87,13 @@ jobs: flutter_version: '2.10.5' - target: android-arm32 host: ubuntu-latest - flutter_version: '3.3.10' + flutter_version: '3.7.3' - target: android-arm64 host: ubuntu-latest - flutter_version: '3.3.10' + flutter_version: '3.7.3' - target: android-x86_64 host: ubuntu-latest - flutter_version: '3.3.10' + flutter_version: '3.7.3' runs-on: ${{ matrix.config.host }} @@ -246,6 +246,8 @@ jobs: sed -i "s/flutter_styled_toast: ^2.1.3/flutter_styled_toast: 2.0.0/g" pubspec.yaml sed -i "s/ffi: 2.0.1/ffi: 1.1.0/g" pubspec.yaml sed -i "s/ffigen: 6.0.1/ffigen: 4.1.3/g" pubspec.yaml + sed -i "s/modal_bottom_sheet: ^3.0.0-pre/modal_bottom_sheet: 2.0.1/g" pubspec.yaml + sed -i "s/permission_handler ^10.2.0/permission_handler 9.2.0/g" pubspec.yaml - name: Upgrade deps version (iOS) if: steps.check_asset.outputs.skip_build != 'true' && matrix.config.host == 'macos-11' && startsWith(matrix.config.flutter_version, '2') @@ -256,6 +258,8 @@ jobs: gsed -i "s/flutter_styled_toast: ^2.1.3/flutter_styled_toast: 2.0.0/g" pubspec.yaml gsed -i "s/ffi: 2.0.1/ffi: 1.1.0/g" pubspec.yaml gsed -i "s/ffigen: 6.0.1/ffigen: 4.1.3/g" pubspec.yaml + gsed -i "s/modal_bottom_sheet: ^3.0.0-pre/modal_bottom_sheet: 2.0.1/g" pubspec.yaml + gsed -i "s/permission_handler ^10.2.0/permission_handler 9.2.0/g" pubspec.yaml - name: Cargo native build cache if: steps.check_asset.outputs.skip_build != 'true' diff --git a/android/app/build.gradle b/android/app/build.gradle index b63c8e0..4591fdf 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -43,7 +43,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "niuhuan.daisy" + applicationId "opensource.daisy" minSdkVersion flutter.minSdkVersion targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index e6ca783..20a730e 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="opensource.dasiy"> diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index a9d1661..bf7e8aa 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="opensource.dasiy"> @@ -20,7 +20,7 @@ android:name="${applicationName}" android:icon="@mipmap/ic_launcher"> + package="opensource.dasiy"> diff --git a/ci/version.code.txt b/ci/version.code.txt index bb86fac..a33ca21 100644 --- a/ci/version.code.txt +++ b/ci/version.code.txt @@ -1 +1 @@ -v0.1.15 \ No newline at end of file +v0.1.16 \ No newline at end of file diff --git a/ci/version.info.txt b/ci/version.info.txt index 5081abc..688a7bd 100644 --- a/ci/version.info.txt +++ b/ci/version.info.txt @@ -1,5 +1,10 @@ 计划 - [x] 下载? / / 高清画质? / / 通过点击进行上一页下一页? +v0.1.16 + - [x] 🐛 修复缓存不清除, 内存使用很大的问题 + - [x] 🚀 升级Flutter引擎到3.7.3 + - [x] 🚀 修改包名和签名防止报毒和黑名单 + v0.1.15 - [x] 下载(缓存)漫画 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 6dfd907..8969529 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -360,7 +360,7 @@ "$(inherited)", "$(PROJECT_DIR)/Runner", ); - PRODUCT_BUNDLE_IDENTIFIER = niuhuan.daisy; + PRODUCT_BUNDLE_IDENTIFIER = opensource.daisy; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -494,7 +494,7 @@ "$(inherited)", "$(PROJECT_DIR)/Runner", ); - PRODUCT_BUNDLE_IDENTIFIER = niuhuan.daisy; + PRODUCT_BUNDLE_IDENTIFIER = opensource.daisy; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -522,7 +522,7 @@ "$(inherited)", "$(PROJECT_DIR)/Runner", ); - PRODUCT_BUNDLE_IDENTIFIER = niuhuan.daisy; + PRODUCT_BUNDLE_IDENTIFIER = opensource.daisy; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index 75cd803..b4de58c 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10) project(runner LANGUAGES CXX) set(BINARY_NAME "daisy") -set(APPLICATION_ID "niuhuan.daisy") +set(APPLICATION_ID "opensource.daisy") cmake_policy(SET CMP0063 NEW) diff --git a/macos/Runner/Configs/AppInfo.xcconfig b/macos/Runner/Configs/AppInfo.xcconfig index 370f174..cba7d94 100644 --- a/macos/Runner/Configs/AppInfo.xcconfig +++ b/macos/Runner/Configs/AppInfo.xcconfig @@ -8,7 +8,7 @@ PRODUCT_NAME = daisy // The application's bundle identifier -PRODUCT_BUNDLE_IDENTIFIER = niuhuan.daisy +PRODUCT_BUNDLE_IDENTIFIER = opensource.daisy // The copyright displayed in application information -PRODUCT_COPYRIGHT = Copyright © 2022 niuhuan. All rights reserved. +PRODUCT_COPYRIGHT = Copyright © 2022 opensource. All rights reserved. diff --git a/pubspec.yaml b/pubspec.yaml index bd71313..ccb26b7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -19,10 +19,10 @@ dependencies: awesome_select: ^5.2.0 another_xlider: ^1.0.1+2 event: ^2.1.2 - modal_bottom_sheet: ^2.0.1 + modal_bottom_sheet: ^3.0.0-pre photo_view: ^0.13.0 scrollable_positioned_list: ^0.2.3 - permission_handler: ^9.2.0 + permission_handler: ^10.2.0 flutter_styled_toast: ^2.1.3 flutter_svg: ^1.0.3 flutter_search_bar: ^3.0.0-dev.1 diff --git a/windows/runner/Runner.rc b/windows/runner/Runner.rc index a0e7df2..782234e 100644 --- a/windows/runner/Runner.rc +++ b/windows/runner/Runner.rc @@ -89,7 +89,7 @@ BEGIN BEGIN BLOCK "040904e4" BEGIN - VALUE "CompanyName", "niuhuan" "\0" + VALUE "CompanyName", "opensource" "\0" VALUE "FileDescription", "daisy" "\0" VALUE "FileVersion", VERSION_AS_STRING "\0" VALUE "InternalName", "daisy" "\0"