From cdd8cefb27b26e66cc6124bea6e145fd56cc77a5 Mon Sep 17 00:00:00 2001 From: Tony Date: Fri, 26 Jun 2026 01:40:20 +0800 Subject: [PATCH] Point Flutter defaults at GitHub fork --- OPEN_SOURCE_REPLACEMENTS.md | 6 +++--- bin/shorebird.ps1 | 2 +- docs/getting-started/flutter-version/README.md | 2 +- packages/open_aot_patch_tools/doc/open_aot_patch_design.md | 2 +- packages/shorebird_cli/lib/src/shorebird_flutter.dart | 2 +- third_party/flutter/bin/internal/shared.sh | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/OPEN_SOURCE_REPLACEMENTS.md b/OPEN_SOURCE_REPLACEMENTS.md index 725674e9..5fa8778b 100644 --- a/OPEN_SOURCE_REPLACEMENTS.md +++ b/OPEN_SOURCE_REPLACEMENTS.md @@ -19,8 +19,8 @@ The combined workspace provides these open replacements: | Artifact mirror/proxy | `packages/artifact_proxy` | | Runtime updater library | `../updater/library`, linked into the Flutter engine by `../scripts/sync_open_sources.sh` | | Patch artifact generator | `../updater/patch` and `packages/open_aot_patch_tools` | -| Flutter engine and Flutter tool defaults | `../flutter`, linked to `../dart-sdk-new` and `../updater` | -| Dart VM patch runtime | `../dart-sdk-new` | +| Flutter engine and Flutter tool defaults | `../flutter`, linked to `../dart-sdk` and `../updater` | +| Dart VM patch runtime | `../dart-sdk` | Run source linking from the workspace root: @@ -31,7 +31,7 @@ Run source linking from the workspace root: The script links: ```text -flutter/engine/src/flutter/third_party/dart -> dart-sdk-new +flutter/engine/src/flutter/third_party/dart -> dart-sdk flutter/engine/src/flutter/third_party/updater -> updater ``` diff --git a/bin/shorebird.ps1 b/bin/shorebird.ps1 index 517bc355..778c0def 100644 --- a/bin/shorebird.ps1 +++ b/bin/shorebird.ps1 @@ -15,7 +15,7 @@ $flutterPath = [IO.Path]::Combine($shorebirdCacheDir, "flutter", $flutterVersion $flutter = [IO.Path]::Combine($shorebirdCacheDir, "flutter", $flutterVersion, "bin", "flutter.bat") $shorebirdScript = [IO.Path]::Combine($shorebirdCliDir, "bin", "shorebird.dart") $dart = [IO.Path]::Combine($flutterPath, "bin", "cache", "dart-sdk", "bin", "dart.exe") -$defaultFlutterGitUrl = "https://git.tonycloud.org/flutter/flutter.git" +$defaultFlutterGitUrl = "https://github.com/tony-cloud/flutter.git" $defaultFlutterStorageBaseUrl = "http://localhost:8080/download.flutter.io" # Executes $command and redirects as much output to $null as possible. diff --git a/docs/getting-started/flutter-version/README.md b/docs/getting-started/flutter-version/README.md index 2d40059b..31288fee 100644 --- a/docs/getting-started/flutter-version/README.md +++ b/docs/getting-started/flutter-version/README.md @@ -4,7 +4,7 @@ This workspace builds against the open Flutter fork configured in `SHOREBIRD_FLUTTER_GIT_URL`, which defaults to: ```text -https://git.tonycloud.org/flutter/flutter.git +https://github.com/tony-cloud/flutter.git ``` Use `shorebird flutter versions list` to inspect versions known to the local diff --git a/packages/open_aot_patch_tools/doc/open_aot_patch_design.md b/packages/open_aot_patch_tools/doc/open_aot_patch_design.md index fce330bc..db90997a 100644 --- a/packages/open_aot_patch_tools/doc/open_aot_patch_design.md +++ b/packages/open_aot_patch_tools/doc/open_aot_patch_design.md @@ -101,7 +101,7 @@ and writes the file that the engine patch cache can map before isolate startup. The host proof app is `testapps/license_flavor_patch_test`. Run: ```powershell -dart-sdk-new\tools\sdks\dart-sdk\bin\dart.exe testapps\license_flavor_patch_test\tool\verify_aot_patch.dart +dart-sdk\tools\sdks\dart-sdk\bin\dart.exe testapps\license_flavor_patch_test\tool\verify_aot_patch.dart ``` It compiles a `free` base AOT snapshot and a `pro` patch snapshot, reuses the diff --git a/packages/shorebird_cli/lib/src/shorebird_flutter.dart b/packages/shorebird_cli/lib/src/shorebird_flutter.dart index 7f6fa723..cbc6a08a 100644 --- a/packages/shorebird_cli/lib/src/shorebird_flutter.dart +++ b/packages/shorebird_cli/lib/src/shorebird_flutter.dart @@ -32,7 +32,7 @@ class ShorebirdFlutter { /// The Shorebird Flutter fork git URL. static const String defaultFlutterGitUrl = - 'https://git.tonycloud.org/flutter/flutter.git'; + 'https://github.com/tony-cloud/flutter.git'; /// The Flutter fork git URL used when installing vended Flutter revisions. String get flutterGitUrl { diff --git a/third_party/flutter/bin/internal/shared.sh b/third_party/flutter/bin/internal/shared.sh index 6c84955a..a4a6dc55 100755 --- a/third_party/flutter/bin/internal/shared.sh +++ b/third_party/flutter/bin/internal/shared.sh @@ -11,7 +11,7 @@ unset CDPATH # Either clones or pulls the configured Flutter repository, depending on # whether FLUTTER_PATH exists. function update_flutter { - local flutter_git_url="${SHOREBIRD_FLUTTER_GIT_URL:-https://git.tonycloud.org/flutter/flutter.git}" + local flutter_git_url="${SHOREBIRD_FLUTTER_GIT_URL:-https://github.com/tony-cloud/flutter.git}" local flutter_storage_base_url="${SHOREBIRD_FLUTTER_STORAGE_BASE_URL:-${FLUTTER_STORAGE_BASE_URL:-http://localhost:8080/download.flutter.io}}" if [[ -d "$FLUTTER_PATH" ]]; then