expo-dev-launcher 0.7.0 → 0.8.3

package/plugin/src/withDevLauncher.ts

@@ -11,7 +11,9 @@ import fs from 'fs';
 import path from 'path';
 import semver from 'semver';
 
+import { InstallationPage } from './constants';
 import { resolveExpoUpdatesVersion } from './resolveExpoUpdatesVersion';
+import { addLines, replaceLine } from './utils';
 import { withDevLauncherAppDelegate } from './withDevLauncherAppDelegate';
 
 const pkg = require('expo-dev-launcher/package.json');
@@ -46,35 +48,9 @@ async function saveFileAsync(path: string, content: string): Promise<void> {
   return fs.promises.writeFile(path, content, 'utf8');
 }
 
-function addLines(content: string, find: string | RegExp, offset: number, toAdd: string[]) {
-  const lines = content.split('\n');
-
-  let lineIndex = lines.findIndex(line => line.match(find));
-
-  for (const newLine of toAdd) {
-    if (!content.includes(newLine)) {
-      lines.splice(lineIndex + offset, 0, newLine);
-      lineIndex++;
-    }
-  }
-
-  return lines.join('\n');
-}
-
-function replaceLine(content: string, find: string | RegExp, replace: string) {
-  const lines = content.split('\n');
-
-  if (!content.includes(replace)) {
-    const lineIndex = lines.findIndex(line => line.match(find));
-    lines.splice(lineIndex, 1, replace);
-  }
-
-  return lines.join('\n');
-}
-
 function addJavaImports(javaSource: string, javaImports: string[]): string {
   const lines = javaSource.split('\n');
-  const lineIndexWithPackageDeclaration = lines.findIndex(line => line.match(/^package .*;$/));
+  const lineIndexWithPackageDeclaration = lines.findIndex((line) => line.match(/^package .*;$/));
   for (const javaImport of javaImports) {
     if (!javaSource.includes(javaImport)) {
       const importStatement = `import ${javaImport};`;
@@ -102,9 +78,10 @@ async function editMainApplication(
     const mainApplication = action(await readFileAsync(mainApplicationPath));
     return await saveFileAsync(mainApplicationPath, mainApplication);
   } catch (e) {
-    WarningAggregator.addWarningIOS(
+    WarningAggregator.addWarningAndroid(
       'expo-dev-launcher',
-      `Couldn't modify MainApplication.java - ${e}.`
+      `Couldn't modify MainApplication.java - ${e}.
+See the expo-dev-client installation instructions to modify your MainApplication.java manually: ${InstallationPage}`
     );
   }
 }
@@ -115,7 +92,11 @@ async function editPodfile(config: ExportedConfigWithProps, action: (podfile: st
     const podfile = action(await readFileAsync(podfilePath));
     return await saveFileAsync(podfilePath, podfile);
   } catch (e) {
-    WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify AppDelegate.m - ${e}.`);
+    WarningAggregator.addWarningIOS(
+      'expo-dev-launcher',
+      `Couldn't modify AppDelegate.m - ${e}.
+See the expo-dev-client installation instructions to modify your AppDelegate.m manually: ${InstallationPage}`
+    );
   }
 }
 
@@ -125,15 +106,19 @@ async function editIndex(config: ExportedConfigWithProps, action: (index: string
     const index = action(await readFileAsync(indexPath));
     return await saveFileAsync(indexPath, index);
   } catch (e) {
-    WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify index.js - ${e}.`);
+    WarningAggregator.addWarningIOS(
+      'expo-dev-launcher',
+      `Couldn't modify index.js - ${e}.
+See the expo-dev-client installation instructions to modify your index.js manually: ${InstallationPage}`
+    );
   }
 }
 
-const withDevLauncherApplication: ConfigPlugin = config => {
+const withDevLauncherApplication: ConfigPlugin = (config) => {
   return withDangerousMod(config, [
     'android',
-    async config => {
-      await editMainApplication(config, mainApplication => {
+    async (config) => {
+      await editMainApplication(config, (mainApplication) => {
         mainApplication = addJavaImports(mainApplication, [DEV_LAUNCHER_ANDROID_IMPORT]);
 
         mainApplication = addLines(mainApplication, 'initializeFlipper\\(this', 0, [
@@ -168,8 +153,8 @@ const withDevLauncherApplication: ConfigPlugin = config => {
   ]);
 };
 
-const withDevLauncherActivity: ConfigPlugin = config => {
-  return withMainActivity(config, config => {
+const withDevLauncherActivity: ConfigPlugin = (config) => {
+  return withMainActivity(config, (config) => {
     if (config.modResults.language === 'java') {
       let content = addJavaImports(config.modResults.contents, [
         DEV_LAUNCHER_ANDROID_IMPORT,
@@ -178,7 +163,7 @@ const withDevLauncherActivity: ConfigPlugin = config => {
 
       if (!content.includes(DEV_LAUNCHER_ON_NEW_INTENT)) {
         const lines = content.split('\n');
-        const onCreateIndex = lines.findIndex(line => line.includes('public class MainActivity'));
+        const onCreateIndex = lines.findIndex((line) => line.includes('public class MainActivity'));
 
         lines.splice(onCreateIndex + 1, 0, DEV_LAUNCHER_ON_NEW_INTENT);
 
@@ -187,7 +172,7 @@ const withDevLauncherActivity: ConfigPlugin = config => {
 
       if (!content.includes('DevLauncherController.wrapReactActivityDelegate')) {
         content = content.replace(
-          /(new ReactActivityDelegate(.*|\s)*});$/m,
+          /(new ReactActivityDelegate(Wrapper)?(.|\s)*\}\)?);$/mu,
           DEV_LAUNCHER_WRAPPED_ACTIVITY_DELEGATE
         );
       }
@@ -196,7 +181,8 @@ const withDevLauncherActivity: ConfigPlugin = config => {
     } else {
       WarningAggregator.addWarningAndroid(
         'expo-dev-launcher',
-        `Cannot automatically configure MainActivity if it's not java`
+        `Cannot automatically configure MainActivity if it's not java.
+See the expo-dev-client installation instructions to modify your MainActivity manually: ${InstallationPage}`
       );
     }
 
@@ -204,12 +190,13 @@ const withDevLauncherActivity: ConfigPlugin = config => {
   });
 };
 
-const withDevLauncherPodfile: ConfigPlugin = config => {
+const withDevLauncherPodfile: ConfigPlugin = (config) => {
   return withDangerousMod(config, [
     'ios',
-    async config => {
-      await editPodfile(config, podfile => {
-        podfile = podfile.replace("platform :ios, '10.0'", "platform :ios, '11.0'");
+    async (config) => {
+      await editPodfile(config, (podfile) => {
+        // replace all iOS versions below 12
+        podfile = podfile.replace(/platform :ios, '((\d\.0)|(1[0-1].0))'/, "platform :ios, '12.0'");
         // Match both variations of Ruby config:
         // unknown: pod 'expo-dev-launcher', path: '../node_modules/expo-dev-launcher', :configurations => :debug
         // Rubocop: pod 'expo-dev-launcher', path: '../node_modules/expo-dev-launcher', configurations: :debug
@@ -231,9 +218,9 @@ const withDevLauncherPodfile: ConfigPlugin = config => {
   ]);
 };
 
-const withErrorHandling: ConfigPlugin = config => {
+const withErrorHandling: ConfigPlugin = (config) => {
   const injectErrorHandlers = async (config: ExportedConfigWithProps) => {
-    await editIndex(config, index => {
+    await editIndex(config, (index) => {
       if (
         !index.includes(DEV_LAUNCHER_JS_REGISTER_ERROR_HANDLERS) &&
         !index.includes(DEV_LAUNCHER_JS_REGISTER_ERROR_HANDLERS_VIA_LAUNCHER)

package/plugin/src/withDevLauncherAppDelegate.ts

@@ -1,7 +1,16 @@
 import { ConfigPlugin, WarningAggregator, withAppDelegate } from '@expo/config-plugins';
 import semver from 'semver';
 
+import { InstallationPage } from './constants';
 import { resolveExpoUpdatesVersion } from './resolveExpoUpdatesVersion';
+import { addLines } from './utils';
+
+function escapeRegExpCharacters(string: string) {
+  return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+
+const INITIALIZE_REACT_NATIVE_APP_FUNCTION = `- (RCTBridge *)initializeReactNativeApp`;
+const NEW_INITIALIZE_REACT_NATIVE_APP_FUNCTION = `- (RCTBridge *)initializeReactNativeApp:(NSDictionary *)launchOptions`;
 
 const DEV_LAUNCHER_APP_DELEGATE_SOURCE_FOR_URL = `  #if defined(EX_DEV_LAUNCHER_ENABLED)
   return [[EXDevLauncherController sharedInstance] sourceUrl];
@@ -23,7 +32,7 @@ const DEV_LAUNCHER_UPDATES_APP_DELEGATE_IOS_IMPORT = `
 #include <EXDevLauncher/EXDevLauncherController.h>
 #import <EXUpdates/EXUpdatesDevLauncherController.h>
 #endif`;
-const DEV_LAUNCHER_APP_DELEGATE_CONTROLLER_DELEGATE = `
+const DEV_LAUNCHER_APP_DELEGATE_CONTROLLER_DELEGATE_LEGACY = `
 #if defined(EX_DEV_LAUNCHER_ENABLED)
 @implementation AppDelegate (EXDevLauncherControllerDelegate)
 
@@ -38,6 +47,21 @@ const DEV_LAUNCHER_APP_DELEGATE_CONTROLLER_DELEGATE = `
 @end
 #endif
 `;
+
+const DEV_LAUNCHER_APP_DELEGATE_CONTROLLER_DELEGATE = `
+#if defined(EX_DEV_LAUNCHER_ENABLED)
+@implementation AppDelegate (EXDevLauncherControllerDelegate)
+
+- (void)devLauncherController:(EXDevLauncherController *)developmentClientController
+    didStartWithSuccess:(BOOL)success
+{
+  developmentClientController.appBridge = [self initializeReactNativeApp:[EXDevLauncherController.sharedInstance getLaunchOptions]];
+}
+
+@end
+#endif
+`;
+
 const DEV_LAUNCHER_APP_DELEGATE_INIT = `#if defined(EX_DEV_LAUNCHER_ENABLED)
         EXDevLauncherController *controller = [EXDevLauncherController sharedInstance];
         [controller startWithWindow:self.window delegate:(id<EXDevLauncherControllerDelegate>)self launchOptions:launchOptions];
@@ -61,10 +85,84 @@ const DEV_MENU_IOS_INIT = `
   [DevMenuManager configureWithBridge:bridge];
 #endif`;
 
-export function modifyAppDelegate(appDelegate: string, expoUpdatesVersion: string | null = null) {
-  const shouldAddUpdatesIntegration =
-    expoUpdatesVersion != null && semver.gt(expoUpdatesVersion, '0.6.0');
+const DEV_LAUNCHER_INIT_TO_REMOVE = new RegExp(
+  escapeRegExpCharacters(`RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
+  RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge moduleName:@"main" initialProperties:nil];
+  id rootViewBackgroundColor = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"RCTRootViewBackgroundColor"];
+  if (rootViewBackgroundColor != nil) {
+    rootView.backgroundColor = [RCTConvert UIColor:rootViewBackgroundColor];
+  } else {
+    rootView.backgroundColor = [UIColor whiteColor];
+  }
+
+  self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
+  UIViewController *rootViewController = `) +
+    `([^;]+)` +
+    escapeRegExpCharacters(`;
+  rootViewController.view = rootView;
+  self.window.rootViewController = rootViewController;
+  [self.window makeKeyAndVisible];`),
+  'm'
+);
+
+const DEV_LAUNCHER_NEW_INIT = `self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
+#if defined(EX_DEV_LAUNCHER_ENABLED)
+  EXDevLauncherController *controller = [EXDevLauncherController sharedInstance];
+  [controller startWithWindow:self.window delegate:(id<EXDevLauncherControllerDelegate>)self launchOptions:launchOptions];
+#else
+  [self initializeReactNativeApp:launchOptions];
+#endif`;
+
+const DEV_LAUNCHER_INITIALIZE_REACT_NATIVE_APP_FUNCTION_DEFINITION_REGEX = new RegExp(
+  escapeRegExpCharacters(`
+- (RCTBridge *)initializeReactNativeApp:(NSDictionary *)launchOptions
+{
+  RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
+  RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge moduleName:@"main" initialProperties:nil];
+  id rootViewBackgroundColor = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"RCTRootViewBackgroundColor"];
+  if (rootViewBackgroundColor != nil) {
+    rootView.backgroundColor = [RCTConvert UIColor:rootViewBackgroundColor];
+  } else {
+    rootView.backgroundColor = [UIColor whiteColor];
+  }
 
+  UIViewController *rootViewController = `) +
+    `[^;]+` +
+    escapeRegExpCharacters(`;
+  rootViewController.view = rootView;
+  self.window.rootViewController = rootViewController;
+  [self.window makeKeyAndVisible];
+
+  return bridge;
+}
+`),
+  'm'
+);
+
+const DEV_LAUNCHER_INITIALIZE_REACT_NATIVE_APP_FUNCTION_DEFINITION = (
+  viewControllerInit: string | undefined
+) => `
+- (RCTBridge *)initializeReactNativeApp:(NSDictionary *)launchOptions
+{
+  RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
+  RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge moduleName:@"main" initialProperties:nil];
+  id rootViewBackgroundColor = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"RCTRootViewBackgroundColor"];
+  if (rootViewBackgroundColor != nil) {
+    rootView.backgroundColor = [RCTConvert UIColor:rootViewBackgroundColor];
+  } else {
+    rootView.backgroundColor = [UIColor whiteColor];
+  }
+
+  UIViewController *rootViewController = ${viewControllerInit ?? '[UIViewController new]'};
+  rootViewController.view = rootView;
+  self.window.rootViewController = rootViewController;
+  [self.window makeKeyAndVisible];
+
+  return bridge;
+}
+`;
+
+function addImports(appDelegate: string, shouldAddUpdatesIntegration: boolean): string {
   if (
     !appDelegate.includes(DEV_LAUNCHER_APP_DELEGATE_IOS_IMPORT) &&
     !appDelegate.includes(DEV_LAUNCHER_UPDATES_APP_DELEGATE_IOS_IMPORT)
@@ -81,6 +179,47 @@ export function modifyAppDelegate(appDelegate: string, expoUpdatesVersion: strin
     appDelegate = lines.join('\n');
   }
 
+  return appDelegate;
+}
+
+function removeDevMenuInit(appDelegate: string): string {
+  if (!appDelegate.includes(DEV_MENU_IMPORT)) {
+    // expo-dev-launcher is responsible for initializing the expo-dev-menu.
+    // We need to remove init block from AppDelegate.
+    appDelegate = appDelegate.replace(DEV_MENU_IOS_INIT, '');
+  }
+  return appDelegate;
+}
+
+function addDeepLinkHandler(appDelegate: string): string {
+  if (!appDelegate.includes(DEV_LAUNCHER_APP_DELEGATE_ON_DEEP_LINK)) {
+    appDelegate = appDelegate.replace(
+      'return [RCTLinkingManager application:application openURL:url options:options];',
+      DEV_LAUNCHER_APP_DELEGATE_ON_DEEP_LINK
+    );
+  }
+  return appDelegate;
+}
+
+function changeDebugURL(appDelegate: string): string {
+  if (!appDelegate.includes(DEV_LAUNCHER_APP_DELEGATE_SOURCE_FOR_URL)) {
+    appDelegate = appDelegate.replace(
+      'return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];',
+      DEV_LAUNCHER_APP_DELEGATE_SOURCE_FOR_URL
+    );
+  }
+  return appDelegate;
+}
+
+export function modifyLegacyAppDelegate(
+  appDelegate: string,
+  expoUpdatesVersion: string | null = null
+) {
+  const shouldAddUpdatesIntegration =
+    expoUpdatesVersion != null && semver.gt(expoUpdatesVersion, '0.6.0');
+
+  appDelegate = addImports(appDelegate, shouldAddUpdatesIntegration);
+
   if (!appDelegate.includes(DEV_LAUNCHER_APP_DELEGATE_INIT)) {
     appDelegate = appDelegate.replace(
       /(didFinishLaunchingWithOptions([^}])*)\[self initializeReactNativeApp\];(([^}])*})/,
@@ -105,35 +244,72 @@ export function modifyAppDelegate(appDelegate: string, expoUpdatesVersion: strin
     );
   }
 
-  if (!appDelegate.includes(DEV_LAUNCHER_APP_DELEGATE_SOURCE_FOR_URL)) {
-    appDelegate = appDelegate.replace(
-      'return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];',
-      DEV_LAUNCHER_APP_DELEGATE_SOURCE_FOR_URL
-    );
+  appDelegate = changeDebugURL(appDelegate);
+  appDelegate = addDeepLinkHandler(appDelegate);
+
+  if (!appDelegate.includes(DEV_LAUNCHER_APP_DELEGATE_CONTROLLER_DELEGATE_LEGACY)) {
+    appDelegate += DEV_LAUNCHER_APP_DELEGATE_CONTROLLER_DELEGATE_LEGACY;
   }
 
-  if (!appDelegate.includes(DEV_LAUNCHER_APP_DELEGATE_ON_DEEP_LINK)) {
+  appDelegate = removeDevMenuInit(appDelegate);
+  return appDelegate;
+}
+
+export function modifyAppDelegate(appDelegate: string, expoUpdatesVersion: string | null = null) {
+  const shouldAddUpdatesIntegration =
+    expoUpdatesVersion != null && semver.gt(expoUpdatesVersion, '0.6.0');
+
+  if (!DEV_LAUNCHER_INITIALIZE_REACT_NATIVE_APP_FUNCTION_DEFINITION_REGEX.test(appDelegate)) {
+    if (DEV_LAUNCHER_INIT_TO_REMOVE.test(appDelegate)) {
+      // UIViewController can be initialized differently depending on whether expo-screen-orientation is installed,
+      // so we need to preserve whatever is there already.
+      let viewControllerInit;
+      appDelegate = appDelegate.replace(DEV_LAUNCHER_INIT_TO_REMOVE, (match, p1) => {
+        viewControllerInit = p1;
+        return DEV_LAUNCHER_NEW_INIT;
+      });
+      appDelegate = addLines(appDelegate, '@implementation AppDelegate', 1, [
+        DEV_LAUNCHER_INITIALIZE_REACT_NATIVE_APP_FUNCTION_DEFINITION(viewControllerInit),
+      ]);
+    } else {
+      WarningAggregator.addWarningIOS(
+        'expo-dev-launcher',
+        `Failed to modify AppDelegate init function. 
+See the expo-dev-client installation instructions to modify your AppDelegate manually: ${InstallationPage}`
+      );
+    }
+  }
+
+  if (
+    shouldAddUpdatesIntegration &&
+    !appDelegate.includes(DEV_LAUNCHER_UPDATES_APP_DELEGATE_INIT)
+  ) {
     appDelegate = appDelegate.replace(
-      'return [RCTLinkingManager application:application openURL:url options:options];',
-      DEV_LAUNCHER_APP_DELEGATE_ON_DEEP_LINK
+      'EXDevLauncherController *controller = [EXDevLauncherController sharedInstance];',
+      DEV_LAUNCHER_UPDATES_APP_DELEGATE_INIT
     );
   }
 
+  appDelegate = addImports(appDelegate, shouldAddUpdatesIntegration);
+
   if (!appDelegate.includes(DEV_LAUNCHER_APP_DELEGATE_CONTROLLER_DELEGATE)) {
     appDelegate += DEV_LAUNCHER_APP_DELEGATE_CONTROLLER_DELEGATE;
   }
 
-  if (!appDelegate.includes(DEV_MENU_IMPORT)) {
-    // expo-dev-launcher is responsible for initializing the expo-dev-menu.
-    // We need to remove init block from AppDelegate.
-    appDelegate = appDelegate.replace(DEV_MENU_IOS_INIT, '');
+  if (!appDelegate.includes(DEV_LAUNCHER_APP_DELEGATE_ON_DEEP_LINK)) {
+    appDelegate = appDelegate.replace(
+      'return [RCTLinkingManager application:application openURL:url options:options];',
+      DEV_LAUNCHER_APP_DELEGATE_ON_DEEP_LINK
+    );
   }
 
+  appDelegate = changeDebugURL(appDelegate);
+  appDelegate = removeDevMenuInit(appDelegate);
   return appDelegate;
 }
 
-export const withDevLauncherAppDelegate: ConfigPlugin = config => {
-  return withAppDelegate(config, config => {
+export const withDevLauncherAppDelegate: ConfigPlugin = (config) => {
+  return withAppDelegate(config, (config) => {
     if (config.modResults.language === 'objc') {
       let expoUpdatesVersion;
       try {
@@ -144,14 +320,26 @@ export const withDevLauncherAppDelegate: ConfigPlugin = config => {
           `Failed to check compatibility with expo-updates - ${e}`
         );
       }
-      config.modResults.contents = modifyAppDelegate(
-        config.modResults.contents,
-        expoUpdatesVersion
-      );
+
+      if (
+        config.modResults.contents.includes(INITIALIZE_REACT_NATIVE_APP_FUNCTION) &&
+        !config.modResults.contents.includes(NEW_INITIALIZE_REACT_NATIVE_APP_FUNCTION)
+      ) {
+        config.modResults.contents = modifyLegacyAppDelegate(
+          config.modResults.contents,
+          expoUpdatesVersion
+        );
+      } else {
+        config.modResults.contents = modifyAppDelegate(
+          config.modResults.contents,
+          expoUpdatesVersion
+        );
+      }
     } else {
       WarningAggregator.addWarningIOS(
         'expo-dev-launcher',
-        'Swift AppDelegate files are not supported yet.'
+        `Swift AppDelegate files are not supported yet.
+See the expo-dev-client installation instructions to modify your AppDelegate manually: ${InstallationPage}`
       );
     }
     return config;

package/src/DevLauncherErrorManager.ts

@@ -2,6 +2,7 @@
 type CodedError = Error & { code?: string };
 
 let isErrorHandlingEnabled = true;
+let wasHit = false; // whether the original error handler was called
 
 const unavailableErrorPossibleSolutions = `Some possible solutions:
 - Make sure that the method is available on the current platform.
@@ -40,9 +41,15 @@ function customizeError(error: Error | CodedError) {
 
 function errorHandler(originalHandler, error, isFatal) {
   if (error instanceof Error) {
+    // Suppresses `"main" has not been registered` error only if it was caused by a different error.
+    // Otherwise, we want to show it, cause the user may forget to call `AppRegistry.registerComponent`.
+    if (wasHit && error.message?.includes('has not been registered. This can happen if')) {
+      return;
+    }
     customizeError(error);
   }
 
+  wasHit = true;
   originalHandler(error, isFatal);
 }
 

package/android/src/main/java/expo/modules/devlauncher/launcher/manifest/DevLauncherManifest.kt

@@ -1,111 +0,0 @@
-package expo.modules.devlauncher.launcher.manifest
-
-import android.util.Log
-import com.google.gson.Gson
-import com.google.gson.GsonBuilder
-import com.google.gson.JsonDeserializationContext
-import com.google.gson.JsonDeserializer
-import com.google.gson.JsonElement
-import java.io.Reader
-import java.lang.reflect.Type
-import kotlin.reflect.full.declaredMemberProperties
-import kotlin.reflect.jvm.isAccessible
-
-/**
- * A representation of the android specific properties such as `primaryColor` or status bar configuration.
- * Note that this class doesn't contain fields which are also defined in the main section of `app.json`
- * and can be overridden by the [DevLauncherManifest.android] section, like [DevLauncherManifest.backgroundColor].
- * Those fields are combined during deserialization and the final value is written to the [DevLauncherManifest] object.
- */
-class DevLauncherAndroidManifestSection
-
-data class DevLauncherStatusBarSection(
-  val barStyle: DevLauncherStatusBarStyle?,
-  val backgroundColor: String?,
-  val hidden: Boolean?,
-  val translucent: Boolean?
-)
-
-data class DevLauncherManifestDeveloperSection(
-  val tool: String?
-)
-
-data class DevLauncherManifest(
-  val name: String,
-  val slug: String,
-  val bundleUrl: String,
-  val hostUri: String,
-  val mainModuleName: String,
-  val version: String,
-
-  val orientation: DevLauncherOrientation?,
-
-  val android: DevLauncherAndroidManifestSection?,
-
-  val developer: DevLauncherManifestDeveloperSection?,
-
-  val userInterfaceStyle: DevLauncherUserInterface?,
-  val backgroundColor: String?,
-  val primaryColor: String?,
-
-  val androidStatusBar: DevLauncherStatusBarSection?
-) {
-  var rawData: String? = null
-    private set
-
-  fun isUsingDeveloperTool(): Boolean {
-    return developer?.tool != null
-  }
-
-  /**
-   * Class which contains all fields that the user can override in the android section.
-   */
-  private data class DevLauncherOverriddenProperties(
-    val userInterfaceStyle: DevLauncherUserInterface?,
-    val backgroundColor: String?
-  )
-
-  private class DevLauncherManifestDeserializer : JsonDeserializer<DevLauncherManifest> {
-
-    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): DevLauncherManifest {
-      with(Gson()) {
-        val jsonObject = json.asJsonObject
-        val baseManifest = fromJson(jsonObject, DevLauncherManifest::class.java)
-        if (jsonObject.has("android")) {
-          val overriddenProperties = fromJson(jsonObject.getAsJsonObject("android"), DevLauncherOverriddenProperties::class.java)
-          applyOverriddenProperties(baseManifest, overriddenProperties)
-        }
-        return baseManifest
-      }
-    }
-
-    private fun applyOverriddenProperties(baseManifest: DevLauncherManifest, overriddenProperties: DevLauncherOverriddenProperties) {
-      for (field in DevLauncherOverriddenProperties::class.declaredMemberProperties) {
-        try {
-          // It shouldn't be needed, but when we try to run this code on JVM (unit test)
-          // we get `IllegalAccessException`.
-          field.isAccessible = true
-          val overriddenValue = field.get(overriddenProperties) ?: continue
-          val baseField = baseManifest::class.java.getDeclaredField(field.name)
-          baseField.isAccessible = true
-          baseField.set(baseManifest, overriddenValue)
-        } catch (e: Exception) {
-          Log.w("DevelopmentClient", "Could't apply overridden property ${field.name}", e)
-        }
-      }
-    }
-  }
-
-  companion object {
-    fun fromJson(jsonReader: Reader): DevLauncherManifest {
-      val manifestString = jsonReader.readText()
-      return GsonBuilder()
-        .registerTypeAdapter(DevLauncherManifest::class.java, DevLauncherManifestDeserializer())
-        .create()
-        .fromJson(manifestString, DevLauncherManifest::class.java)
-        .apply {
-          rawData = manifestString
-        }
-    }
-  }
-}