diff --git a/modules/angular2/src/core/application_ref.ts b/modules/angular2/src/core/application_ref.ts index a84a2ef0d3..c670f7d24f 100644 --- a/modules/angular2/src/core/application_ref.ts +++ b/modules/angular2/src/core/application_ref.ts @@ -250,7 +250,7 @@ export class PlatformRef_ extends PlatformRef { provide(ApplicationRef, {useFactory: (): ApplicationRef => app, deps: []}) ]); - var exceptionHandler: Function; + var exceptionHandler: ExceptionHandler; try { injector = this.injector.resolveAndCreateChild(providers); exceptionHandler = injector.get(ExceptionHandler); diff --git a/modules/angular2/src/core/reflection/reflection_capabilities.dart b/modules/angular2/src/core/reflection/reflection_capabilities.dart index e5709670d8..1e46fdf213 100644 --- a/modules/angular2/src/core/reflection/reflection_capabilities.dart +++ b/modules/angular2/src/core/reflection/reflection_capabilities.dart @@ -246,8 +246,8 @@ class ReflectionCapabilities implements PlatformReflectionCapabilities { List _convertParameter(ParameterMirror p) { var t = p.type; var res = (!t.hasReflectedType || t.reflectedType == dynamic) - ? [] - : [t.reflectedType]; + ? [] + : [t.reflectedType]; res.addAll(p.metadata.map((m) => m.reflectee)); return res; } diff --git a/modules/angular2/src/router/router.ts b/modules/angular2/src/router/router.ts index 181e163f65..7f563f5cd3 100644 --- a/modules/angular2/src/router/router.ts +++ b/modules/angular2/src/router/router.ts @@ -338,7 +338,9 @@ export class Router { return false; } if (isPresent(this._childRouter)) { - return this._childRouter._routerCanDeactivate(childInstruction); + // TODO: ideally, this closure would map to async-await in Dart. + // For now, casting to any to suppress an error. + return this._childRouter._routerCanDeactivate(childInstruction); } return true; }); diff --git a/scripts/ci/build_dart_ddc.sh b/scripts/ci/build_dart_ddc.sh index c277cde3f7..1b09cd10a9 100755 --- a/scripts/ci/build_dart_ddc.sh +++ b/scripts/ci/build_dart_ddc.sh @@ -15,7 +15,7 @@ cd $REPO_ROOT_DIR DDC_TOTAL_WARNING_CAP="210" DDC_TOTAL_ERROR_CAP="0" DDC_DIR=`pwd`/tmp/dev_compiler -DDC_VERSION="0.1.20" +DDC_VERSION="0.1.23" # Get DDC mkdir -p tmp