diff --git a/DEPS b/DEPS index 9d33dd46918..3167472b926 100644 --- a/DEPS +++ b/DEPS @@ -230,7 +230,7 @@ hooks = [ '--repository-root', '../../../..', '--dart-sdk-directory', '../../../../third_party/dart-sdk/dart-sdk', - '--dirs-to-ignore', 'sky/sdk', + '--dirs-to-ignore', 'sky/packages/sky', ], }, { diff --git a/engine/src/flutter/CONTRIBUTING.md b/engine/src/flutter/CONTRIBUTING.md index e4af425b6a0..c5fde830db5 100644 --- a/engine/src/flutter/CONTRIBUTING.md +++ b/engine/src/flutter/CONTRIBUTING.md @@ -46,7 +46,7 @@ target. Building on MacOS for Android, iOS, and a head-less MacOS target is comi * (Only the first time) `./tools/android/download_android_tools.py` * `./sky/tools/gn --android` * `ninja -C out/android_Debug` -* `./sky/tools/shelldb start out/android_Debug/ sky/sdk/example/hello_world/lib/main.dart` +* `./sky/tools/shelldb start out/android_Debug/ sky/packages/sky/example/hello_world/lib/main.dart` ### Linux (on Linux) @@ -58,7 +58,7 @@ Running the code ---------------- * `./sky/tools/test_sky --debug` runs the tests on the host machine using `out/Debug`. -* `./out/Debug/sky_shell --package-root=out/Debug/gen/dart-pkg/packages sky/sdk/example/hello_world/lib/main.dart` +* `./out/Debug/sky_shell --package-root=sky/packages/workbench/packages sky/packages/sky/example/hello_world/lib/main.dart` Note: Because Linux is headless, you won't see any UI. You can use `print` to generate console output or you can interact with the DartVM via observatory at [http://localhost:8181/](http://localhost:8181/). Contributing code diff --git a/engine/src/flutter/README.md b/engine/src/flutter/README.md index 515f830fa43..6b806c90010 100644 --- a/engine/src/flutter/README.md +++ b/engine/src/flutter/README.md @@ -8,7 +8,7 @@ Sky is optimized for today's, and tomorrow's, mobile devices. We are focused on low-latency input, high frame rates, and we are purely mobile first. - For information about using Sky to build apps, please see - [Getting started with Sky](sky/sdk/README.md). + [Getting started with Sky](sky/packags/sky/README.md). - For information about contributing to Sky, please see [CONTRIBUTING.md](CONTRIBUTING.md). diff --git a/engine/src/flutter/build/config/ios/ios_sim.py b/engine/src/flutter/build/config/ios/ios_sim.py index c48445276d6..ad2557e4a1f 100755 --- a/engine/src/flutter/build/config/ios/ios_sim.py +++ b/engine/src/flutter/build/config/ios/ios_sim.py @@ -93,7 +93,7 @@ def Main(): help='Path to the simulator application.') parser.add_argument('-t', dest='target', required=False, - default='sky/sdk/example/demo_launcher/lib/main.dart', + default='sky/packages/sky/example/demo_launcher/lib/main.dart', help='Sky server-relative path to the Sky app to run.') parser.add_argument('-s', dest='server', required=False, diff --git a/engine/src/flutter/sky/BUILD.gn b/engine/src/flutter/sky/BUILD.gn index 47a5910c3e5..a649bc8e277 100644 --- a/engine/src/flutter/sky/BUILD.gn +++ b/engine/src/flutter/sky/BUILD.gn @@ -8,7 +8,7 @@ group("sky") { deps = [ "//sky/engine/platform:platform_unittests($host_toolchain)", "//sky/engine/wtf:unittests($host_toolchain)", - "//sky/sdk/example", + "//sky/packages/sky/example", "//sky/tools/imagediff($host_toolchain)", "//sky/tools/sky_snapshot($host_toolchain)", ":sky_dev", @@ -24,8 +24,7 @@ group("sky_dev") { deps = [ "//sky/packages", - "//sky/sdk", - "//sky/sdk/example/demo_launcher", + "//sky/packages/sky/example/demo_launcher", "//sky/shell", ] diff --git a/engine/src/flutter/sky/packages/workbench/BUILD.gn b/engine/src/flutter/sky/packages/workbench/BUILD.gn index cc315559f29..be852bdbc3f 100644 --- a/engine/src/flutter/sky/packages/workbench/BUILD.gn +++ b/engine/src/flutter/sky/packages/workbench/BUILD.gn @@ -6,7 +6,7 @@ action("init") { stamp = "$target_gen_dir/sky_init.stamp" script = "//sky/build/sky_init.py" - sources = [ "//sky/sdk/pubspec.yaml" ] + sources = [ "//sky/packages/sky/pubspec.yaml" ] outputs = [ stamp ] args = [ diff --git a/engine/src/flutter/sky/packages/workbench/pubspec.yaml b/engine/src/flutter/sky/packages/workbench/pubspec.yaml index aa07df07c26..71cf74913b0 100644 --- a/engine/src/flutter/sky/packages/workbench/pubspec.yaml +++ b/engine/src/flutter/sky/packages/workbench/pubspec.yaml @@ -10,6 +10,6 @@ dependency_overrides: material_design_icons: path: ../material_design_icons sky: - path: ../../sdk + path: ../sky environment: sdk: '>=1.8.0 <2.0.0' diff --git a/engine/src/flutter/sky/tools/big_red_button.py b/engine/src/flutter/sky/tools/big_red_button.py index 112e06fe133..1a84759af10 100755 --- a/engine/src/flutter/sky/tools/big_red_button.py +++ b/engine/src/flutter/sky/tools/big_red_button.py @@ -96,7 +96,7 @@ def main(): pub_path = os.path.join(dart_sdk_root, 'bin/pub') android_dist_root = os.path.join(sky_engine_root, 'out/android_Release/dist') linux_dist_root = os.path.join(sky_engine_root, 'out/Release/dist') - sky_package_root = os.path.join(sky_engine_root, 'sky/sdk') + sky_package_root = os.path.join(sky_engine_root, 'sky/packages/sky') sky_engine_package_root = os.path.join(android_dist_root, 'packages/sky_engine/sky_engine') sky_services_package_root = os.path.join(android_dist_root, 'packages/sky_services/sky_services') @@ -112,7 +112,7 @@ def main(): run(sky_engine_root, ['sky/tools/gn', '--release']) run(sky_engine_root, ['ninja', '-C', 'out/Release', ':dist']) - run(sky_engine_root, ['cp', 'AUTHORS', 'LICENSE', 'sky/sdk']) + run(sky_engine_root, ['cp', 'AUTHORS', 'LICENSE', sky_package_root]) upload_artifacts(android_dist_root, 'android-arm', commit_hash) upload_artifacts(linux_dist_root, 'linux-x64', commit_hash) diff --git a/engine/src/flutter/sky/tools/roll_versions.py b/engine/src/flutter/sky/tools/roll_versions.py index e74259b66d1..5e5e9e7d8e1 100755 --- a/engine/src/flutter/sky/tools/roll_versions.py +++ b/engine/src/flutter/sky/tools/roll_versions.py @@ -10,12 +10,12 @@ import xml.etree.ElementTree as ET PUBSPECS = [ + 'sky/packages/sky/pubspec.yaml', 'sky/packages/sky_engine/pubspec.yaml', - 'sky/sdk/pubspec.yaml', ] MANIFESTS = [ - 'sky/sdk/example/demo_launcher/apk/AndroidManifest.xml', + 'sky/packages/sky/example/demo_launcher/apk/AndroidManifest.xml', ] MANIFEST_PREFACE = '''