diff --git a/modules/@angular/core/index.ts b/modules/@angular/core/index.ts index bd572307df..62f3ceebde 100644 --- a/modules/@angular/core/index.ts +++ b/modules/@angular/core/index.ts @@ -25,7 +25,7 @@ export * from './src/testability/testability'; export * from './src/change_detection'; export * from './src/platform_core_providers'; export {TRANSLATIONS, TRANSLATIONS_FORMAT, LOCALE_ID} from './src/i18n/tokens'; -export {APPLICATION_COMMON_PROVIDERS, ApplicationModule} from './src/application_module'; +export {ApplicationModule} from './src/application_module'; export {wtfCreateScope, wtfLeave, wtfStartTimeRange, wtfEndTimeRange, WtfScopeFn} from './src/profile/profile'; export {Type} from './src/type'; diff --git a/modules/@angular/core/src/application_module.ts b/modules/@angular/core/src/application_module.ts index fc5a50320b..92c3d5855b 100644 --- a/modules/@angular/core/src/application_module.ts +++ b/modules/@angular/core/src/application_module.ts @@ -24,14 +24,6 @@ export function _keyValueDiffersFactory() { return defaultKeyValueDiffers; } -/** - * A default set of providers which should be included in any Angular - * application, regardless of the platform it runs onto. - * - * @deprecated Include `ApplicationModule` instead. - */ -export const APPLICATION_COMMON_PROVIDERS: Array|{[k: string]: any}|any[]> = []; - /** * This module includes the providers of @angular/core that are needed * to bootstrap components via `ApplicationRef`. diff --git a/modules/@angular/core/src/application_ref.ts b/modules/@angular/core/src/application_ref.ts index 462b298786..a9986fb5dd 100644 --- a/modules/@angular/core/src/application_ref.ts +++ b/modules/@angular/core/src/application_ref.ts @@ -249,19 +249,10 @@ export class PlatformRef_ extends PlatformRef { constructor(private _injector: Injector) { super(); } - /** - * @deprecated - */ - registerDisposeListener(dispose: () => void): void { this.onDestroy(dispose); } - onDestroy(callback: () => void): void { this._destroyListeners.push(callback); } get injector(): Injector { return this._injector; } - /** - * @deprecated - */ - get disposed() { return this.destroyed; } get destroyed() { return this._destroyed; } destroy() { @@ -273,11 +264,6 @@ export class PlatformRef_ extends PlatformRef { this._destroyed = true; } - /** - * @deprecated - */ - dispose(): void { this.destroy(); } - bootstrapModuleFactory(moduleFactory: NgModuleFactory): Promise> { return this._bootstrapModuleFactoryWithZone(moduleFactory, null); } diff --git a/modules/@angular/core/testing/mock_application_ref.ts b/modules/@angular/core/testing/mock_application_ref.ts deleted file mode 100644 index 2f9fd4aeab..0000000000 --- a/modules/@angular/core/testing/mock_application_ref.ts +++ /dev/null @@ -1,36 +0,0 @@ -/** - * @license - * Copyright Google Inc. All Rights Reserved. - * - * Use of this source code is governed by an MIT-style license that can be - * found in the LICENSE file at https://angular.io/license - */ - -import {ApplicationRef, ComponentFactory, ComponentRef, Injectable, Injector, NgZone, Type} from '../index'; - - -/** - * A no-op implementation of {@link ApplicationRef}, useful for testing. - */ -@Injectable() -export class MockApplicationRef extends ApplicationRef { - registerBootstrapListener(listener: (ref: ComponentRef) => void): void {} - - registerDisposeListener(dispose: () => void): void {} - - bootstrap(componentFactory: ComponentFactory): ComponentRef { return null; } - - get injector(): Injector { return null; }; - - get zone(): NgZone { return null; }; - - run(callback: Function): any { return null; } - - waitForAsyncInitializers(): Promise { return null; } - - dispose(): void {} - - tick(): void {} - - get componentTypes(): Type[] { return null; }; -} diff --git a/modules/@angular/core/testing/testing_internal.ts b/modules/@angular/core/testing/testing_internal.ts index 716f0e0df7..96246c1a5d 100644 --- a/modules/@angular/core/testing/testing_internal.ts +++ b/modules/@angular/core/testing/testing_internal.ts @@ -17,7 +17,6 @@ export {MockAnimationPlayer} from './mock_animation_player'; export {inject} from './test_bed'; export * from './logger'; export * from './ng_zone_mock'; -export * from './mock_application_ref'; export * from './test_component_builder'; export var proxy: ClassDecorator = (t: any /** TODO #9100 */) => t; diff --git a/modules/@angular/platform-browser/src/dom/dom_adapter.ts b/modules/@angular/platform-browser/src/dom/dom_adapter.ts index 21b54c46b9..2aaddec839 100644 --- a/modules/@angular/platform-browser/src/dom/dom_adapter.ts +++ b/modules/@angular/platform-browser/src/dom/dom_adapter.ts @@ -45,9 +45,6 @@ export abstract class DomAdapter { abstract logGroup(error: any /** TODO #9100 */): any /** TODO #9100 */; abstract logGroupEnd(): any /** TODO #9100 */; - /** @deprecated */ - getResourceLoader(): Type { return this.resourceLoaderType; } - /** * Maps attribute names to their corresponding property names for cases * where attribute name doesn't match property name. diff --git a/modules/@angular/platform-browser/src/web_workers/worker/worker_adapter.ts b/modules/@angular/platform-browser/src/web_workers/worker/worker_adapter.ts index fc4fca07e5..a90c87f977 100644 --- a/modules/@angular/platform-browser/src/web_workers/worker/worker_adapter.ts +++ b/modules/@angular/platform-browser/src/web_workers/worker/worker_adapter.ts @@ -50,8 +50,6 @@ export class WorkerDomAdapter extends DomAdapter { getProperty(el: Element, name: string): any { throw 'not implemented'; } invoke(el: Element, methodName: string, args: any[]): any { throw 'not implemented'; } - getResourceLoader(): Type { throw 'not implemented'; } - get attrToPropMap(): {[key: string]: string} { throw 'not implemented'; } set attrToPropMap(value: {[key: string]: string}) { throw 'not implemented'; } diff --git a/modules/@angular/platform-server/src/parse5_adapter.ts b/modules/@angular/platform-server/src/parse5_adapter.ts index 91b9020fa3..209de2e274 100644 --- a/modules/@angular/platform-server/src/parse5_adapter.ts +++ b/modules/@angular/platform-server/src/parse5_adapter.ts @@ -75,8 +75,6 @@ export class Parse5DomAdapter extends DomAdapter { logGroupEnd() {} - getResourceLoader(): Type { return ResourceLoader; } - get attrToPropMap() { return _attrToPropMap; } query(selector: any /** TODO #9100 */) { throw _notImplemented('query'); } diff --git a/tools/public_api_guard/core/index.d.ts b/tools/public_api_guard/core/index.d.ts index 851c297567..d6ebb7de8e 100644 --- a/tools/public_api_guard/core/index.d.ts +++ b/tools/public_api_guard/core/index.d.ts @@ -127,11 +127,6 @@ export declare const APP_ID: any; /** @experimental */ export declare const APP_INITIALIZER: any; -/** @deprecated */ -export declare const APPLICATION_COMMON_PROVIDERS: Array | { - [k: string]: any; -} | any[]>; - /** @experimental */ export declare class ApplicationInitStatus { done: boolean;