From 4aa37568355965239f3846df47f861b289d806fc Mon Sep 17 00:00:00 2001 From: Adam Barth Date: Wed, 27 Apr 2016 17:32:06 -0700 Subject: [PATCH] Move cassowary into package:flutter (#3591) Cassowary doesn't have any additional dependencies and this simplifies things. Fixes #2442 --- examples/layers/rendering/autolayout.dart | 2 +- examples/layers/widgets/autolayout.dart | 2 +- packages/cassowary/lib/cassowary.dart | 28 ------------------- packages/cassowary/pubspec.yaml | 10 ------- packages/cassowary/test/all.dart | 9 ------ packages/flutter/lib/cassowary.dart | 27 ++++++++++++++++++ .../{ => flutter/lib/src}/cassowary/README.md | 0 .../lib/src/cassowary}/constant_member.dart | 2 +- .../lib/src/cassowary}/constraint.dart | 2 +- .../lib/src/cassowary}/equation_member.dart | 2 +- .../lib/src/cassowary}/expression.dart | 2 +- .../lib/src/cassowary}/param.dart | 2 +- .../lib/src/cassowary}/parser_exception.dart | 2 +- .../lib/src/cassowary}/priority.dart | 2 +- .../lib/src/cassowary}/result.dart | 2 +- .../lib/src/cassowary}/solver.dart | 2 +- .../lib/src/cassowary}/term.dart | 2 +- .../lib/src/rendering/auto_layout.dart | 2 +- packages/flutter/pubspec.yaml | 3 -- .../test/cassowary}/cassowary_test.dart | 4 +-- travis/test.sh | 1 - 21 files changed, 42 insertions(+), 66 deletions(-) delete mode 100644 packages/cassowary/lib/cassowary.dart delete mode 100644 packages/cassowary/pubspec.yaml delete mode 100644 packages/cassowary/test/all.dart create mode 100644 packages/flutter/lib/cassowary.dart rename packages/{ => flutter/lib/src}/cassowary/README.md (100%) rename packages/{cassowary/lib/src => flutter/lib/src/cassowary}/constant_member.dart (91%) rename packages/{cassowary/lib/src => flutter/lib/src/cassowary}/constraint.dart (93%) rename packages/{cassowary/lib/src => flutter/lib/src/cassowary}/equation_member.dart (92%) rename packages/{cassowary/lib/src => flutter/lib/src/cassowary}/expression.dart (98%) rename packages/{cassowary/lib/src => flutter/lib/src/cassowary}/param.dart (94%) rename packages/{cassowary/lib/src => flutter/lib/src/cassowary}/parser_exception.dart (88%) rename packages/{cassowary/lib/src => flutter/lib/src/cassowary}/priority.dart (95%) rename packages/{cassowary/lib/src => flutter/lib/src/cassowary}/result.dart (94%) rename packages/{cassowary/lib/src => flutter/lib/src/cassowary}/solver.dart (99%) rename packages/{cassowary/lib/src => flutter/lib/src/cassowary}/term.dart (92%) rename packages/{cassowary/test => flutter/test/cassowary}/cassowary_test.dart (99%) diff --git a/examples/layers/rendering/autolayout.dart b/examples/layers/rendering/autolayout.dart index 1256eee306e..7402b484ceb 100644 --- a/examples/layers/rendering/autolayout.dart +++ b/examples/layers/rendering/autolayout.dart @@ -5,7 +5,7 @@ // This example shows how to use the Cassowary autolayout system directly in the // underlying render tree. -import 'package:cassowary/cassowary.dart' as al; +import 'package:flutter/cassowary.dart' as al; import 'package:flutter/rendering.dart'; class _MyAutoLayoutDelegate extends AutoLayoutDelegate { diff --git a/examples/layers/widgets/autolayout.dart b/examples/layers/widgets/autolayout.dart index 1dba64ea030..5f6aed9d218 100644 --- a/examples/layers/widgets/autolayout.dart +++ b/examples/layers/widgets/autolayout.dart @@ -4,7 +4,7 @@ // This example shows how to use the Cassowary autolayout system with widgets. -import 'package:cassowary/cassowary.dart' as al; +import 'package:flutter/cassowary.dart' as al; import 'package:flutter/widgets.dart'; class _MyAutoLayoutDelegate extends AutoLayoutDelegate { diff --git a/packages/cassowary/lib/cassowary.dart b/packages/cassowary/lib/cassowary.dart deleted file mode 100644 index 905bf933f21..00000000000 --- a/packages/cassowary/lib/cassowary.dart +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (c) 2015 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -/// An implementation of the Cassowary constraint solving algorithm in Dart. -/// -/// This library is not meant to be imported by developers. -/// It will soon be integrated into another Flutter library. -/// -/// This is used by the [RenderAutoLayout] render object in the rendering -/// library and by the [AutoLayout] widget in the widget library. -/// -/// See also: -/// -/// * -/// * -library cassowary; - -export 'src/constraint.dart'; -export 'src/expression.dart'; -export 'src/term.dart'; -export 'src/equation_member.dart'; -export 'src/constant_member.dart'; -export 'src/solver.dart'; -export 'src/result.dart'; -export 'src/parser_exception.dart'; -export 'src/param.dart'; -export 'src/priority.dart'; diff --git a/packages/cassowary/pubspec.yaml b/packages/cassowary/pubspec.yaml deleted file mode 100644 index 72d5cf58e79..00000000000 --- a/packages/cassowary/pubspec.yaml +++ /dev/null @@ -1,10 +0,0 @@ -name: cassowary -description: Cassowary Constraint Solving Toolkit -version: 0.1.7 -author: Flutter Authors -homepage: https://github.com/flutter/flutter/tree/master/packages/cassowary -environment: - sdk: '>=1.0.0 <2.0.0' -dev_dependencies: - flutter_test: - path: ../flutter_test diff --git a/packages/cassowary/test/all.dart b/packages/cassowary/test/all.dart deleted file mode 100644 index 12c794f61c2..00000000000 --- a/packages/cassowary/test/all.dart +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) 2016 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -import 'cassowary_test.dart' as cassowary_test; - -void main() { - cassowary_test.main(); -} diff --git a/packages/flutter/lib/cassowary.dart b/packages/flutter/lib/cassowary.dart new file mode 100644 index 00000000000..196fda6af9b --- /dev/null +++ b/packages/flutter/lib/cassowary.dart @@ -0,0 +1,27 @@ +// Copyright 2016 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +/// An implementation of the Cassowary constraint solving algorithm in Dart. +/// +/// To use, import `package:flutter/cassowary.dart`. +/// +/// This is used by the [RenderAutoLayout] render object in the rendering +/// library and by the [AutoLayout] widget in the widget library. +/// +/// See also: +/// +/// * +/// * +library cassowary; + +export 'src/cassowary/constraint.dart'; +export 'src/cassowary/expression.dart'; +export 'src/cassowary/term.dart'; +export 'src/cassowary/equation_member.dart'; +export 'src/cassowary/constant_member.dart'; +export 'src/cassowary/solver.dart'; +export 'src/cassowary/result.dart'; +export 'src/cassowary/parser_exception.dart'; +export 'src/cassowary/param.dart'; +export 'src/cassowary/priority.dart'; diff --git a/packages/cassowary/README.md b/packages/flutter/lib/src/cassowary/README.md similarity index 100% rename from packages/cassowary/README.md rename to packages/flutter/lib/src/cassowary/README.md diff --git a/packages/cassowary/lib/src/constant_member.dart b/packages/flutter/lib/src/cassowary/constant_member.dart similarity index 91% rename from packages/cassowary/lib/src/constant_member.dart rename to packages/flutter/lib/src/cassowary/constant_member.dart index 0e2fbb14525..3ab53211cba 100644 --- a/packages/cassowary/lib/src/constant_member.dart +++ b/packages/flutter/lib/src/cassowary/constant_member.dart @@ -1,4 +1,4 @@ -// Copyright (c) 2015 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/packages/cassowary/lib/src/constraint.dart b/packages/flutter/lib/src/cassowary/constraint.dart similarity index 93% rename from packages/cassowary/lib/src/constraint.dart rename to packages/flutter/lib/src/cassowary/constraint.dart index 4820ad8ae32..7936e7d30e4 100644 --- a/packages/cassowary/lib/src/constraint.dart +++ b/packages/flutter/lib/src/cassowary/constraint.dart @@ -1,4 +1,4 @@ -// Copyright (c) 2015 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/packages/cassowary/lib/src/equation_member.dart b/packages/flutter/lib/src/cassowary/equation_member.dart similarity index 92% rename from packages/cassowary/lib/src/equation_member.dart rename to packages/flutter/lib/src/cassowary/equation_member.dart index dc7118b8ce8..55cf5726be4 100644 --- a/packages/cassowary/lib/src/equation_member.dart +++ b/packages/flutter/lib/src/cassowary/equation_member.dart @@ -1,4 +1,4 @@ -// Copyright (c) 2015 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/packages/cassowary/lib/src/expression.dart b/packages/flutter/lib/src/cassowary/expression.dart similarity index 98% rename from packages/cassowary/lib/src/expression.dart rename to packages/flutter/lib/src/cassowary/expression.dart index c1a0a20d97f..b8e655bfa1c 100644 --- a/packages/cassowary/lib/src/expression.dart +++ b/packages/flutter/lib/src/cassowary/expression.dart @@ -1,4 +1,4 @@ -// Copyright (c) 2015 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/packages/cassowary/lib/src/param.dart b/packages/flutter/lib/src/cassowary/param.dart similarity index 94% rename from packages/cassowary/lib/src/param.dart rename to packages/flutter/lib/src/cassowary/param.dart index be920a30bc0..2cad6903478 100644 --- a/packages/cassowary/lib/src/param.dart +++ b/packages/flutter/lib/src/cassowary/param.dart @@ -1,4 +1,4 @@ -// Copyright (c) 2015 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/packages/cassowary/lib/src/parser_exception.dart b/packages/flutter/lib/src/cassowary/parser_exception.dart similarity index 88% rename from packages/cassowary/lib/src/parser_exception.dart rename to packages/flutter/lib/src/cassowary/parser_exception.dart index 5cc56492337..543b61004b2 100644 --- a/packages/cassowary/lib/src/parser_exception.dart +++ b/packages/flutter/lib/src/cassowary/parser_exception.dart @@ -1,4 +1,4 @@ -// Copyright (c) 2015 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/packages/cassowary/lib/src/priority.dart b/packages/flutter/lib/src/cassowary/priority.dart similarity index 95% rename from packages/cassowary/lib/src/priority.dart rename to packages/flutter/lib/src/cassowary/priority.dart index 5e66a8092f5..ab500f3834b 100644 --- a/packages/cassowary/lib/src/priority.dart +++ b/packages/flutter/lib/src/cassowary/priority.dart @@ -1,4 +1,4 @@ -// Copyright (c) 2015 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/packages/cassowary/lib/src/result.dart b/packages/flutter/lib/src/cassowary/result.dart similarity index 94% rename from packages/cassowary/lib/src/result.dart rename to packages/flutter/lib/src/cassowary/result.dart index daeb174853d..43528169371 100644 --- a/packages/cassowary/lib/src/result.dart +++ b/packages/flutter/lib/src/cassowary/result.dart @@ -1,4 +1,4 @@ -// Copyright (c) 2015 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/packages/cassowary/lib/src/solver.dart b/packages/flutter/lib/src/cassowary/solver.dart similarity index 99% rename from packages/cassowary/lib/src/solver.dart rename to packages/flutter/lib/src/cassowary/solver.dart index 8e981488969..0f66b6cc67a 100644 --- a/packages/cassowary/lib/src/solver.dart +++ b/packages/flutter/lib/src/cassowary/solver.dart @@ -1,4 +1,4 @@ -// Copyright (c) 2015 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/packages/cassowary/lib/src/term.dart b/packages/flutter/lib/src/cassowary/term.dart similarity index 92% rename from packages/cassowary/lib/src/term.dart rename to packages/flutter/lib/src/cassowary/term.dart index 9a1722333b1..59840bc2571 100644 --- a/packages/cassowary/lib/src/term.dart +++ b/packages/flutter/lib/src/cassowary/term.dart @@ -1,4 +1,4 @@ -// Copyright (c) 2015 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/packages/flutter/lib/src/rendering/auto_layout.dart b/packages/flutter/lib/src/rendering/auto_layout.dart index 5579e95bc76..73e6807ef17 100644 --- a/packages/flutter/lib/src/rendering/auto_layout.dart +++ b/packages/flutter/lib/src/rendering/auto_layout.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:cassowary/cassowary.dart' as al; // "auto layout" +import 'package:flutter/cassowary.dart' as al; // "auto layout" import 'box.dart'; import 'object.dart'; diff --git a/packages/flutter/pubspec.yaml b/packages/flutter/pubspec.yaml index ffcdf467c10..c634191a7ad 100644 --- a/packages/flutter/pubspec.yaml +++ b/packages/flutter/pubspec.yaml @@ -19,9 +19,6 @@ dependencies: sky_services: path: ../../bin/cache/pkg/sky_services - cassowary: - path: ../cassowary - dev_dependencies: flutter_test: path: ../flutter_test diff --git a/packages/cassowary/test/cassowary_test.dart b/packages/flutter/test/cassowary/cassowary_test.dart similarity index 99% rename from packages/cassowary/test/cassowary_test.dart rename to packages/flutter/test/cassowary/cassowary_test.dart index afa0c802388..ac691878091 100644 --- a/packages/cassowary/test/cassowary_test.dart +++ b/packages/flutter/test/cassowary/cassowary_test.dart @@ -1,10 +1,10 @@ -// Copyright (c) 2015 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. import 'package:test/test.dart'; -import 'package:cassowary/cassowary.dart'; +import 'package:flutter/cassowary.dart'; void main() { test('variable', () { diff --git a/travis/test.sh b/travis/test.sh index f9cd5374f95..d4c5bf2ad62 100755 --- a/travis/test.sh +++ b/travis/test.sh @@ -10,7 +10,6 @@ flutter analyze --flutter-repo # //chrome_infra/build/scripts/slave/recipes/flutter/flutter.py # see https://github.com/flutter/flutter/blob/master/infra/README.md -(cd packages/cassowary; dart -c test/all.dart) (cd packages/flutter; flutter test) (cd packages/flutter_driver; dart -c test/all.dart) (cd packages/flutter_sprites; flutter test)