Commit 4aa37568 authored by Adam Barth's avatar Adam Barth

Move cassowary into package:flutter (#3591)

Cassowary doesn't have any additional dependencies and this simplifies things.

Fixes #2442
parent d8f2d018
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
// This example shows how to use the Cassowary autolayout system directly in the // This example shows how to use the Cassowary autolayout system directly in the
// underlying render tree. // underlying render tree.
import 'package:cassowary/cassowary.dart' as al; import 'package:flutter/cassowary.dart' as al;
import 'package:flutter/rendering.dart'; import 'package:flutter/rendering.dart';
class _MyAutoLayoutDelegate extends AutoLayoutDelegate { class _MyAutoLayoutDelegate extends AutoLayoutDelegate {
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
// This example shows how to use the Cassowary autolayout system with widgets. // 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'; import 'package:flutter/widgets.dart';
class _MyAutoLayoutDelegate extends AutoLayoutDelegate { class _MyAutoLayoutDelegate extends AutoLayoutDelegate {
......
name: cassowary
description: Cassowary Constraint Solving Toolkit
version: 0.1.7
author: Flutter Authors <flutter-dev@googlegroups.com>
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
// 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();
}
// 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 // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
/// An implementation of the Cassowary constraint solving algorithm in Dart. /// An implementation of the Cassowary constraint solving algorithm in Dart.
/// ///
/// This library is not meant to be imported by developers. /// To use, import `package:flutter/cassowary.dart`.
/// It will soon be integrated into another Flutter library.
/// ///
/// This is used by the [RenderAutoLayout] render object in the rendering /// This is used by the [RenderAutoLayout] render object in the rendering
/// library and by the [AutoLayout] widget in the widget library. /// library and by the [AutoLayout] widget in the widget library.
...@@ -16,13 +15,13 @@ ...@@ -16,13 +15,13 @@
/// * <https://constraints.cs.washington.edu/solvers/cassowary-tochi.pdf> /// * <https://constraints.cs.washington.edu/solvers/cassowary-tochi.pdf>
library cassowary; library cassowary;
export 'src/constraint.dart'; export 'src/cassowary/constraint.dart';
export 'src/expression.dart'; export 'src/cassowary/expression.dart';
export 'src/term.dart'; export 'src/cassowary/term.dart';
export 'src/equation_member.dart'; export 'src/cassowary/equation_member.dart';
export 'src/constant_member.dart'; export 'src/cassowary/constant_member.dart';
export 'src/solver.dart'; export 'src/cassowary/solver.dart';
export 'src/result.dart'; export 'src/cassowary/result.dart';
export 'src/parser_exception.dart'; export 'src/cassowary/parser_exception.dart';
export 'src/param.dart'; export 'src/cassowary/param.dart';
export 'src/priority.dart'; export 'src/cassowary/priority.dart';
// 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 // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
......
// 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 // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
......
// 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 // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
......
// 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 // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
......
// 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 // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
......
// 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 // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
......
// 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 // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
......
// 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 // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
......
// 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 // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
......
// 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 // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // 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 'box.dart';
import 'object.dart'; import 'object.dart';
......
...@@ -19,9 +19,6 @@ dependencies: ...@@ -19,9 +19,6 @@ dependencies:
sky_services: sky_services:
path: ../../bin/cache/pkg/sky_services path: ../../bin/cache/pkg/sky_services
cassowary:
path: ../cassowary
dev_dependencies: dev_dependencies:
flutter_test: flutter_test:
path: ../flutter_test path: ../flutter_test
......
// 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 // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
import 'package:test/test.dart'; import 'package:test/test.dart';
import 'package:cassowary/cassowary.dart'; import 'package:flutter/cassowary.dart';
void main() { void main() {
test('variable', () { test('variable', () {
......
...@@ -10,7 +10,6 @@ flutter analyze --flutter-repo ...@@ -10,7 +10,6 @@ flutter analyze --flutter-repo
# //chrome_infra/build/scripts/slave/recipes/flutter/flutter.py # //chrome_infra/build/scripts/slave/recipes/flutter/flutter.py
# see https://github.com/flutter/flutter/blob/master/infra/README.md # 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; flutter test)
(cd packages/flutter_driver; dart -c test/all.dart) (cd packages/flutter_driver; dart -c test/all.dart)
(cd packages/flutter_sprites; flutter test) (cd packages/flutter_sprites; flutter test)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment