linux/android

Author: bryangerlach

.github/workflows/generator-android.yml

@@ -286,17 +286,6 @@ jobs:
           prefix-key: rustdesk-lib-cache-android # TODO: drop '-android' part after caches are invalidated
           key: ${{ matrix.job.target }}
 
-      - name: fix android for flutter 3.13
-        if: $${{ env.ANDROID_FLUTTER_VERSION == '3.13.9' }}
-        run: |
-          cd flutter
-          sed -i 's/uni_links_desktop/#uni_links_desktop/g' pubspec.yaml
-          sed -i 's/extended_text: .*/extended_text: 11.1.0/' pubspec.yaml
-          flutter pub get
-          cd lib
-          find . | grep dart | xargs sed -i 's/textScaler: TextScaler.linear(\(.*\)),/textScaleFactor: \1,/g'
-          cd ../..
-
       ###########################################################echo "${{ inputs.iconbase64 }}" | base64 -d > ./res/icon.png
       - name: icon stuff
         if: ${{ inputs.iconlink != 'false' }}
@@ -466,7 +455,7 @@ jobs:
               convert ./res/icon.png ./res/scalable.svg
             fi
             # build flutter
-            pushd flutter && sed -i -e 's/extended_text: 14.0.0/extended_text: 13.0.0/g' pubspec.yaml && flutter pub get
+            pushd flutter
             flutter build apk "--${{ matrix.job.reltype }}" --target-platform android-arm64 --split-per-abi
             mv build/app/outputs/flutter-apk/app-arm64-v8a-${{ matrix.job.reltype }}.apk ../rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}${{ matrix.job.suffix }}.apk
             ;;
@@ -483,7 +472,7 @@ jobs:
                 convert ./res/icon.png ./res/scalable.svg
               fi
               # build flutter
-              pushd flutter && sed -i -e 's/extended_text: 14.0.0/extended_text: 13.0.0/g' pubspec.yaml && flutter pub get
+              pushd flutter
               flutter build apk "--${{ matrix.job.reltype }}" --target-platform android-arm --split-per-abi
               mv build/app/outputs/flutter-apk/app-armeabi-v7a-${{ matrix.job.reltype }}.apk ../rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}${{ matrix.job.suffix }}.apk
             ;;
@@ -500,7 +489,7 @@ jobs:
                 convert ./res/icon.png ./res/scalable.svg
               fi
               # build flutter
-              pushd flutter && sed -i -e 's/extended_text: 14.0.0/extended_text: 13.0.0/g' pubspec.yaml && flutter pub get
+              pushd flutter
               flutter build apk "--${{ matrix.job.reltype }}" --target-platform android-x64 --split-per-abi
               mv build/app/outputs/flutter-apk/app-x86_64-${{ matrix.job.reltype }}.apk ../rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}${{ matrix.job.suffix }}.apk
             ;;
@@ -517,7 +506,7 @@ jobs:
                 convert ./res/icon.png ./res/scalable.svg
               fi
               # build flutter
-              pushd flutter && sed -i -e 's/extended_text: 14.0.0/extended_text: 13.0.0/g' pubspec.yaml && flutter pub get
+              pushd flutter
               flutter build apk "--${{ matrix.job.reltype }}" --target-platform android-x86 --split-per-abi
               mv build/app/outputs/flutter-apk/app-x86-${{ matrix.job.reltype }}.apk ../rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}${{ matrix.job.suffix }}.apk
             ;;

.github/workflows/generator-linux.yml

@@ -466,7 +466,7 @@ jobs:
               ;;
             esac
 
-            if [[ "3.24.4" == ${{ env.FLUTTER_VERSION }} ]]; then
+            if [[ "3.24.5" == ${{ env.FLUTTER_VERSION }} ]]; then
               case ${{ matrix.job.arch }} in
                 aarch64)
                   pushd /opt/flutter-elinux/flutter
@@ -497,7 +497,8 @@ jobs:
               convert ./res/128x128.png -resize 200% ./flutter/assets/128x128@2x.png
               convert ./res/icon.png ./res/scalable.svg
               pushd ./flutter
-              flutter pub run flutter_launcher_icons
+              flutter pub get
+              dart run flutter_launcher_icons
               popd
             fi
             python3 ./build.py --flutter --skip-cargo