Update to use package:observable & latest package:observe

CHANGELOG.md

@@ -1,3 +1,6 @@
+#### 0.16.4+3
+  * Update to use `package:observable`
+
 #### 0.16.4+2
   * Update to transformer_test `0.2.x`.
 

lib/polymer.dart

@@ -46,6 +46,7 @@ import 'dart:js' hide context;
 
 import 'package:initialize/initialize.dart' hide run;
 import 'package:logging/logging.dart';
+import 'package:observable/observable.dart';
 import 'package:observe/observe.dart';
 import 'package:observe/src/dirty_check.dart' show dirtyCheckZone;
 import 'package:polymer_expressions/polymer_expressions.dart'
@@ -59,6 +60,7 @@ import 'auto_binding.dart';
 import 'deserialize.dart' as deserialize;
 
 export 'package:initialize/initialize.dart' show initMethod;
+export 'package:observable/observable.dart';
 export 'package:observe/observe.dart';
 export 'package:observe/html.dart';
 export 'package:web_components/web_components.dart' show HtmlImport;

lib/src/instance.dart

@@ -131,7 +131,7 @@ class ComputedProperty {
 /// Base class for PolymerElements deriving from HtmlElement.
 ///
 /// See [Polymer].
-class PolymerElement extends HtmlElement with Polymer, Observable {
+class PolymerElement extends HtmlElement with Polymer, AutoObservable {
   PolymerElement.created() : super.created() {
     polymerCreated();
   }
@@ -1165,7 +1165,7 @@ abstract class Polymer implements Element, Observable, NodeBindExtension {
 
     // when polyfilling Object.observe, ensure changes
     // propagate before executing the async method
-    scheduleMicrotask(Observable.dirtyCheck);
+    scheduleMicrotask(AutoObservable.dirtyCheck);
     PolymerJs.flush(); // for polymer-js interop
     return new Timer(timeout, method);
   }
@@ -1181,7 +1181,7 @@ abstract class Polymer implements Element, Observable, NodeBindExtension {
   int async(RequestAnimationFrameCallback method) {
     // when polyfilling Object.observe, ensure changes
     // propagate before executing the async method
-    scheduleMicrotask(Observable.dirtyCheck);
+    scheduleMicrotask(AutoObservable.dirtyCheck);
     PolymerJs.flush(); // for polymer-js interop
     return window.requestAnimationFrame(method);
   }

pubspec.yaml

@@ -1,5 +1,5 @@
 name: polymer
-version: 0.16.4+2
+version: 0.16.4+3
 author: Polymer.dart Authors <[email protected]>
 description: >
   Polymer.dart is a new type of library for the web, built on top of Web
@@ -16,7 +16,7 @@ dependencies:
   initialize: '>=0.5.1+3 <0.7.0'
   logging: '>=0.9.2 <0.12.0'
   path: '>=0.9.0 <2.0.0'
-  polymer_expressions: '>=0.12.0 <0.14.0'
+  polymer_expressions: '>=0.13.1+1 <0.14.0'
   polymer_interop: '>=0.1.0+2 <0.2.0'
   smoke: '>=0.2.0 <0.4.0'
   source_maps: '>=0.9.4 <0.11.0'
@@ -28,7 +28,8 @@ dependencies:
   # Because polymer exports observe, it needs to keep its version constraint
   # tight to ensure that a constraint on polymer properly constraints all
   # features it provides.
-  observe: '>=0.13.3 <0.13.4'
+  observe: '^0.14.0'
+  observable: '^0.14.0'
 dev_dependencies:
   test: '^0.12.0'
   transformer_test: '^0.2.0'

test/bind_mdv_test.dart

@@ -71,7 +71,7 @@ bindModelTests() {
   }, skip: 'https://github.com/dart-lang/polymer-dart/issues/78');
 }
 
-class MyDivElement extends HtmlElement with Observable {
+class MyDivElement extends HtmlElement with AutoObservable {
   factory MyDivElement() => new Element.tag('my-div');
   MyDivElement.created() : super.created();
   @observable var bar;
@@ -88,6 +88,6 @@ Future onAttributeChange(Element node) {
     observer.disconnect();
     completer.complete();
   })..observe(node, attributes: true);
-  scheduleMicrotask(Observable.dirtyCheck);
+  scheduleMicrotask(AutoObservable.dirtyCheck);
   return completer.future;
 }

test/build/all_phases_test.dart

@@ -66,7 +66,9 @@ void main() {
           import 'package:polymer/polymer.dart' as i2;
 
           main() {
-            initializers.addAll([new InitEntry(const i2.CustomTag('x-A'), i1.XA),]);
+            initializers.addAll([
+              new InitEntry(const i2.CustomTag('x-A'), i1.XA),
+            ]);
 
             return i0.main();
           }
@@ -120,7 +122,9 @@ void main() {
         import 'package:polymer/polymer.dart' as i2;
 
         main() {
-          initializers.addAll([new InitEntry(const i2.CustomTag('x-A'), i1.XA),]);
+          initializers.addAll([
+            new InitEntry(const i2.CustomTag('x-A'), i1.XA),
+          ]);
 
           return i0.main();
         }
@@ -174,7 +178,9 @@ void main() {
           import 'package:polymer/polymer.dart' as i2;
 
           main() {
-            initializers.addAll([new InitEntry(const i2.CustomTag('x-B'), i1.XB),]);
+            initializers.addAll([
+              new InitEntry(const i2.CustomTag('x-B'), i1.XB),
+            ]);
 
             return i0.main();
           }
@@ -307,7 +313,7 @@ library ${className}_$fieldName;
 import 'package:observe/observe.dart';
 import 'package:polymer/polymer.dart';
 
-class $className extends ChangeNotifier {
+class $className extends Observable {
   $fieldReplacement
   $className($fieldName) : __\$$fieldName = $fieldName;
 }

test/prop_attr_reflection_test.dart

@@ -58,7 +58,7 @@ Future onAttributeChange(Element node) {
     observer.disconnect();
     completer.complete();
   })..observe(node, attributes: true);
-  scheduleMicrotask(Observable.dirtyCheck);
+  scheduleMicrotask(AutoObservable.dirtyCheck);
   return completer.future;
 }
 

test/unbind_test.dart

@@ -71,7 +71,7 @@ _observerCount(node) =>
 unbindTests() {
   var xTest = document.querySelector('x-test');
   xTest.foo = 'bar';
-  scheduleMicrotask(Observable.dirtyCheck);
+  scheduleMicrotask(AutoObservable.dirtyCheck);
 
   return delay(null).then((_) {
     expect(_unbound(xTest), null, reason: 'element is bound when inserted');
@@ -88,7 +88,7 @@ unbindTests() {
     expect(_unbound(node), null, reason: 'element is bound when not inserted');
     node.foo = 'bar';
     expect(_observerCount(node), greaterThan(0));
-    scheduleMicrotask(Observable.dirtyCheck);
+    scheduleMicrotask(AutoObservable.dirtyCheck);
     return node;
   }).then(delay).then((node) {
     expect(node.fooWasChanged, true, reason: 'node is actually bound');