react-native 0.60.1 → 0.60.5

package/Libraries/Components/TextInput/TextInput.js

@@ -252,6 +252,7 @@ type AndroidProps = $ReadOnly<{|
     | 'yes'
     | 'yesExcludeDescendants'
   ),
+  showSoftInputOnFocus?: ?boolean,
 |}>;
 
 type Props = $ReadOnly<{|
@@ -925,6 +926,12 @@ const TextInput = createReactClass({
       'newPassword',
       'oneTimeCode',
     ]),
+    /**
+     * When `false`, it will prevent the soft keyboard from showing when the field is focused.
+     * Defaults to `true`.
+     * @platform android
+     */
+    showSoftInputOnFocus: PropTypes.bool,
   },
   getDefaultProps() {
     return {

package/Libraries/Core/ReactNativeVersion.js

@@ -12,6 +12,6 @@
 exports.version = {
   major: 0,
   minor: 60,
-  patch: 1,
+  patch: 5,
   prerelease: null,
 };

package/Libraries/WebSocket/RCTReconnectingWebSocket.m

@@ -10,72 +10,10 @@
 #import <React/RCTConvert.h>
 #import <React/RCTDefines.h>
 
-#if __has_include(<React/fishhook.h>)
-#import <React/fishhook.h>
-#else
-#import <fishhook/fishhook.h>
-#endif
-
-#if __has_include(<os/log.h>) && defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 100300 /* __IPHONE_10_3 */
-#import <os/log.h>
-#endif /* __IPHONE_10_3 */
-
 #import "RCTSRWebSocket.h"
 
 #if RCT_DEV // Only supported in dev mode
 
-#if __has_include(<os/log.h>) && defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 100300 /* __IPHONE_10_3 */
-
-// From https://github.com/apple/swift/blob/ad40c770bfe372f879b530443a3d94761fe258a6/stdlib/public/SDK/os/os_log.m
-typedef struct os_log_pack_s {
-  uint64_t olp_continuous_time;
-  struct timespec olp_wall_time;
-  const void *olp_mh;
-  const void *olp_pc;
-  const char *olp_format;
-  uint8_t olp_data[0];
-} os_log_pack_s, *os_log_pack_t;
-
-static void (*orig__nwlog_pack)(os_log_pack_t pack, os_log_type_t logType);
-
-static void my__nwlog_pack(os_log_pack_t pack, os_log_type_t logType)
-{
-  if (logType == OS_LOG_TYPE_ERROR && strstr(pack->olp_format, "Connection has no connected handler") == NULL) {
-    orig__nwlog_pack(pack, logType);
-  }
-}
-
-#endif /* __IPHONE_10_3 */
-
-static void (*orig_nwlog_legacy_v)(int, char*, va_list);
-
-static void my_nwlog_legacy_v(int level, char *format, va_list args) {
-  static const uint buffer_size = 256;
-  static char buffer[buffer_size];
-  va_list copy;
-  va_copy(copy, args);
-  vsnprintf(buffer, buffer_size, format, copy);
-  va_end(copy);
-
-  if (strstr(buffer, "nw_connection_get_connected_socket_block_invoke") == NULL &&
-      strstr(buffer, "Connection has no connected handler") == NULL) {
-    orig_nwlog_legacy_v(level, format, args);
-  }
-}
-
-#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000 /* __IPHONE_11_0 */
-
-static void (*orig_os_log_error_impl)(void *dso, os_log_t log, os_log_type_t type, const char *format, uint8_t *buf, uint32_t size);
-
-static void my_os_log_error_impl(void *dso, os_log_t log, os_log_type_t type, const char *format, uint8_t *buf, uint32_t size)
-{
-  if (strstr(format, "TCP Conn %p Failed : error %ld:%d") == NULL) {
-    orig_os_log_error_impl(dso, log, type, format, buf, size);
-  }
-}
-
-#endif /* __IPHONE_11_0 */
-
 @interface RCTReconnectingWebSocket () <RCTSRWebSocketDelegate>
 @end
 
@@ -84,26 +22,6 @@ static void my_os_log_error_impl(void *dso, os_log_t log, os_log_type_t type, co
   RCTSRWebSocket *_socket;
 }
 
-+ (void)load
-{
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    rebind_symbols((struct rebinding[1]){
-      {"nwlog_legacy_v", my_nwlog_legacy_v, (void *)&orig_nwlog_legacy_v}
-    }, 1);
-#if __has_include(<os/log.h>) && defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 100300 /* __IPHONE_10_3 */
-    rebind_symbols((struct rebinding[1]){
-      {"__nwlog_pack", my__nwlog_pack, (void *)&orig__nwlog_pack}
-    }, 1);
-#endif /* __IPHONE_10_3 */
-#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000 /* __IPHONE_11_0 */
-    rebind_symbols((struct rebinding[1]){
-      {"_os_log_error_impl", my_os_log_error_impl, (void *)&orig_os_log_error_impl}
-    }, 1);
-#endif /* __IPHONE_11_0 */
-  });
-}
-
 - (instancetype)initWithURL:(NSURL *)url queue:(dispatch_queue_t)queue
 {
   if (self = [super init]) {

package/Libraries/WebSocket/RCTWebSocket.xcodeproj/project.pbxproj

@@ -9,113 +9,31 @@
 /* Begin PBXBuildFile section */
 		1338BBE01B04ACC80064A9C9 /* RCTSRWebSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 1338BBDD1B04ACC80064A9C9 /* RCTSRWebSocket.m */; };
 		1338BBE11B04ACC80064A9C9 /* RCTWebSocketExecutor.m in Sources */ = {isa = PBXBuildFile; fileRef = 1338BBDF1B04ACC80064A9C9 /* RCTWebSocketExecutor.m */; };
-		2D3ABDC220C7206E00DF56E9 /* libfishhook.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DBE0D001F3B181A0099AA32 /* libfishhook.a */; };
 		2D3B5F3D1D9B165B00451313 /* RCTSRWebSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 1338BBDD1B04ACC80064A9C9 /* RCTSRWebSocket.m */; };
 		2D3B5F3E1D9B165B00451313 /* RCTWebSocketExecutor.m in Sources */ = {isa = PBXBuildFile; fileRef = 1338BBDF1B04ACC80064A9C9 /* RCTWebSocketExecutor.m */; };
 		2D3B5F401D9B165B00451313 /* RCTWebSocketModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C86DF7B1ADF695F0047B81A /* RCTWebSocketModule.m */; };
 		3C86DF7C1ADF695F0047B81A /* RCTWebSocketModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C86DF7B1ADF695F0047B81A /* RCTWebSocketModule.m */; };
-		3DBE0D141F3B185A0099AA32 /* fishhook.c in Sources */ = {isa = PBXBuildFile; fileRef = 3DBE0D121F3B185A0099AA32 /* fishhook.c */; };
-		3DBE0D151F3B185A0099AA32 /* fishhook.c in Sources */ = {isa = PBXBuildFile; fileRef = 3DBE0D121F3B185A0099AA32 /* fishhook.c */; };
-		3DBE0D801F3B1AF00099AA32 /* fishhook.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3DBE0D131F3B185A0099AA32 /* fishhook.h */; };
-		3DBE0D821F3B1B0C0099AA32 /* fishhook.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3DBE0D131F3B185A0099AA32 /* fishhook.h */; };
 		A12E9E2E1E5DEC4E0029001B /* RCTReconnectingWebSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = A12E9E2D1E5DEC4E0029001B /* RCTReconnectingWebSocket.m */; };
 		A12E9E2F1E5DEC550029001B /* RCTReconnectingWebSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = A12E9E2D1E5DEC4E0029001B /* RCTReconnectingWebSocket.m */; };
-		ED297176215062BA00B7C4FE /* libfishhook-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DBE0D0D1F3B181C0099AA32 /* libfishhook-tvOS.a */; };
 /* End PBXBuildFile section */
 
-/* Begin PBXContainerItemProxy section */
-		3DBE0D0E1F3B18490099AA32 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 3C86DF3E1ADF2C930047B81A /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 3DBE0CF41F3B181A0099AA32;
-			remoteInfo = fishhook;
-		};
-		3DBE0D101F3B184D0099AA32 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 3C86DF3E1ADF2C930047B81A /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 3DBE0D011F3B181C0099AA32;
-			remoteInfo = "fishhook-tvOS";
-		};
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXCopyFilesBuildPhase section */
-		3DBE0D7F1F3B1AEC0099AA32 /* CopyFiles */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = include/fishhook;
-			dstSubfolderSpec = 16;
-			files = (
-				3DBE0D801F3B1AF00099AA32 /* fishhook.h in CopyFiles */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		3DBE0D811F3B1B010099AA32 /* CopyFiles */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = include/fishhook;
-			dstSubfolderSpec = 16;
-			files = (
-				3DBE0D821F3B1B0C0099AA32 /* fishhook.h in CopyFiles */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
 /* Begin PBXFileReference section */
 		1338BBDC1B04ACC80064A9C9 /* RCTSRWebSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTSRWebSocket.h; sourceTree = "<group>"; };
 		1338BBDD1B04ACC80064A9C9 /* RCTSRWebSocket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTSRWebSocket.m; sourceTree = "<group>"; };
 		1338BBDE1B04ACC80064A9C9 /* RCTWebSocketExecutor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTWebSocketExecutor.h; sourceTree = "<group>"; };
 		1338BBDF1B04ACC80064A9C9 /* RCTWebSocketExecutor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTWebSocketExecutor.m; sourceTree = "<group>"; };
-		13526A511F362F7F0008EF00 /* libfishhook.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libfishhook.a; sourceTree = "<group>"; };
 		2D2A28881D9B049200D4039D /* libRCTWebSocket-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libRCTWebSocket-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		2DC5E5271F3A6CFD000EE84B /* libfishhook-tvOS.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libfishhook-tvOS.a"; path = "../fishhook/build/Debug-appletvos/libfishhook-tvOS.a"; sourceTree = "<group>"; };
 		3C86DF461ADF2C930047B81A /* libRCTWebSocket.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTWebSocket.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		3C86DF7A1ADF695F0047B81A /* RCTWebSocketModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTWebSocketModule.h; sourceTree = "<group>"; };
 		3C86DF7B1ADF695F0047B81A /* RCTWebSocketModule.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = RCTWebSocketModule.m; sourceTree = "<group>"; tabWidth = 2; };
-		3DBE0D001F3B181A0099AA32 /* libfishhook.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libfishhook.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		3DBE0D0D1F3B181C0099AA32 /* libfishhook-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libfishhook-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		3DBE0D121F3B185A0099AA32 /* fishhook.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = fishhook.c; path = ../fishhook/fishhook.c; sourceTree = "<group>"; };
-		3DBE0D131F3B185A0099AA32 /* fishhook.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fishhook.h; path = ../fishhook/fishhook.h; sourceTree = "<group>"; };
 		A12E9E2C1E5DEC4E0029001B /* RCTReconnectingWebSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTReconnectingWebSocket.h; sourceTree = "<group>"; };
 		A12E9E2D1E5DEC4E0029001B /* RCTReconnectingWebSocket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTReconnectingWebSocket.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
-/* Begin PBXFrameworksBuildPhase section */
-		13526A4F1F362F770008EF00 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				2D3ABDC220C7206E00DF56E9 /* libfishhook.a in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		2DC5E5151F3A6C39000EE84B /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				ED297176215062BA00B7C4FE /* libfishhook-tvOS.a in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
 /* Begin PBXGroup section */
-		13526A501F362F7F0008EF00 /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				2DC5E5271F3A6CFD000EE84B /* libfishhook-tvOS.a */,
-				13526A511F362F7F0008EF00 /* libfishhook.a */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
 		3C86DF3D1ADF2C930047B81A = {
 			isa = PBXGroup;
 			children = (
-				3DBE0D121F3B185A0099AA32 /* fishhook.c */,
-				3DBE0D131F3B185A0099AA32 /* fishhook.h */,
 				A12E9E2C1E5DEC4E0029001B /* RCTReconnectingWebSocket.h */,
 				A12E9E2D1E5DEC4E0029001B /* RCTReconnectingWebSocket.m */,
 				1338BBDC1B04ACC80064A9C9 /* RCTSRWebSocket.h */,
@@ -137,8 +55,6 @@
 			children = (
 				3C86DF461ADF2C930047B81A /* libRCTWebSocket.a */,
 				2D2A28881D9B049200D4039D /* libRCTWebSocket-tvOS.a */,
-				3DBE0D001F3B181A0099AA32 /* libfishhook.a */,
-				3DBE0D0D1F3B181C0099AA32 /* libfishhook-tvOS.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -180,38 +96,6 @@
 			productReference = 3C86DF461ADF2C930047B81A /* libRCTWebSocket.a */;
 			productType = "com.apple.product-type.library.static";
 		};
-		3DBE0CF41F3B181A0099AA32 /* fishhook */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 3DBE0CFD1F3B181A0099AA32 /* Build configuration list for PBXNativeTarget "fishhook" */;
-			buildPhases = (
-				3DBE0D7F1F3B1AEC0099AA32 /* CopyFiles */,
-				3DBE0CF51F3B181A0099AA32 /* Sources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = fishhook;
-			productName = WebSocket;
-			productReference = 3DBE0D001F3B181A0099AA32 /* libfishhook.a */;
-			productType = "com.apple.product-type.library.static";
-		};
-		3DBE0D011F3B181C0099AA32 /* fishhook-tvOS */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 3DBE0D0A1F3B181C0099AA32 /* Build configuration list for PBXNativeTarget "fishhook-tvOS" */;
-			buildPhases = (
-				3DBE0D811F3B1B010099AA32 /* CopyFiles */,
-				3DBE0D021F3B181C0099AA32 /* Sources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = "fishhook-tvOS";
-			productName = "RCTWebSocket-tvOS";
-			productReference = 3DBE0D0D1F3B181C0099AA32 /* libfishhook-tvOS.a */;
-			productType = "com.apple.product-type.library.static";
-		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
@@ -244,8 +128,6 @@
 			targets = (
 				3C86DF451ADF2C930047B81A /* RCTWebSocket */,
 				2D2A28871D9B049200D4039D /* RCTWebSocket-tvOS */,
-				3DBE0CF41F3B181A0099AA32 /* fishhook */,
-				3DBE0D011F3B181C0099AA32 /* fishhook-tvOS */,
 			);
 		};
 /* End PBXProject section */
@@ -273,37 +155,8 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		3DBE0CF51F3B181A0099AA32 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				3DBE0D141F3B185A0099AA32 /* fishhook.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		3DBE0D021F3B181C0099AA32 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				3DBE0D151F3B185A0099AA32 /* fishhook.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXSourcesBuildPhase section */
 
-/* Begin PBXTargetDependency section */
-		3DBE0D0F1F3B18490099AA32 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 3DBE0CF41F3B181A0099AA32 /* fishhook */;
-			targetProxy = 3DBE0D0E1F3B18490099AA32 /* PBXContainerItemProxy */;
-		};
-		3DBE0D111F3B184D0099AA32 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 3DBE0D011F3B181C0099AA32 /* fishhook-tvOS */;
-			targetProxy = 3DBE0D101F3B184D0099AA32 /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
 /* Begin XCBuildConfiguration section */
 		2D2A288E1D9B049200D4039D /* Debug */ = {
 			isa = XCBuildConfiguration;
@@ -554,24 +407,6 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		3DBE0CFD1F3B181A0099AA32 /* Build configuration list for PBXNativeTarget "fishhook" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				3DBE0CFE1F3B181A0099AA32 /* Debug */,
-				3DBE0CFF1F3B181A0099AA32 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		3DBE0D0A1F3B181C0099AA32 /* Build configuration list for PBXNativeTarget "fishhook-tvOS" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				3DBE0D0B1F3B181C0099AA32 /* Debug */,
-				3DBE0D0C1F3B181C0099AA32 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 /* End XCConfigurationList section */
 	};
 	rootObject = 3C86DF3E1ADF2C930047B81A /* Project object */;

package/Libraries/WebSocket/React-RCTWebSocket.podspec

@@ -27,11 +27,9 @@ Pod::Spec.new do |s|
   s.author                 = "Facebook, Inc. and its affiliates"
   s.platforms              = { :ios => "9.0", :tvos => "9.2" }
   s.source                 = source
-  s.source_files           = "*.{h,m}",
-                             "Libraries/fishhook/*.{h,c}"
+  s.source_files           = "*.{h,m}"
   s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
   s.header_dir             = "React"
 
   s.dependency "React-Core", version
-  s.dependency "React-fishhook", version
 end

package/React/Base/RCTVersion.m

@@ -22,7 +22,7 @@ static void __makeVersion()
   __rnVersion = @{
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(60),
-                  RCTVersionPatch: @(1),
+                  RCTVersionPatch: @(5),
                   RCTVersionPrerelease: [NSNull null],
                   };
 }

package/React/Modules/RCTRedBox.m

@@ -161,7 +161,7 @@
 - (NSInteger)bottomSafeViewHeight
 {
     if (@available(iOS 11.0, *)) {
-        return [UIApplication sharedApplication].delegate.window.safeAreaInsets.bottom;
+        return RCTSharedApplication().delegate.window.safeAreaInsets.bottom;
     } else {
         return 0;
     }

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.60.1
+VERSION_NAME=0.60.5
 GROUP=com.facebook.react
 
 POM_NAME=ReactNative

package/ReactAndroid/src/main/java/com/facebook/hermes/unicode/AndroidUnicodeUtils.java

@@ -6,6 +6,7 @@
  */
 package com.facebook.hermes.unicode;
 
+import com.facebook.proguard.annotations.DoNotStrip;
 import java.text.Collator;
 import java.text.DateFormat;
 import java.text.Normalizer;
@@ -14,12 +15,15 @@ import java.util.Locale;
 // TODO: use com.facebook.common.locale.Locales.getApplicationLocale() as the current locale,
 // rather than the device locale. This is challenging because getApplicationLocale() is only
 // available via DI.
+@DoNotStrip
 public class AndroidUnicodeUtils {
+  @DoNotStrip
   public static int localeCompare(String left, String right) {
     Collator collator = Collator.getInstance();
     return collator.compare(left, right);
   }
 
+  @DoNotStrip
   public static String dateFormat(double unixtimeMs, boolean formatDate, boolean formatTime) {
     DateFormat format;
     if (formatDate && formatTime) {
@@ -34,6 +38,7 @@ public class AndroidUnicodeUtils {
     return format.format((long) unixtimeMs).toString();
   }
 
+  @DoNotStrip
   public static String convertToCase(String input, int targetCase, boolean useCurrentLocale) {
     // These values must match CaseConversion in PlatformUnicode.h
     final int targetUppercase = 0;
@@ -52,6 +57,7 @@ public class AndroidUnicodeUtils {
     }
   }
 
+  @DoNotStrip
   public static String normalize(String input, int form) {
     // Values must match NormalizationForm in PlatformUnicode.h.
     final int formC = 0;

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java

@@ -17,6 +17,6 @@ public class ReactNativeVersion {
   public static final Map<String, Object> VERSION = MapBuilder.<String, Object>of(
       "major", 0,
       "minor", 60,
-      "patch", 1,
+      "patch", 5,
       "prerelease", null);
 }

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java

@@ -6,11 +6,14 @@
 package com.facebook.react.uimanager;
 
 import android.graphics.Color;
+import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewParent;
 import androidx.core.view.ViewCompat;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 
 import com.facebook.react.R;
 import com.facebook.react.bridge.ReadableArray;
@@ -173,23 +176,23 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
     final String accessibilityLabel = (String) view.getTag(R.id.accessibility_label);
     final ReadableArray accessibilityStates = (ReadableArray) view.getTag(R.id.accessibility_states);
     final String accessibilityHint = (String) view.getTag(R.id.accessibility_hint);
-    StringBuilder contentDescription = new StringBuilder();
+    final List<String> contentDescription = new ArrayList<>();
     if (accessibilityLabel != null) {
-      contentDescription.append(accessibilityLabel + ", ");
+      contentDescription.add(accessibilityLabel);
     }
     if (accessibilityStates != null) {
       for (int i = 0; i < accessibilityStates.size(); i++) {
         String state = accessibilityStates.getString(i);
         if (sStateDescription.containsKey(state)) {
-          contentDescription.append(view.getContext().getString(sStateDescription.get(state)) + ", ");
+          contentDescription.add(view.getContext().getString(sStateDescription.get(state)));
         }
       }
     }
     if (accessibilityHint != null) {
-      contentDescription.append(accessibilityHint + ", ");
+      contentDescription.add(accessibilityHint);
     }
-    if (contentDescription.length() > 0) {
-      view.setContentDescription(contentDescription.toString());
+    if (contentDescription.size() > 0) {
+      view.setContentDescription(TextUtils.join(", ", contentDescription));
     }
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java

@@ -213,7 +213,9 @@ public class ReactEditText extends EditText {
     }
     setFocusableInTouchMode(true);
     boolean focused = super.requestFocus(direction, previouslyFocusedRect);
-    showSoftKeyboard();
+    if (getShowSoftInputOnFocus()) {
+      showSoftKeyboard();
+    }
     return focused;
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java

@@ -715,6 +715,12 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
     view.setBorderStyle(borderStyle);
   }
 
+  @ReactProp(name = "showSoftInputOnFocus", defaultBoolean = true)
+  public void showKeyboardOnFocus(ReactEditText view, boolean showKeyboardOnFocus) {
+    view.setShowSoftInputOnFocus(showKeyboardOnFocus);
+  }
+
+
   @ReactPropGroup(names = {
       ViewProps.BORDER_WIDTH,
       ViewProps.BORDER_LEFT_WIDTH,

package/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundDrawable.java

@@ -646,32 +646,32 @@ public class ReactViewBackgroundDrawable extends Drawable {
     }
 
     mPathForBorderRadiusOutline.addRoundRect(
-      mTempRectForBorderRadiusOutline,
-      new float[] {
-        topLeftRadius + extraRadiusForOutline,
-        topLeftRadius + extraRadiusForOutline,
-        topRightRadius + extraRadiusForOutline,
-        topRightRadius + extraRadiusForOutline,
-        bottomRightRadius + extraRadiusForOutline,
-        bottomRightRadius + extraRadiusForOutline,
-        bottomLeftRadius + extraRadiusForOutline,
-        bottomLeftRadius + extraRadiusForOutline
-      },
-      Path.Direction.CW);
+        mTempRectForBorderRadiusOutline,
+        new float[] {
+          topLeftRadius + extraRadiusForOutline,
+          topLeftRadius + extraRadiusForOutline,
+          topRightRadius + extraRadiusForOutline,
+          topRightRadius + extraRadiusForOutline,
+          bottomRightRadius + extraRadiusForOutline,
+          bottomRightRadius + extraRadiusForOutline,
+          bottomLeftRadius + extraRadiusForOutline,
+          bottomLeftRadius + extraRadiusForOutline
+        },
+        Path.Direction.CW);
 
     mCenterDrawPath.addRoundRect(
-      mTempRectForCenterDrawPath,
-      new float[] {
-        innerTopLeftRadiusX + (innerTopLeftRadiusX > 0 ? extraRadiusForOutline : 0),
-        innerTopLeftRadiusY + (innerTopLeftRadiusY > 0 ? extraRadiusForOutline : 0),
-        innerTopRightRadiusX + (innerTopRightRadiusX > 0 ? extraRadiusForOutline : 0),
-        innerTopRightRadiusY + (innerTopRightRadiusY > 0 ? extraRadiusForOutline : 0),
-        innerBottomRightRadiusX + (innerBottomRightRadiusX > 0 ? extraRadiusForOutline : 0),
-        innerBottomRightRadiusY + (innerBottomRightRadiusY > 0 ? extraRadiusForOutline : 0),
-        innerBottomLeftRadiusX + (innerBottomLeftRadiusX > 0 ? extraRadiusForOutline : 0),
-        innerBottomLeftRadiusY + (innerBottomLeftRadiusY > 0 ? extraRadiusForOutline : 0)
-      },
-      Path.Direction.CW);
+        mTempRectForCenterDrawPath,
+        new float[] {
+          innerTopLeftRadiusX + (topLeftRadius > 0 ? extraRadiusForOutline : 0),
+          innerTopLeftRadiusY + (topLeftRadius > 0 ? extraRadiusForOutline : 0),
+          innerTopRightRadiusX + (topRightRadius > 0 ? extraRadiusForOutline : 0),
+          innerTopRightRadiusY + (topRightRadius > 0 ? extraRadiusForOutline : 0),
+          innerBottomRightRadiusX + (bottomRightRadius > 0 ? extraRadiusForOutline : 0),
+          innerBottomRightRadiusY + (bottomRightRadius > 0 ? extraRadiusForOutline : 0),
+          innerBottomLeftRadiusX + (bottomLeftRadius > 0 ? extraRadiusForOutline : 0),
+          innerBottomLeftRadiusY + (bottomLeftRadius > 0 ? extraRadiusForOutline : 0)
+        },
+        Path.Direction.CW);
 
     /**
      * Rounded Multi-Colored Border Algorithm:

package/android/com/facebook/react/react-native/0.60.5/react-native-0.60.5-javadoc.jar.md5

@@ -0,0 +1 @@
+4ca96aa48a90430c0db348b10d2c0c2c

package/android/com/facebook/react/react-native/0.60.5/react-native-0.60.5-javadoc.jar.sha1

@@ -0,0 +1 @@
+7294ac6b01cff14ca0651ff23861dd2d97fcab92

package/android/com/facebook/react/react-native/0.60.5/react-native-0.60.5-sources.jar.md5

@@ -0,0 +1 @@
+d89ff34b6415d18a686ed859a2cf85e5

package/android/com/facebook/react/react-native/0.60.5/react-native-0.60.5-sources.jar.sha1

@@ -0,0 +1 @@
+635fabaefff2d6cd4f36ef62fe41c7d7ee991df3

package/android/com/facebook/react/react-native/0.60.5/react-native-0.60.5.aar.md5

@@ -0,0 +1 @@
+8409c91445b6ec9c6cb46bb34329eea8

package/android/com/facebook/react/react-native/0.60.5/react-native-0.60.5.aar.sha1

@@ -0,0 +1 @@
+326ba9370bddd10ad2c3d73ff7c70235e1c09cd9

package/android/com/facebook/react/react-native/{0.60.1/react-native-0.60.1.pom → 0.60.5/react-native-0.60.5.pom}

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.facebook.react</groupId>
   <artifactId>react-native</artifactId>
-  <version>0.60.1</version>
+  <version>0.60.5</version>
   <packaging>aar</packaging>
   <name>ReactNative</name>
   <description>A framework for building native apps with React</description>

package/android/com/facebook/react/react-native/0.60.5/react-native-0.60.5.pom.md5

@@ -0,0 +1 @@
+8830d738e28370e6724dbeaa85355d18

package/android/com/facebook/react/react-native/0.60.5/react-native-0.60.5.pom.sha1

@@ -0,0 +1 @@
+61d3f816dc0a84aecadf04de2f145f53b41a5a0a

package/android/com/facebook/react/react-native/maven-metadata.xml

@@ -3,10 +3,10 @@
   <groupId>com.facebook.react</groupId>
   <artifactId>react-native</artifactId>
   <versioning>
-    <release>0.60.1</release>
+    <release>0.60.5</release>
     <versions>
-      <version>0.60.1</version>
+      <version>0.60.5</version>
     </versions>
-    <lastUpdated>20190711155744</lastUpdated>
+    <lastUpdated>20190813172609</lastUpdated>
   </versioning>
 </metadata>

package/android/com/facebook/react/react-native/maven-metadata.xml.md5

@@ -1 +1 @@
-f44765d0f5b5803a2906dcd9bcf04703
+e78377e13304ef88649c33e3c4584ab8

package/android/com/facebook/react/react-native/maven-metadata.xml.sha1

@@ -1 +1 @@
-63464388686fdf01091a24c9e3e4b011646961f5
+071489cffd23c2b186e5414e9651789b75f09d78