From 6b759bd5ec4a9a13cec7f22ec798ccffdbd4ce4c Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Mon, 20 Jun 2022 18:29:26 +0200
Subject: [PATCH] MOBILE-4081 core: Use singleton names in plugins

---
 src/core/core.module.ts                       | 4 ----
 src/core/features/compile/services/compile.ts | 3 ++-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/core/core.module.ts b/src/core/core.module.ts
index 2376f3db4..44ca6128e 100644
--- a/src/core/core.module.ts
+++ b/src/core/core.module.ts
@@ -50,8 +50,6 @@ import { CoreUpdateManagerProvider } from '@services/update-manager';
 import { CoreUrlUtilsProvider } from '@services/utils/url';
 import { CoreUtilsProvider } from '@services/utils/utils';
 import { CoreWSProvider } from '@services/ws';
-import { CoreNetworkService } from '@services/network';
-import { CorePlatformService } from '@services/platform';
 
 export const CORE_SERVICES: Type<unknown>[] = [
     CoreAppProvider,
@@ -71,8 +69,6 @@ export const CORE_SERVICES: Type<unknown>[] = [
     CoreLocalNotificationsProvider,
     CoreMimetypeUtilsProvider,
     CoreNavigatorService,
-    CoreNetworkService,
-    CorePlatformService,
     CorePluginFileDelegateService,
     CoreScreenService,
     CoreSitesProvider,
diff --git a/src/core/features/compile/services/compile.ts b/src/core/features/compile/services/compile.ts
index 8b7ea6a68..204ec0408 100644
--- a/src/core/features/compile/services/compile.ts
+++ b/src/core/features/compile/services/compile.ts
@@ -344,11 +344,12 @@ export class CoreCompileProvider {
         instance['CoreLoggerProvider'] = CoreLogger;
         instance['moment'] = moment;
         instance['Md5'] = Md5;
-        instance['Network'] = CoreNetwork.instance; // @deprecated on 4.1, plugins should use CoreNetworkService instead.
+        instance['Network'] = CoreNetwork.instance; // @deprecated on 4.1, plugins should use CoreNetwork instead.
         instance['Platform'] = CorePlatform.instance; // @deprecated on 4.1, plugins should use CorePlatform instead.
         instance['CoreSyncBaseProvider'] = CoreSyncBaseProvider;
         instance['CoreArray'] = CoreArray;
         instance['CoreComponentsRegistry'] = CoreComponentsRegistry;
+        instance['CoreNetwork'] = CoreNetwork.instance;
         instance['CorePlatform'] = CorePlatform.instance;
         instance['CoreDom'] = CoreDom;
         instance['CoreForms'] = CoreForms;