-
Notifications
You must be signed in to change notification settings - Fork 124
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conflicts and compatibility with different flutter versions #5
Comments
This problem happens as the patch is created using the latest master, and might fail when applying to other flutter version. c.aspectd.dart So @xiaobeibeinihao , though the main logic remains, the patch could vary a bit for different flutter versions. For flutter v1.5.4-hotfix2, you can solve it with commands below: It will work as expected. |
@xiaobeibeinihao |
你好,想请教下是什么原因? |
@newkisky |
This patch issue will remain until flutter/flutter#36738 is resolved and merged into flutter master. |
Error Flutter [✓] Android toolchain - develop for Android devices (Android SDK version 28.0.3) |
@Code-Yeong |
@xiaobeibeinihao |
@maheshmnj |
So I don't have to change flutter channel I can use aspectd on stable channel right? |
@maheshmnj |
@LinLeyang kylewong@KyleWongdeMacBook-Pro flutter % git apply --3way /Users/kylewong/Codes/Flutter/alibaba-flutter/aspectd/0001-aspectd.patch
error: patch failed: packages/flutter_tools/lib/src/commands/build_bundle.dart:140
Falling back to three-way merge...
Applied patch to 'packages/flutter_tools/lib/src/commands/build_bundle.dart' cleanly.
kylewong@KyleWongdeMacBook-Pro flutter % rm bin/cache/flutter_tools.stamp
kylewong@KyleWongdeMacBook-Pro flutter % rm bin/cache/flutter_tools.stamp
rm: bin/cache/flutter_tools.stamp: No such file or directory
kylewong@KyleWongdeMacBook-Pro flutter % flutter doctor -v
Building flutter tool...
Flutter assets will be downloaded from https://storage.flutter-io.cn. Make sure you trust this
source!
Downloading libimobiledevice... |
https://github.com/alibaba-flutter/aspectd/tree/v1.12.13 |
执行:git apply --3way命令报错: $ git apply --3way D:/FlutterAspectD/0001-aspectd.patch D:/FlutterAspectD/0001-aspectd.patch:46: trailing whitespace. >flutter doctor -v [√] Android toolchain - develop for Android devices (Android SDK version 29.0.2) [√] Android Studio (version 3.6) [!] IntelliJ IDEA Community Edition (version 2019.2) [!] VS Code (version 1.37.1) [√] Connected device (1 available) ! Doctor found issues in 2 categories. |
执行 git apply --3way ~/Github/aspectd/0001-aspectd.patch 执行 flutter doctor [!] Android toolchain - develop for Android devices (Android SDK version 30.0.1) ! Doctor found issues in 1 category. |
请问有1.20.2版本的嘛 |
Check aspectd's tag 0.9.8->1.0.0 |
If the flutter version you want is not supported yet, see UPGRADE.md for more. |
git apply --3way ~/src/github/aspectd/0001-aspectd.patch Flutter 1.22.1 • channel stable • https://github.com/flutter/flutter.git aspectd: stable/v1.22.1 请问这个怎么解决 |
Building flutter tool... 运行demo编译报错。 |
On windows, try "git am --reject --whitespace=fix aspects\0001-aspectd.patch" to apply the patch PS C:\Users\kangw\Codes\flutter> git am --reject --whitespace=fix ..\aspectd\0001-aspectd.patch
Checking patch packages/flutter_tools/lib/src/aspectd.dart...
Checking patch packages/flutter_tools/lib/src/build_system/targets/common.dart...
Applied patch packages/flutter_tools/lib/src/aspectd.dart cleanly.
Applied patch packages/flutter_tools/lib/src/build_system/targets/common.dart cleanly.
Applying: for aspectd.patch |
git apply --3way /workspace/flutter/.pub-cache/git/aspectd-3d2bce497612ae4b67d314d1bfdc22c22bc401d0/0001-aspectd.patch [✓] Flutter (Channel stable, 1.22.5, on Mac OS X 10.15.7 19H2 darwin-x64, locale [✓] Android toolchain - develop for Android devices (Android SDK version 30.0.2) [✓] Xcode - develop for iOS and macOS (Xcode 12.3) [✓] Android Studio (version 4.1) [✓] Connected device (1 available) • No issues found! git apply出错 |
环境:Flutter 1.5.4-hotfix.2 , Dart 2.3.0
git apply --3way /Users/cuikuangye/rong360work/androiddemo/aspectd-master/0001-aspectd.patch 我在执行这个命令行的时候报错:
error: patch failed: packages/flutter_tools/lib/src/commands/build_aot.dart:5
error: repository lacks the necessary blob to fall back on 3-way merge.
error: packages/flutter_tools/lib/src/commands/build_aot.dart: patch does not apply
error: patch failed: packages/flutter_tools/lib/src/commands/build_bundle.dart:4
error: repository lacks the necessary blob to fall back on 3-way merge.
error: packages/flutter_tools/lib/src/commands/build_bundle.dart: patch does not apply
The text was updated successfully, but these errors were encountered: