Resolve remaining merges

Author: acoates-ms

.flowconfig

@@ -72,13 +72,8 @@ suppress_type=$FlowFixMe
 suppress_type=$FlowFixMeProps
 suppress_type=$FlowFixMeState
 
-<<<<<<< HEAD
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*[react_native\\(_ios\\)?_oss|react_native\\(_ios\\)?_fb][a-z,_]*\\)?)\\)
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*[react_native\\(_ios\\)?_oss|react_native\\(_ios\\)?_fb][a-z,_]*\\)?)\\)?:? #[0-9]+
-=======
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)
 suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)?:? #[0-9]+
->>>>>>> v0.58.6
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
 
@@ -107,11 +102,7 @@ untyped-import
 untyped-type-import
 
 [version]
-<<<<<<< HEAD
-^0.78.0
-=======
 ^0.86.0
 
 [untyped]
 .*/node_modules/metro/.*
->>>>>>> v0.58.6

.gitignore

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Xcode
 !**/*.xcodeproj
 !**/*.pbxproj
@@ -65,76 +64,10 @@ package-lock.json
 /coverage
 /third-party
 /packages/
-=======
-# Xcode
-!**/*.xcodeproj
-!**/*.pbxproj
-!**/*.xcworkspacedata
-!**/*.xcsettings
-!**/*.xcscheme
-*.pbxuser
-!default.pbxuser
-*.mode1v3
-!default.mode1v3
-*.mode2v3
-!default.mode2v3
-*.perspectivev3
-!default.perspectivev3
-xcuserdata
-*.xccheckout
-*.moved-aside
-DerivedData
-*.hmap
-*.ipa
-*.xcuserstate
-project.xcworkspace
-
-# Gradle
-/build/
-/RNTester/android/app/build/
-/RNTester/android/app/gradle/
-/RNTester/android/app/gradlew
-/RNTester/android/app/gradlew.bat
-/ReactAndroid/build/
-
-# Buck
-.buckd
-buck-out
-/ReactAndroid/src/main/jni/prebuilt/lib/armeabi-v7a/
-/ReactAndroid/src/main/jni/prebuilt/lib/x86/
-/ReactAndroid/src/main/gen
-
-# Watchman
-.watchmanconfig
-
-# Android
-.idea
-.gradle
-local.properties
-*.iml
-/android/
-
-# Node
-node_modules
-*.log
-.nvm
-/bots/node_modules/
-package-lock.json
-
-# OS X
-.DS_Store
-
-# Test generated files
-/ReactAndroid/src/androidTest/assets/AndroidTestBundle.js
-*.js.meta
-
-/coverage
-/third-party
 
 # Root dir shouldn't have Xcode project
 /*.xcodeproj
 
 # ReactCommon subdir shouldn't have Xcode project
 /ReactCommon/**/*.xcodeproj
 RNTester/build
->>>>>>> v0.57.0

Libraries/Core/ReactNativeVersion.js

@@ -1,11 +1,7 @@
 /**
  * @generated by scripts/bump-oss-version.js
  *
-<<<<<<< HEAD
- * Copyright (c) 2015-present, Facebook, Inc.
-=======
  * Copyright (c) Facebook, Inc. and its affiliates.
->>>>>>> v0.58.6
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

Libraries/ReactNative/ReactFabricIndicator.js

@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
- * Copyright (c) 2015-present, Facebook, Inc.
-=======
  * Copyright (c) Facebook, Inc. and its affiliates.
->>>>>>> v0.58.6
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

Libraries/Renderer/REVISION

@@ -1,5 +1 @@
-<<<<<<< HEAD
-ade5e692883345783e32e87875bbb744fb415c9c
-=======
 6bf5e859860938b8cb7153ee928c01ad45656969
->>>>>>> v0.58.6

Libraries/Renderer/shims/ReactNativeTypes.js

@@ -36,127 +36,122 @@ export type MeasureLayoutOnSuccessCallback = (
 type AttributeType =
   | true
   | $ReadOnly<{|
-<<<<<<< HEAD
-      diff: ?<T>(arg1: T, arg2: T) => boolean,
-      process: ?(arg1: any) => any,
-=======
-      diff?: <T>(arg1: T, arg2: T) => boolean,
-      process?: (arg1: any) => any,
->>>>>>> v0.58.6
-    |}>;
+    diff?: <T>(arg1: T, arg2: T) => boolean,
+    process?: (arg1: any) => any,
+  |}>;
 
 export type AttributeConfiguration<
-  TProps = string,
-  TStyleProps = string,
+        TProps = string,
+      TStyleProps = string,
 > = $ReadOnly<{
   [propName: TProps]: AttributeType,
   style: $ReadOnly<{
     [propName: TStyleProps]: AttributeType,
-  }>,
-}>;
-
+    }>,
+  }>;
+  
 export type ReactNativeBaseComponentViewConfig<
-  TProps = string,
-  TStyleProps = string,
+        TProps = string,
+      TStyleProps = string,
 > = $ReadOnly<{|
-  baseModuleName?: string,
-  bubblingEventTypes?: $ReadOnly<{
-    [eventName: string]: $ReadOnly<{|
-      phasedRegistrationNames: $ReadOnly<{|
-        captured: string,
-        bubbled: string,
-      |}>,
+        baseModuleName?: string,
+        bubblingEventTypes?: $ReadOnly<{
+          [eventName: string]: $ReadOnly<{|
+            phasedRegistrationNames: $ReadOnly<{|
+              captured: string,
+      bubbled: string,
     |}>,
-  }>,
+  |}>,
+}>,
   Commands?: $ReadOnly<{
     [commandName: string]: number,
-  }>,
+    }>,
   directEventTypes?: $ReadOnly<{
     [eventName: string]: $ReadOnly<{|
-      registrationName: string,
+        registrationName: string,
     |}>,
   }>,
   NativeProps?: $ReadOnly<{
     [propName: string]: string,
-  }>,
-  uiViewClassName: string,
+    }>,
+    uiViewClassName: string,
   validAttributes: AttributeConfiguration<TProps, TStyleProps>,
-|}>;
-
+    |}>;
+    
 export type ViewConfigGetter = () => ReactNativeBaseComponentViewConfig<>;
-
-/**
- * Class only exists for its Flow type.
- */
+      
+      /**
+       * Class only exists for its Flow type.
+       */
 class ReactNativeComponent<Props> extends React.Component<Props> {
-  blur(): void {}
-  focus(): void {}
-  measure(callback: MeasureOnSuccessCallback): void {}
-  measureInWindow(callback: MeasureInWindowOnSuccessCallback): void {}
-  measureLayout(
-    relativeToNativeNode: number,
-    onSuccess: MeasureLayoutOnSuccessCallback,
-    onFail?: () => void,
+          blur(): void {}
+          focus(): void {}
+          measure(callback: MeasureOnSuccessCallback): void {}
+          measureInWindow(callback: MeasureInWindowOnSuccessCallback): void {}
+          measureLayout(
+            relativeToNativeNode: number,
+            onSuccess: MeasureLayoutOnSuccessCallback,
+            onFail?: () => void,
   ): void {}
-  setNativeProps(nativeProps: Object): void {}
-}
-
-/**
- * This type keeps ReactNativeFiberHostComponent and NativeMethodsMixin in sync.
- * It can also provide types for ReactNative applications that use NMM or refs.
- */
+          setNativeProps(nativeProps: Object): void {}
+          }
+          
+          /**
+           * This type keeps ReactNativeFiberHostComponent and NativeMethodsMixin in sync.
+           * It can also provide types for ReactNative applications that use NMM or refs.
+           */
 export type NativeMethodsMixinType = {
-  blur(): void,
-  focus(): void,
-  measure(callback: MeasureOnSuccessCallback): void,
-  measureInWindow(callback: MeasureInWindowOnSuccessCallback): void,
-  measureLayout(
-    relativeToNativeNode: number,
-    onSuccess: MeasureLayoutOnSuccessCallback,
-    onFail: () => void,
-  ): void,
-  setNativeProps(nativeProps: Object): void,
-};
-
+            blur(): void,
+          focus(): void,
+          measure(callback: MeasureOnSuccessCallback): void,
+          measureInWindow(callback: MeasureInWindowOnSuccessCallback): void,
+          measureLayout(
+            relativeToNativeNode: number,
+            onSuccess: MeasureLayoutOnSuccessCallback,
+            onFail: () => void,
+          ): void,
+          setNativeProps(nativeProps: Object): void,
+        };
+        
 type SecretInternalsType = {
-  NativeMethodsMixin: NativeMethodsMixinType,
-  computeComponentStackForErrorReporting(tag: number): string,
-  // TODO (bvaughn) Decide which additional types to expose here?
-  // And how much information to fill in for the above types.
-};
-
+            NativeMethodsMixin: NativeMethodsMixinType,
+          computeComponentStackForErrorReporting(tag: number): string,
+          // TODO (bvaughn) Decide which additional types to expose here?
+          // And how much information to fill in for the above types.
+        };
+        
 type SecretInternalsFabricType = {
-  NativeMethodsMixin: NativeMethodsMixinType,
-};
-
-/**
- * Flat ReactNative renderer bundles are too big for Flow to parse efficiently.
- * Provide minimal Flow typing for the high-level RN API and call it a day.
- */
+            NativeMethodsMixin: NativeMethodsMixinType,
+        };
+        
+        /**
+         * Flat ReactNative renderer bundles are too big for Flow to parse efficiently.
+         * Provide minimal Flow typing for the high-level RN API and call it a day.
+         */
 export type ReactNativeType = {
-  NativeComponent: typeof ReactNativeComponent,
-  findNodeHandle(componentOrHandle: any): ?number,
-  render(
+            NativeComponent: typeof ReactNativeComponent,
+          findNodeHandle(componentOrHandle: any): ?number,
+          render(
     element: React$Element<any>,
-    containerTag: any,
-    callback: ?Function,
-  ): any,
-  unmountComponentAtNode(containerTag: number): any,
-  unmountComponentAtNodeAndRemoveContainer(containerTag: number): any,
-  unstable_batchedUpdates: any, // TODO (bvaughn) Add types
-
-  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: SecretInternalsType,
-};
-
+          containerTag: any,
+          callback: ?Function,
+        ): any,
+        unmountComponentAtNode(containerTag: number): any,
+        unmountComponentAtNodeAndRemoveContainer(containerTag: number): any,
+        unstable_batchedUpdates: any, // TODO (bvaughn) Add types
+      
+        __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: SecretInternalsType,
+      };
+      
 export type ReactFabricType = {
-  NativeComponent: typeof ReactNativeComponent,
-  findNodeHandle(componentOrHandle: any): ?number,
-  render(
+              NativeComponent: typeof ReactNativeComponent,
+            findNodeHandle(componentOrHandle: any): ?number,
+            render(
     element: React$Element<any>,
-    containerTag: any,
-    callback: ?Function,
-  ): any,
-  unmountComponentAtNode(containerTag: number): any,
-
-  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: SecretInternalsFabricType,
-};
+            containerTag: any,
+            callback: ?Function,
+          ): any,
+          unmountComponentAtNode(containerTag: number): any,
+        
+          __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: SecretInternalsFabricType,
+        };

RNTester/Podfile.lock

@@ -1,11 +1,7 @@
 PODS:
   - boost-for-react-native (1.63.0)
   - DoubleConversion (1.1.6)
-<<<<<<< HEAD
-  - Folly (2016.10.31.00):
-=======
   - Folly (2018.10.22.00):
->>>>>>> v0.58.6
     - boost-for-react-native
     - DoubleConversion
     - glog
@@ -108,17 +104,10 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   DoubleConversion: bb338842f62ab1d708ceb63ec3d999f0f3d98ecd
-<<<<<<< HEAD
-  Folly: c89ac2d5c6ab169cd7397ef27485c44f35f742c7
-  glog: e8acf0ebbf99759d3ff18c86c292a5898282dcde
-  React: 1fe0eb13d90b625d94c3b117c274dcfd2e760e11
-  yoga: b1ce48b6cf950b98deae82838f5173ea7cf89e85
-=======
   Folly: de497beb10f102453a1afa9edbf8cf8a251890de
   glog: aefd1eb5dda2ab95ba0938556f34b98e2da3a60d
   React: 9b873b38b92ed8012d7cdf3b965477095ed364c4
   yoga: 0885622311729a02c2bc02dca97167787a51488b
->>>>>>> v0.58.6
 
 PODFILE CHECKSUM: 7af77fbc34af9646e8c6389e7e2c0b4663bb16d9
 

ReactAndroid/libs/BUCK

@@ -8,13 +8,8 @@ fb_native.android_prebuilt_aar(
 
 fb_native.remote_file(
     name = "appcompat-binary-aar",
-<<<<<<< HEAD
-    sha1 = "22b1ef4ff9ef1a3513c18eb132d597eac6ef1a86",
-    url = "mvn:com.android.support:appcompat-v7:aar:27.1.1",
-=======
     sha1 = "132586ec59604a86703796851a063a0ac61f697b",
     url = "mvn:com.android.support:appcompat-v7:aar:28.0.0",
->>>>>>> v0.58.6
 )
 
 fb_native.android_prebuilt_aar(