diff --git a/.gitmodules b/.gitmodules index 9342dd4..7543e3c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -14,10 +14,6 @@ path = shorebird url = https://git.tonycloud.org/flutter/shorebird.git branch = main -[submodule "shorebird-engine"] - path = shorebird-engine - url = https://github.com/shorebirdtech/engine.git - branch = shorebird/dev [submodule "shorebird-server"] path = shorebird-server url = https://git.tonycloud.org/flutter/shorebird-server.git diff --git a/README.md b/README.md index fae2197..58f211d 100644 --- a/README.md +++ b/README.md @@ -10,9 +10,8 @@ platform scripts in this root repository. | Path | Role | Remote | Branch | | --- | --- | --- | --- | | `dart-sdk-new` | Dart SDK fork with AOT patch runtime work | `https://git.tonycloud.org/dart-lang/sdk.git` | `tonycloud/dev` | -| `flutter` | Flutter fork used by app and engine integration tests | `https://git.tonycloud.org/flutter/flutter.git` | `shorebird/dev` | +| `flutter` | Flutter fork used by app and engine integration tests; engine sources live under `flutter/engine/src/flutter` | `https://git.tonycloud.org/flutter/flutter.git` | `shorebird/dev` | | `shorebird` | CLI, protocol/client packages, open patch tools | `https://git.tonycloud.org/flutter/shorebird.git` | `main` | -| `shorebird-engine` | Shorebird engine reference checkout | `https://github.com/shorebirdtech/engine.git` | `shorebird/dev` | | `shorebird-server` | Self-hosted CodePush/auth/management server | `https://git.tonycloud.org/flutter/shorebird-server.git` | `main` | | `updater` | Runtime updater and patch package tooling | `https://git.tonycloud.org/flutter/shorebird-updater.git` | `main` | | `depot_tools` | Chromium/Dart checkout tooling | `https://chromium.googlesource.com/chromium/tools/depot_tools.git` | `main` | diff --git a/docs/REPOSITORIES.md b/docs/REPOSITORIES.md index 1e9fb6e..1c2f8b9 100644 --- a/docs/REPOSITORIES.md +++ b/docs/REPOSITORIES.md @@ -10,10 +10,15 @@ Last verified: 2026-06-24. | `depot_tools` | `https://chromium.googlesource.com/chromium/tools/depot_tools.git` | `main` | `90f5d4d14de66a5aae4a55b554ad4565111169af` | | `flutter` | `https://git.tonycloud.org/flutter/flutter.git` | `shorebird/dev` | `9754ce03d76fb06c23a72ddbd8b7137bfa85446c` | | `shorebird` | `https://git.tonycloud.org/flutter/shorebird.git` | `main` | `c824005c2dc65f56b0fa078984fadb649876fce7` | -| `shorebird-engine` | `https://github.com/shorebirdtech/engine.git` | `shorebird/dev` | `e4575c7403bd3453d04bfa03e01218e5a0bca0c6` | | `shorebird-server` | `https://git.tonycloud.org/flutter/shorebird-server.git` | `main` | `774954fce70181846995ebcad842e9c54e57f1a2` | | `updater` | `https://git.tonycloud.org/flutter/shorebird-updater.git` | `main` | `3ac748ff28eb4ebb53630c66230b9b1be5df73c2` | +## Removed Top-Level Repositories + +| Path | Previous remote URL | Reason | +| --- | --- | --- | +| `shorebird-engine` | `https://github.com/shorebirdtech/engine.git` | Separate Flutter engine checkouts are obsolete for this workspace. The archived upstream engine repository points contributors to `flutter/flutter/engine`, and this workspace's `flutter` submodule already contains `flutter/engine/src/flutter`. | + ## Generated Or Obsolete Root Folders The following root folders are not part of the meta-workspace and can be diff --git a/shorebird-engine b/shorebird-engine deleted file mode 160000 index e4575c7..0000000 --- a/shorebird-engine +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e4575c7403bd3453d04bfa03e01218e5a0bca0c6