From 8b81af7bd1ec8aeaa312df599c8c193952c67196 Mon Sep 17 00:00:00 2001 From: nightmare Date: Thu, 26 Oct 2023 15:21:11 +0800 Subject: [PATCH] chore: Fix compile bug --- pubspec.lock | 48 ++++++++++---------- pubspec.yaml | 17 +------ res/linux/{ => package}/speed-share.desktop | 0 res/linux/package/speed-share.png | Bin 0 -> 26371 bytes res/linux/speed-share.png | Bin 6568 -> 0 bytes scripts/build/linux/generate_linux.sh | 21 --------- scripts/build/windows/patch_executable.bat | 2 - scripts/properties.sh | 1 + scripts/upload/upload.sh | 48 -------------------- 9 files changed, 26 insertions(+), 111 deletions(-) rename res/linux/{ => package}/speed-share.desktop (100%) create mode 100644 res/linux/package/speed-share.png delete mode 100644 res/linux/speed-share.png delete mode 100755 scripts/build/linux/generate_linux.sh delete mode 100644 scripts/build/windows/patch_executable.bat delete mode 100755 scripts/upload/upload.sh diff --git a/pubspec.lock b/pubspec.lock index 3ad2462b..ec5eea1a 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -128,10 +128,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.flutter-io.cn" source: hosted - version: "1.17.2" + version: "1.18.0" convert: dependency: transitive description: @@ -378,21 +378,13 @@ packages: source: sdk version: "0.0.0" flutter_widget_from_html_core: - dependency: transitive - description: - name: flutter_widget_from_html_core - sha256: e8f4f8b461a140ffb7c71f938bc76efc758893e7468843d9dbf70cb0b9e900cb - url: "https://pub.flutter-io.cn" - source: hosted - version: "0.8.5+3" - fwfh_text_style: dependency: "direct overridden" description: - name: fwfh_text_style - sha256: "37806ee0222f79b6e8d4c698c322c897eae6a817258156f40aeece4e588fac60" + name: flutter_widget_from_html_core + sha256: d3239b1670e83fafb209d0ddccfd19bb1cd5382b3ac9a507eb1b36274df78fec url: "https://pub.flutter-io.cn" source: hosted - version: "2.22.08+1" + version: "0.14.7" get: dependency: "direct main" description: @@ -570,6 +562,14 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "1.4.0" + logging: + dependency: transitive + description: + name: logging + sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" + url: "https://pub.flutter-io.cn" + source: hosted + version: "1.2.0" markdown: dependency: transitive description: @@ -606,10 +606,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.flutter-io.cn" source: hosted - version: "1.9.1" + version: "1.10.0" mime: dependency: transitive description: @@ -909,18 +909,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.flutter-io.cn" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.flutter-io.cn" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -949,10 +949,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.flutter-io.cn" source: hosted - version: "0.6.0" + version: "0.6.1" tray_manager: dependency: "direct main" description: @@ -1100,10 +1100,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.flutter-io.cn" source: hosted - version: "0.1.4-beta" + version: "0.3.0" win32: dependency: transitive description: @@ -1154,5 +1154,5 @@ packages: source: hosted version: "0.0.6" sdks: - dart: ">=3.1.0 <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=3.13.0" diff --git a/pubspec.yaml b/pubspec.yaml index 4cafb2b5..6c6e8ea4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -99,7 +99,6 @@ flutter: dependency_overrides: flutter_svg: ^1.1.0 - fwfh_text_style: 2.22.8+1 # file_manager_view 依赖的是pub的shelf_static,速享需要使用自定义的 shelf_static: git: @@ -108,20 +107,6 @@ dependency_overrides: ffi: ^2.0.1 android_intent_plus: ^4.0.3 image_picker: ^1.0.4 - # android_window: - # path: /Users/didi/Documents/GitHub/flutter-android-window - # # xterm: ^3.2.6 - # logger_view: - # path: ../logger_view - # app_manager: - # path: ../app_manager - # app_channel: - # path: ../applib/applib_util - # global_repository: - # path: ../global_repository - # file_manager_view: - # path: ../file_manager_view - # user_center_frontend: - # path: ../user_center_frontend + flutter_widget_from_html_core: ^0.14.6 flutter_intl: enabled: true diff --git a/res/linux/speed-share.desktop b/res/linux/package/speed-share.desktop similarity index 100% rename from res/linux/speed-share.desktop rename to res/linux/package/speed-share.desktop diff --git a/res/linux/package/speed-share.png b/res/linux/package/speed-share.png new file mode 100644 index 0000000000000000000000000000000000000000..77185a99776fd100426ab328dcc93b8481ee99c4 GIT binary patch literal 26371 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 diff --git a/scripts/build/linux/generate_linux.sh b/scripts/build/linux/generate_linux.sh deleted file mode 100755 index a445acf9..00000000 --- a/scripts/build/linux/generate_linux.sh +++ /dev/null @@ -1,21 +0,0 @@ -rm -rf ./tmp -PACKAGE_DIR=./tmp -target_dir=$PACKAGE_DIR/opt/speed-share -mkdir -p $target_dir -mkdir -p $PACKAGE_DIR/usr/share/applications -ICON_PATH=$PACKAGE_DIR/usr/share/pixmaps -mkdir -p $ICON_PATH -cp -rf ./build/linux/x64/release/bundle/. $target_dir -cp -rf ./res/linux/speed-share.png $ICON_PATH/ -cp -rf ./res/linux/speed-share.desktop $PACKAGE_DIR/usr/share/applications/ -mkdir $PACKAGE_DIR/DEBIAN -echo " -Package: speed-share -Architecture: amd64 -Maintainer: @Nightmare -Version: 1.3.1-1 -Homepage: https://nightmare.press/speedshare/ -Description: screen your phone on computer -">$PACKAGE_DIR/DEBIAN/control -chmod 755 $PACKAGE_DIR/DEBIAN -dpkg-deb -b $PACKAGE_DIR "Speed Share.deb" \ No newline at end of file diff --git a/scripts/build/windows/patch_executable.bat b/scripts/build/windows/patch_executable.bat deleted file mode 100644 index fb007bf2..00000000 --- a/scripts/build/windows/patch_executable.bat +++ /dev/null @@ -1,2 +0,0 @@ -@echo off -xcopy .\res\windows\runtime .\build\windows\runner\Release /s /f \ No newline at end of file diff --git a/scripts/properties.sh b/scripts/properties.sh index df03d22e..132d59d5 100755 --- a/scripts/properties.sh +++ b/scripts/properties.sh @@ -5,3 +5,4 @@ APP_NAME='SpeedShare' APP_NAME_CN='速享' MAC_APP_NAME='Speed Share' BUILD_ARG='-t lib/main_personal.dart' +LINUX_APP_NAME='speed-share' \ No newline at end of file diff --git a/scripts/upload/upload.sh b/scripts/upload/upload.sh deleted file mode 100755 index 434f5a24..00000000 --- a/scripts/upload/upload.sh +++ /dev/null @@ -1,48 +0,0 @@ -LOCAL_DIR=$( - cd $(dirname $0) - pwd -) -PROJECT_DIR=$LOCAL_DIR/../.. -source $LOCAL_DIR/../properties.sh -# echo $PROJECT_DIR -linux_app="$PROJECT_DIR/dist/$APP_NAME.deb" -target_linux_app="$PROJECT_DIR/dist/${APP_NAME_CN}_${VERSION}_Linux.deb" -if [ -f $linux_app ]; then - mv $linux_app $target_linux_app - rsync $target_linux_app "${TARGET_PATH}/${APP_NAME_CN}_${VERSION}_Linux.deb" -fi -mac_app="$PROJECT_DIR/dist/${APP_NAME}_macOS.dmg" -target_mac_app="$PROJECT_DIR/dist/${APP_NAME_CN}_${VERSION}_macOS.dmg" -if [ -f $mac_app ]; then - mv $mac_app $target_mac_app - rsync $target_mac_app ${TARGET_PATH}/${APP_NAME_CN}_${VERSION}_macOS.dmg -fi -win_app="$PROJECT_DIR/dist/${APP_NAME}_Windows.zip" -target_name="${APP_NAME_CN}_${VERSION}_Windows.zip" -target_win_app="$PROJECT_DIR/dist/$target_name" -if [ -f $win_app ]; then - mv $win_app $target_win_app - echo "upload $target_name" - rsync "$target_win_app" "$TARGET_PATH/$target_name" -fi -arm64_apk="$PROJECT_DIR/dist/app-arm64-v8a-release.apk" -target_arm64_apk="$PROJECT_DIR/dist/${APP_NAME_CN}_${VERSION}_Android_arm64.apk" -if [ -f "$arm64_apk" ]; then - mv $arm64_apk $target_arm64_apk - echo upload android arm64... - rsync "$target_arm64_apk" "${TARGET_PATH}/${APP_NAME_CN}_${VERSION}_Android_arm64.apk" -fi -arm_apk="$PROJECT_DIR/dist/app-armeabi-v7a-release.apk" -target_arm_apk="$PROJECT_DIR/dist/${APP_NAME_CN}_${VERSION}_Android_arm_v7a.apk" -if [ -f "$arm_apk" ]; then - mv $arm_apk $target_arm_apk - echo upload android arm... - rsync "$target_arm_apk" "$TARGET_PATH/${APP_NAME_CN}_${VERSION}_Android_arm_v7a.apk" -fi -x86_apk="$PROJECT_DIR/dist/app-x86_64-release.apk" -target_x86_apk="$PROJECT_DIR/dist/${APP_NAME_CN}_${VERSION}_Android_x86_64.apk" -if [ -f "$x86_apk" ]; then - mv $x86_apk $target_x86_apk - echo upload android x86... - rsync "$target_x86_apk" "$TARGET_PATH/${APP_NAME_CN}_${VERSION}_Android_x86_64.apk" -fi