mirror/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2025-06-07 09:52:49 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

opt: upgrade flutter to 3.7.0

Browse Source
This commit is contained in:
Kingtous 2023-01-26 22:57:49 +08:00
parent dbcdcd210c
commit 06a0aeb03b
4 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.github/workflows/flutter-ci.yml vendored
View File

@ -13,8 +13,7 @@ on:
env: env:
LLVM_VERSION: "10.0" LLVM_VERSION: "10.0"
# Note: currently 3.0.5 does not support arm64 officially, we use latest stable version first. FLUTTER_VERSION: "3.7.0"
FLUTTER_VERSION: "3.0.5"
# vcpkg version: 2022.05.10 # vcpkg version: 2022.05.10
# for multiarch gcc compatibility # for multiarch gcc compatibility
VCPKG_COMMIT_ID: "14e7bb4ae24616ec54ff6b2f6ef4e8659434ea44" VCPKG_COMMIT_ID: "14e7bb4ae24616ec54ff6b2f6ef4e8659434ea44"
@ -51,9 +50,9 @@ jobs:
run: | run: |
flutter doctor -v flutter doctor -v
flutter precache --windows flutter precache --windows
Invoke-WebRequest -Uri https://github.com/Kingtous/engine/releases/download/v3.0.5-rustdesk.2/windows-x64-flutter-release.zip -OutFile windows-x64-flutter-release.zip Invoke-WebRequest -Uri https://github.com/Kingtous/engine/releases/download/v3.7.0-rustdesk/windows-x64-release-flutter.zip -OutFile windows-x64-flutter-release.zip
Expand-Archive windows-x64-flutter-release.zip -DestinationPath engine Expand-Archive windows-x64-flutter-release.zip -DestinationPath engine
mv -Force engine/* C:/hostedtoolcache/windows/flutter/stable-3.0.5-x64/bin/cache/artifacts/engine/windows-x64-release/ mv -Force engine/* C:/hostedtoolcache/windows/flutter/stable-${{ env.FLUTTER_VERSION }}-x64/bin/cache/artifacts/engine/windows-x64-release/
- name: Install Rust toolchain - name: Install Rust toolchain
uses: actions-rs/toolchain@v1 uses: actions-rs/toolchain@v1
@ -853,12 +852,12 @@ jobs:
# disable git safe.directory # disable git safe.directory
git config --global --add safe.directory "*" git config --global --add safe.directory "*"
pushd /opt pushd /opt
# clone repo and reset to flutter 3.0.5 # clone repo and reset to flutter 3.7.0
git clone https://github.com/sony/flutter-elinux.git || true git clone https://github.com/sony/flutter-elinux.git || true
pushd flutter-elinux pushd flutter-elinux
# reset to flutter 3.0.5 # reset to flutter 3.7.0
git fetch git fetch
git reset --hard b09a90eee643859ce4e676839227edd9fd3feba8 git reset --hard 51a1d685901f79fbac51665a967c3a1a789ecee5
popd popd
- uses: Kingtous/run-on-arch-action@amd64-support - uses: Kingtous/run-on-arch-action@amd64-support
@ -887,7 +886,6 @@ jobs:
# Setup flutter-elinux # Setup flutter-elinux
export PATH=/opt/flutter-elinux/bin:$PATH export PATH=/opt/flutter-elinux/bin:$PATH
flutter-elinux doctor -v flutter-elinux doctor -v
# edit to corresponding arch
case ${{ matrix.job.arch }} in case ${{ matrix.job.arch }} in
aarch64) aarch64)
sed -i "s/Architecture: amd64/Architecture: arm64/g" ./build.py sed -i "s/Architecture: amd64/Architecture: arm64/g" ./build.py

10
.github/workflows/flutter-nightly.yml vendored
View File

@ -9,7 +9,7 @@ on:
env: env:
LLVM_VERSION: "10.0" LLVM_VERSION: "10.0"
# Note: currently 3.0.5 does not support arm64 officially, we use latest stable version first. # Note: currently 3.0.5 does not support arm64 officially, we use latest stable version first.
FLUTTER_VERSION: "3.0.5" FLUTTER_VERSION: "3.7.0"
TAG_NAME: "nightly" TAG_NAME: "nightly"
# vcpkg version: 2022.05.10 # vcpkg version: 2022.05.10
# for multiarch gcc compatibility # for multiarch gcc compatibility
@ -53,9 +53,9 @@ jobs:
run: | run: |
flutter doctor -v flutter doctor -v
flutter precache --windows flutter precache --windows
Invoke-WebRequest -Uri https://github.com/Kingtous/engine/releases/download/v3.0.5-rustdesk.2/windows-x64-flutter-release.zip -OutFile windows-x64-flutter-release.zip Invoke-WebRequest -Uri https://github.com/Kingtous/engine/releases/download/v3.7.0-rustdesk/windows-x64-release-flutter.zip -OutFile windows-x64-flutter-release.zip
Expand-Archive windows-x64-flutter-release.zip -DestinationPath engine Expand-Archive windows-x64-flutter-release.zip -DestinationPath engine
mv -Force engine/* C:/hostedtoolcache/windows/flutter/stable-3.0.5-x64/bin/cache/artifacts/engine/windows-x64-release/ mv -Force engine/* C:/hostedtoolcache/windows/flutter/stable-${{ env.FLUTTER_VERSION }}-x64/bin/cache/artifacts/engine/windows-x64-release/
- name: Install Rust toolchain - name: Install Rust toolchain
uses: actions-rs/toolchain@v1 uses: actions-rs/toolchain@v1
@ -1002,9 +1002,9 @@ jobs:
# clone repo and reset to flutter 3.0.5 # clone repo and reset to flutter 3.0.5
git clone https://github.com/sony/flutter-elinux.git || true git clone https://github.com/sony/flutter-elinux.git || true
pushd flutter-elinux pushd flutter-elinux
# reset to flutter 3.0.5 # reset to flutter 3.7.0
git fetch git fetch
git reset --hard b09a90eee643859ce4e676839227edd9fd3feba8 git reset --hard 51a1d685901f79fbac51665a967c3a1a789ecee5
popd popd
- uses: Kingtous/run-on-arch-action@amd64-support - uses: Kingtous/run-on-arch-action@amd64-support

2
flutter/macos/Runner/MainFlutterWindow.swift
View File

@ -7,7 +7,7 @@ import desktop_drop
import device_info_plus_macos import device_info_plus_macos
import flutter_custom_cursor import flutter_custom_cursor
import package_info_plus_macos import package_info_plus_macos
import path_provider_macos import path_provider_foundation
import screen_retriever import screen_retriever
import sqflite import sqflite
// import tray_manager // import tray_manager

2
flutter/pubspec.yaml
View File

@ -31,7 +31,7 @@ dependencies:
# Use with the CupertinoIcons class for iOS style icons. # Use with the CupertinoIcons class for iOS style icons.
cupertino_icons: ^1.0.3 cupertino_icons: ^1.0.3
ffi: ^2.0.1 ffi: ^2.0.1
path_provider: ^2.0.2 path_provider: ^2.0.12
external_path: ^1.0.1 external_path: ^1.0.1
provider: ^6.0.3 provider: ^6.0.3
tuple: ^2.0.0 tuple: ^2.0.0