[0.61.0-rc.0] Bump version numbers

Update CircleCI config as per support request
Revert "[0.61.0-rc.0] Bump version numbers"
2025-11-01 09:14:26 +00:00 · 2019-08-27 16:20:02 +02:00 · 2019-08-27 16:18:55 +02:00 · 2019-08-27 16:16:31 +02:00 · 2019-08-26 16:29:47 +02:00 · 2019-08-26 15:52:43 +02:00
46 changed files with 261 additions and 88 deletions
@@ -659,6 +659,14 @@ workflows:
      - publish_npm_package:
          requires:
            - setup_android
+          filters:
+            # Both of the following conditions must be included!
+            # Ignore any commit on any branch by default.
+            branches:
+              ignore: /.*/
+            # Only act on version tags.
+            tags:
+              only: /v[0-9]+(\.[0-9]+)*(\-rc(\.[0-9]+)?)?/

  analysis:
    jobs:
@@ -29,6 +29,7 @@ Pod::Spec.new do |s|
  s.source_files           = "**/*.{m}"
  s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
  s.header_dir             = "ART"
+  s.static_framework       = true

  s.dependency "React-Core/ARTHeaders", version
 end
@@ -30,6 +30,7 @@ Pod::Spec.new do |s|
  s.source_files           = "*.{m}"
  s.preserve_paths          = "package.json", "LICENSE", "LICENSE-docs"
  s.header_dir             = "RCTActionSheet"
+  s.static_framework       = true

  s.dependency "React-Core/RCTActionSheetHeaders", version
 end
@@ -30,9 +30,10 @@ Pod::Spec.new do |s|
  s.source_files           = "*.{m,mm}", "RCTBlobCollector.h"
  s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
  s.header_dir             = "RCTBlob"
+  s.static_framework       = true

  s.dependency "React-Core/RCTBlobHeaders", version
-  s.dependency "React-Core/RCTWebSocket", version
  s.dependency "React-RCTNetwork", version
+  s.dependency "React-RCTWebSocket", version
  s.dependency "React-jsi", version
 end
@@ -1,17 +1,17 @@
 /**
+ * @generated by scripts/bump-oss-version.js
+ *
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
 * LICENSE file in the root directory of this source tree.
 *
- * @format
- * @generated by scripts/bump-oss-version.js
 * @flow
 */

 exports.version = {
  major: 0,
-  minor: 0,
+  minor: 61,
  patch: 0,
-  prerelease: null,
+  prerelease: 'rc.0',
 };
@@ -32,6 +32,7 @@ Pod::Spec.new do |s|
  s.source                 = source
  s.source_files           = "**/*.{c,h,m,mm,cpp}"
  s.header_dir             = "FBReactNativeSpec"
+  s.static_framework       = true

  s.pod_target_xcconfig    = {
                               "USE_HEADERMAP" => "YES",
@@ -6,6 +6,7 @@
 */

 #import <React/RCTAnimatedImage.h>
+#import <React/RCTDefines.h>

@interface RCTUIImageViewAnimated : UIImageView

@@ -6,6 +6,7 @@
 */

 #import <React/RCTUIImageViewAnimated.h>
+#import <React/RCTWeakProxy.h>

 #import <mach/mach.h>
 #import <objc/runtime.h>
@@ -146,8 +147,7 @@ static NSUInteger RCTDeviceFreeMemory() {
 - (CADisplayLink *)displayLink
 {
  if (!_displayLink) {
-    __weak __typeof(self) weakSelf = self;
-    _displayLink = [CADisplayLink displayLinkWithTarget:weakSelf selector:@selector(displayDidRefresh:)];
+    _displayLink = [CADisplayLink displayLinkWithTarget:[RCTWeakProxy weakProxyWithTarget:self] selector:@selector(displayDidRefresh:)];
    NSString *runLoopMode = [NSProcessInfo processInfo].activeProcessorCount > 1 ? NSRunLoopCommonModes : NSDefaultRunLoopMode;
    [_displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:runLoopMode];
  }
@@ -30,6 +30,7 @@ Pod::Spec.new do |s|
  s.source_files           = "*.{m}"
  s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
  s.header_dir             = "RCTImage"
+  s.static_framework       = true

  s.dependency "React-Core/RCTImageHeaders", version
  s.dependency "React-RCTNetwork", version
@@ -30,6 +30,7 @@ Pod::Spec.new do |s|
  s.source_files           = "*.{m}"
  s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
  s.header_dir             = "RCTLinking"
+  s.static_framework       = true

  s.dependency "React-Core/RCTLinkingHeaders", version
 end
@@ -29,6 +29,7 @@ Pod::Spec.new do |s|
  s.source_files           = "{Drivers/*,Nodes/*,*}.{m}"
  s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
  s.header_dir             = "RCTAnimation"
+  s.static_framework       = true

  s.dependency "React-Core/RCTAnimationHeaders", version
 end
@@ -29,6 +29,7 @@ Pod::Spec.new do |s|
  s.source_files           = "*.{m,mm}"
  s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
  s.header_dir             = "RCTNetwork"
+  s.static_framework       = true

  s.dependency "React-Core/RCTNetworkHeaders", version
 end
@@ -30,6 +30,7 @@ Pod::Spec.new do |s|
  s.source_files           = "*.{m}"
  s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
  s.header_dir             = "RCTPushNotification"
+  s.static_framework       = true

  s.dependency "React-Core/RCTPushNotificationHeaders", version
 end
@@ -28,4 +28,5 @@ Pod::Spec.new do |s|
  s.source                 = source
  s.source_files           = "**/*.{c,h,m,mm,cpp}"
  s.header_dir             = "RCTRequired"
+  s.static_framework       = true
 end
@@ -30,6 +30,7 @@ Pod::Spec.new do |s|
  s.source_files           = "*.{m}"
  s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
  s.header_dir             = "RCTSettings"
+  s.static_framework       = true

  s.dependency "React-Core/RCTSettingsHeaders", version
 end
@@ -30,6 +30,7 @@ Pod::Spec.new do |s|
  s.source_files           = "**/*.{h,m}"
  s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
  s.header_dir             = "RCTText"
+  s.static_framework       = true

  s.dependency "React-Core/RCTTextHeaders", version
 end
@@ -32,6 +32,7 @@ Pod::Spec.new do |s|
  s.source                 = source
  s.source_files           = "**/*.{c,h,m,mm,cpp}"
  s.header_dir             = "RCTTypeSafety"
+  s.static_framework       = true
  s.pod_target_xcconfig    = {
                               "USE_HEADERMAP" => "YES",
                               "CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
@@ -30,6 +30,7 @@ Pod::Spec.new do |s|
  s.source_files           = "*.{m}"
  s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
  s.header_dir             = "RCTVibration"
+  s.static_framework       = true

  s.dependency "React-Core/RCTVibrationHeaders", version
 end
@@ -0,0 +1,36 @@
+# coding: utf-8
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+require "json"
+
+package = JSON.parse(File.read(File.join(__dir__, "..", "..", "package.json")))
+version = package['version']
+
+source = { :git => 'https://github.com/facebook/react-native.git' }
+if version == '1000.0.0'
+  # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
+  source[:commit] = `git rev-parse HEAD`.strip
+else
+  source[:tag] = "v#{version}"
+end
+
+Pod::Spec.new do |s|
+  s.name                   = "React-RCTWebSocket"
+  s.version                = version
+  s.summary                = "A library for supporting WebSockets, a protocol which provides full-duplex communication channels over a single TCP connection." 
+  s.homepage               = "http://facebook.github.io/react-native/"
+  s.documentation_url      = "https://facebook.github.io/react-native/docs/network#websocket-support"
+  s.license                = package["license"]
+  s.author                 = "Facebook, Inc. and its affiliates"
+  s.platforms              = { :ios => "9.0", :tvos => "9.2" }
+  s.source                 = source
+  s.source_files           = "*.{m}"
+  s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
+  s.header_dir             = "RCTWebSocket"
+  s.static_framework       = true
+
+  s.dependency "React-Core/RCTWebSocketHeaders", version
+end
@@ -27,8 +27,7 @@ PODS:
    - React-Core (= 1000.0.0)
  - React (1000.0.0):
    - React-Core (= 1000.0.0)
-    - React-Core/DevSupport (= 1000.0.0)
-    - React-Core/RCTWebSocket (= 1000.0.0)
+    - React-DevSupport (= 1000.0.0)
    - React-RCTActionSheet (= 1000.0.0)
    - React-RCTAnimation (= 1000.0.0)
    - React-RCTBlob (= 1000.0.0)
@@ -38,6 +37,7 @@ PODS:
    - React-RCTSettings (= 1000.0.0)
    - React-RCTText (= 1000.0.0)
    - React-RCTVibration (= 1000.0.0)
+    - React-RCTWebSocket (= 1000.0.0)
  - React-ART (1000.0.0):
    - React-Core/ARTHeaders (= 1000.0.0)
  - React-Core (1000.0.0):
@@ -71,15 +71,13 @@ PODS:
    - React-jsi (= 1000.0.0)
    - React-jsiexecutor (= 1000.0.0)
    - yoga (= 1000.0.0.React)
-  - React-Core/DevSupport (1000.0.0):
+  - React-Core/DevSupportHeaders (1000.0.0):
    - Folly (= 2018.10.22.00)
    - glog
-    - React-Core/Default (= 1000.0.0)
-    - React-Core/RCTWebSocket (= 1000.0.0)
+    - React-Core/Default
    - React-cxxreact (= 1000.0.0)
    - React-jsi (= 1000.0.0)
    - React-jsiexecutor (= 1000.0.0)
-    - React-jsinspector (= 1000.0.0)
    - yoga (= 1000.0.0.React)
  - React-Core/RCTActionSheetHeaders (1000.0.0):
    - Folly (= 2018.10.22.00)
@@ -161,10 +159,10 @@ PODS:
    - React-jsi (= 1000.0.0)
    - React-jsiexecutor (= 1000.0.0)
    - yoga (= 1000.0.0.React)
-  - React-Core/RCTWebSocket (1000.0.0):
+  - React-Core/RCTWebSocketHeaders (1000.0.0):
    - Folly (= 2018.10.22.00)
    - glog
-    - React-Core/Default (= 1000.0.0)
+    - React-Core/Default
    - React-cxxreact (= 1000.0.0)
    - React-jsi (= 1000.0.0)
    - React-jsiexecutor (= 1000.0.0)
@@ -173,13 +171,16 @@ PODS:
    - FBReactNativeSpec (= 1000.0.0)
    - Folly (= 2018.10.22.00)
    - React-Core/CoreModulesHeaders (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
  - React-cxxreact (1000.0.0):
    - boost-for-react-native (= 1.63.0)
    - DoubleConversion
    - Folly (= 2018.10.22.00)
    - glog
    - React-jsinspector (= 1000.0.0)
+  - React-DevSupport (1000.0.0):
+    - React-Core/DevSupportHeaders (= 1000.0.0)
+    - React-jsinspector (= 1000.0.0)
+    - React-RCTWebSocket (= 1000.0.0)
  - React-jsi (1000.0.0):
    - boost-for-react-native (= 1.63.0)
    - DoubleConversion
@@ -204,9 +205,9 @@ PODS:
    - React-Core/RCTAnimationHeaders (= 1000.0.0)
  - React-RCTBlob (1000.0.0):
    - React-Core/RCTBlobHeaders (= 1000.0.0)
-    - React-Core/RCTWebSocket (= 1000.0.0)
    - React-jsi (= 1000.0.0)
    - React-RCTNetwork (= 1000.0.0)
+    - React-RCTWebSocket (= 1000.0.0)
  - React-RCTImage (1000.0.0):
    - React-Core/RCTImageHeaders (= 1000.0.0)
    - React-RCTNetwork (= 1000.0.0)
@@ -224,6 +225,8 @@ PODS:
    - React-Core/RCTTextHeaders (= 1000.0.0)
  - React-RCTVibration (1000.0.0):
    - React-Core/RCTVibrationHeaders (= 1000.0.0)
+  - React-RCTWebSocket (1000.0.0):
+    - React-Core/RCTWebSocketHeaders (= 1000.0.0)
  - ReactCommon/jscallinvoker (1000.0.0):
    - DoubleConversion
    - Folly (= 2018.10.22.00)
@@ -259,10 +262,9 @@ DEPENDENCIES:
  - React (from `../`)
  - React-ART (from `../Libraries/ART`)
  - React-Core (from `../`)
-  - React-Core/DevSupport (from `../`)
-  - React-Core/RCTWebSocket (from `../`)
  - React-CoreModules (from `../React/CoreModules`)
  - React-cxxreact (from `../ReactCommon/cxxreact`)
+  - React-DevSupport (from `../React`)
  - React-jsi (from `../ReactCommon/jsi`)
  - React-jsiexecutor (from `../ReactCommon/jsiexecutor`)
  - React-jsinspector (from `../ReactCommon/jsinspector`)
@@ -277,6 +279,7 @@ DEPENDENCIES:
  - React-RCTTest (from `RCTTest`)
  - React-RCTText (from `../Libraries/Text`)
  - React-RCTVibration (from `../Libraries/Vibration`)
+  - React-RCTWebSocket (from `../Libraries/WebSocket`)
  - ReactCommon/jscallinvoker (from `../ReactCommon`)
  - ReactCommon/turbomodule/core (from `../ReactCommon`)
  - ReactCommon/turbomodule/samples (from `../ReactCommon`)
@@ -311,6 +314,8 @@ EXTERNAL SOURCES:
    :path: "../React/CoreModules"
  React-cxxreact:
    :path: "../ReactCommon/cxxreact"
+  React-DevSupport:
+    :path: "../React"
  React-jsi:
    :path: "../ReactCommon/jsi"
  React-jsiexecutor:
@@ -339,6 +344,8 @@ EXTERNAL SOURCES:
    :path: "../Libraries/Text"
  React-RCTVibration:
    :path: "../Libraries/Vibration"
+  React-RCTWebSocket:
+    :path: "../Libraries/WebSocket"
  ReactCommon:
    :path: "../ReactCommon"
  yoga:
@@ -348,31 +355,33 @@ SPEC CHECKSUMS:
  boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
  DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
  FBLazyVector: 34431b7e61740bed29b082ff81500b0ffafaffa0
-  FBReactNativeSpec: e9febd2d5cc091662f172724165922b2e28d10a3
+  FBReactNativeSpec: 0c434153f44d4a1cbd111fbde1502580475e9132
  Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
  glog: 1f3da668190260b06b429bb211bfbee5cd790c28
-  RCTRequired: 33f3b89d2d82ef01c02b9b4f8146c43762e509d8
-  RCTTypeSafety: 2b1cb2d92b779aa9a3522f67bd4f07e6b6d0797e
-  React: 28a654b69575941571c073a656bc06795825e7f7
-  React-ART: a5da06a892342d03896e0db45a7072525981f63c
-  React-Core: 47b8ab211d9325292811e62ee23c54b464853111
-  React-CoreModules: 38d8cc34497674ae3d411e644a9b17ad75ef3f74
-  React-cxxreact: 7c4242192149ce0205b53efaa03e3bf86ba4337c
-  React-jsi: 98d1f9d8a79d2720ba6a44c2d928a77f315b7e4f
-  React-jsiexecutor: c0ab8c80a6e88380d63f583690a50d4a723b47b5
-  React-jsinspector: ea0a218071a11c3687cef2480580180caa6a64c0
-  React-RCTActionSheet: 090e7bd7c5774d919c47c4eeff78223a7fd8c19c
-  React-RCTAnimation: 73d536fff417a101724d9529189c95a94263710c
-  React-RCTBlob: 86017e0ba937b94445c5f680fef27ab831700fe7
-  React-RCTImage: 7f5c9bff34905f1bc216be512ba0ae68f872208a
-  React-RCTLinking: d7d7f792e63a8d57380cecbb9b7a3b31f92d1bb6
-  React-RCTNetwork: c8f9d40297f35ea3792ea81866f33e8b45c25935
-  React-RCTPushNotification: acffa8af6a20e6d41b041a8c4cb4bea0de9df0dd
-  React-RCTSettings: dd4009546ce88c3647c32f0b5922459ab313fdca
-  React-RCTTest: 73df09ec226fcad6e7e058a313e5dd16cccf86a8
-  React-RCTText: 9078167d3bc011162326f2d8ef4dd580ec1eca17
-  React-RCTVibration: 63c20d89204937ff8c7bbc1e712383347e6fbd90
-  ReactCommon: 63d1a6355d5810a21a61efda9ac93804571a1b8b
+  RCTRequired: 770d733d8b6881e0ecd1085d0eb7f57dfacc5d93
+  RCTTypeSafety: 8540a73bafd032be534cb683471f985dc656bfb6
+  React: 7c652b87c228731c51ab5764de68b6c17e6342be
+  React-ART: 84555d2fcff922e3fed8ce70b5fb2536fb7c163e
+  React-Core: 266e5912bbfd0bddb866782b9bb560d82c5b8ef4
+  React-CoreModules: 018c3d55a5bfbd04655489942a8c606527176eed
+  React-cxxreact: 8cbb09bfdf4241546c5f4a9f46d92f63295281e0
+  React-DevSupport: f5349e286c067443895e6ae60d808eeaabedf472
+  React-jsi: ec7bccfadb03c9aa26db7ba880a02b983b921316
+  React-jsiexecutor: 173df46fcbafe60986cd5e42bde45e693c783af9
+  React-jsinspector: 426757e28a6909b49f7dd126f6f1dbd2783764f8
+  React-RCTActionSheet: a172ba63176ca80d7440f29fdd65515b442e4232
+  React-RCTAnimation: 276dde8150bb1a7d9eef8f3b44db66bddebedec3
+  React-RCTBlob: d60bf36ef77d3fb9e39a46443ea89c68381b4650
+  React-RCTImage: 29cbf7ccc2b89ac7ac6d9f2c84c15cfabaeabe6b
+  React-RCTLinking: 387d21f8fd4423dde220bf18be9715054cfc7cf5
+  React-RCTNetwork: ad750ce9bd98d382020174b14537d2ffa09427e0
+  React-RCTPushNotification: 90e1127e8f243296eef48c35dba370588405728b
+  React-RCTSettings: 405b277fb5afed794564af2d99ab71315806768d
+  React-RCTTest: c999df66263f36ddd63328356ac5898f2089e91e
+  React-RCTText: 667603cc6464856a6314a05b3d605da0a7fbf8e3
+  React-RCTVibration: 775cffcf1040bfa92fea6982f43d5f1a438edf05
+  React-RCTWebSocket: c10d7eecfc66d58ece635508dc1e8ecf6b548c60
+  ReactCommon: 7fd06e02cb448d0260cb7219cf0057984b49de17
  yoga: b72aa5b3708cc93c5897f8297122d6eba1331e07

 PODFILE CHECKSUM: 060903e270072f1e192b064848e6c34528af1c87
@@ -30,6 +30,7 @@ Pod::Spec.new do |s|
  s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
  s.framework              = "XCTest"
  s.header_dir             = "RCTTest"
-  
+  s.static_framework       = true
+
  s.dependency "React-Core", version
 end
@@ -131,6 +131,7 @@
 		E7DB20F822B2BD53005AC45F /* libReact-ART.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libReact-ART.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		E7DB20FA22B2BD53005AC45F /* libReact-Core.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libReact-Core.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		E7DB20FC22B2BD53005AC45F /* libReact-cxxreact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libReact-cxxreact.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		E7DB20FE22B2BD53005AC45F /* libReact-DevSupport.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libReact-DevSupport.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		E7DB210222B2BD53005AC45F /* libReact-jsi.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libReact-jsi.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		E7DB210422B2BD53005AC45F /* libReact-jsiexecutor.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libReact-jsiexecutor.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		E7DB210622B2BD53005AC45F /* libReact-jsinspector.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libReact-jsinspector.a"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -144,6 +145,7 @@
 		E7DB211622B2BD53005AC45F /* libReact-RCTSettings.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libReact-RCTSettings.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		E7DB211822B2BD53005AC45F /* libReact-RCTText.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libReact-RCTText.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		E7DB211A22B2BD53005AC45F /* libReact-RCTVibration.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libReact-RCTVibration.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		E7DB211C22B2BD53005AC45F /* libReact-RCTWebSocket.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libReact-RCTWebSocket.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		E7DB212222B2BD53005AC45F /* libyoga.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libyoga.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		E7DB212422B2C342005AC45F /* libOCMock.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libOCMock.a; sourceTree = "<group>"; };
 		E7DB212622B2C342005AC45F /* OCMockObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMockObject.h; sourceTree = "<group>"; };
@@ -249,6 +251,7 @@
 				E7DB20F822B2BD53005AC45F /* libReact-ART.a */,
 				E7DB20FA22B2BD53005AC45F /* libReact-Core.a */,
 				E7DB20FC22B2BD53005AC45F /* libReact-cxxreact.a */,
+				E7DB20FE22B2BD53005AC45F /* libReact-DevSupport.a */,
 				E7DB210222B2BD53005AC45F /* libReact-jsi.a */,
 				E7DB210422B2BD53005AC45F /* libReact-jsiexecutor.a */,
 				E7DB210622B2BD53005AC45F /* libReact-jsinspector.a */,
@@ -262,6 +265,7 @@
 				E7DB211622B2BD53005AC45F /* libReact-RCTSettings.a */,
 				E7DB211822B2BD53005AC45F /* libReact-RCTText.a */,
 				E7DB211A22B2BD53005AC45F /* libReact-RCTVibration.a */,
+				E7DB211C22B2BD53005AC45F /* libReact-RCTWebSocket.a */,
 				E7DB212222B2BD53005AC45F /* libyoga.a */,
 				F94084777080D7B374FB4783 /* libPods-RNTester.a */,
 				8210317F3CE28B1945488740 /* libPods-RNTesterIntegrationTests.a */,
@@ -703,6 +707,7 @@
 					"\"${PODS_ROOT}/Headers/Public/DoubleConversion\"",
 					"\"${PODS_ROOT}/Headers/Public/React-ART\"",
 					"\"${PODS_ROOT}/Headers/Public/React-Core\"",
+					"\"${PODS_ROOT}/Headers/Public/React-DevSupport\"",
 					"\"${PODS_ROOT}/Headers/Public/React-Fabric\"",
 					"\"${PODS_ROOT}/Headers/Public/React-RCTActionSheet\"",
 					"\"${PODS_ROOT}/Headers/Public/React-RCTAnimation\"",
@@ -716,6 +721,7 @@
 					"\"${PODS_ROOT}/Headers/Public/React-RCTSettings\"",
 					"\"${PODS_ROOT}/Headers/Public/React-RCTText\"",
 					"\"${PODS_ROOT}/Headers/Public/React-RCTVibration\"",
+					"\"${PODS_ROOT}/Headers/Public/React-RCTWebSocket\"",
 					"\"${PODS_ROOT}/Headers/Public/React-cxxreact\"",
 					"\"${PODS_ROOT}/Headers/Public/React-fishhook\"",
 					"\"${PODS_ROOT}/Headers/Public/React-jsi\"",
@@ -757,6 +763,7 @@
 					"\"${PODS_ROOT}/Headers/Public/DoubleConversion\"",
 					"\"${PODS_ROOT}/Headers/Public/React-ART\"",
 					"\"${PODS_ROOT}/Headers/Public/React-Core\"",
+					"\"${PODS_ROOT}/Headers/Public/React-DevSupport\"",
 					"\"${PODS_ROOT}/Headers/Public/React-Fabric\"",
 					"\"${PODS_ROOT}/Headers/Public/React-RCTActionSheet\"",
 					"\"${PODS_ROOT}/Headers/Public/React-RCTAnimation\"",
@@ -770,6 +777,7 @@
 					"\"${PODS_ROOT}/Headers/Public/React-RCTSettings\"",
 					"\"${PODS_ROOT}/Headers/Public/React-RCTText\"",
 					"\"${PODS_ROOT}/Headers/Public/React-RCTVibration\"",
+					"\"${PODS_ROOT}/Headers/Public/React-RCTWebSocket\"",
 					"\"${PODS_ROOT}/Headers/Public/React-cxxreact\"",
 					"\"${PODS_ROOT}/Headers/Public/React-fishhook\"",
 					"\"${PODS_ROOT}/Headers/Public/React-jsi\"",
@@ -23,6 +23,7 @@ boost_compiler_flags = '-Wno-documentation'

 header_subspecs = {
  'ARTHeaders'                  => 'Libraries/ART/**/*.h',
+  'DevSupportHeaders'           => 'React/{DevSupport/*.h,Inspector/*.h}',
  'CoreModulesHeaders'          => 'React/CoreModules/**/*.h',
  'RCTActionSheetHeaders'       => 'Libraries/ActionSheetIOS/*.h',
  'RCTAnimationHeaders'         => 'Libraries/NativeAnimation/{Drivers/*,Nodes/*,*}.{h}',
@@ -33,7 +34,9 @@ header_subspecs = {
  'RCTPushNotificationHeaders'  => 'Libraries/PushNotificationIOS/*.h',
  'RCTSettingsHeaders'          => 'Libraries/Settings/*.h',
  'RCTTextHeaders'              => 'Libraries/Text/**/*.h',
+  'RCTSettingsHeaders'          => 'Libraries/Settings/*.h',
  'RCTVibrationHeaders'         => 'Libraries/Vibration/*.h',
+  'RCTWebSocketHeaders'         => 'Libraries/WebSocket/*.h',
 }

 Pod::Spec.new do |s|
@@ -47,11 +50,12 @@ Pod::Spec.new do |s|
  s.source                 = source
  s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
  s.header_dir             = "React"
+  s.static_framework       = true
  s.framework              = "JavaScriptCore"
  s.library                = "stdc++"
  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Folly\"" }
  s.user_target_xcconfig   = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Headers/Private/React-Core\""}
-  s.default_subspec        = "Default"
+  s.default_subspec         = "Default"

  s.subspec "Default" do |ss|
    ss.source_files           = "React/**/*.{c,h,m,mm,S,cpp}"
@@ -69,20 +73,6 @@ Pod::Spec.new do |s|
    ss.private_header_files   = "React/Cxx*/*.h"
  end

-  s.subspec "DevSupport" do |ss|
-    ss.source_files = "React/DevSupport/*.{h,mm,m}",
-                      "React/Inspector/*.{h,mm,m}"
-
-    ss.dependency "React-Core/Default", version
-    ss.dependency "React-Core/RCTWebSocket", version
-    ss.dependency "React-jsinspector", version
-  end
-
-  s.subspec "RCTWebSocket" do |ss|
-    ss.source_files = "Libraries/WebSocket/*.{h,m}"
-    ss.dependency "React-Core/Default", version
-  end
-
  # Add a subspec containing just the headers for each
  # pod that should live under <React/*.h>
  header_subspecs.each do |name, headers|
@@ -43,8 +43,7 @@ Pod::Spec.new do |s|
  s.cocoapods_version      = ">= 1.2.0"

  s.dependency "React-Core", version
-  s.dependency "React-Core/DevSupport", version
-  s.dependency "React-Core/RCTWebSocket", version
+  s.dependency "React-DevSupport", version
  s.dependency "React-RCTActionSheet", version
  s.dependency "React-RCTAnimation", version
  s.dependency "React-RCTBlob", version
@@ -54,4 +53,5 @@ Pod::Spec.new do |s|
  s.dependency "React-RCTSettings", version
  s.dependency "React-RCTText", version
  s.dependency "React-RCTVibration", version
+  s.dependency "React-RCTWebSocket", version
 end
@@ -21,11 +21,11 @@ NSDictionary* RCTGetReactNativeVersion(void)
  static dispatch_once_t onceToken;
  dispatch_once(&onceToken, ^(void){
    __rnVersion = @{
-                    RCTVersionMajor: @(0),
-                    RCTVersionMinor: @(0),
-                    RCTVersionPatch: @(0),
-                    RCTVersionPrerelease: [NSNull null],
-                    };
+                  RCTVersionMajor: @(0),
+                  RCTVersionMinor: @(61),
+                  RCTVersionPatch: @(0),
+                  RCTVersionPrerelease: @"rc.0",
+                  };
  });
  return __rnVersion;
 }
@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <Foundation/Foundation.h>
+
+@interface RCTWeakProxy : NSObject
+
+@property (nonatomic, weak, readonly) id target;
+
+ (instancetype)weakProxyWithTarget:(id)target;
+
+@end
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTWeakProxy.h"
+
+@implementation RCTWeakProxy
+
+- (instancetype)initWithTarget:(id)target
+{
+  if (self = [super init]) {
+    _target = target;
+  }
+  return self;
+}
+
+ (instancetype)weakProxyWithTarget:(id)target
+{
+  return [[RCTWeakProxy alloc] initWithTarget:target];
+}
+
+- (id)forwardingTargetForSelector:(SEL)aSelector
+{
+  return _target;
+}
+
+@end
@@ -32,6 +32,7 @@ Pod::Spec.new do |s|
  s.source                 = source
  s.source_files           = "**/*.{c,m,mm,cpp}"
  s.header_dir             = "CoreModules"
+  s.static_framework       = true
  s.pod_target_xcconfig    = {
                               "USE_HEADERMAP" => "YES",
                               "CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
@@ -41,5 +42,4 @@ Pod::Spec.new do |s|
  s.dependency "FBReactNativeSpec", version
  s.dependency "Folly", folly_version
  s.dependency "React-Core/CoreModulesHeaders", version
-  s.dependency "ReactCommon/turbomodule/core", version
 end
@@ -0,0 +1,37 @@
+# coding: utf-8
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+require "json"
+
+package = JSON.parse(File.read(File.join(__dir__, "..", "package.json")))
+version = package['version']
+
+source = { :git => 'https://github.com/facebook/react-native.git' }
+if version == '1000.0.0'
+  # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
+  source[:commit] = `git rev-parse HEAD`.strip
+else
+  source[:tag] = "v#{version}"
+end
+
+Pod::Spec.new do |s|
+  s.name                   = "React-DevSupport"
+  s.version                = version
+  s.summary                = "-"  # TODO
+  s.homepage               = "http://facebook.github.io/react-native/"
+  s.license                = package["license"]
+  s.author                 = "Facebook, Inc. and its affiliates"
+  s.platforms              = { :ios => "9.0", :tvos => "9.2" }
+  s.source                 = source
+  s.source_files           = "DevSupport/*.{mm,m}",
+                             "Inspector/*.{mm,m}"
+  s.header_dir             = "DevSupport"
+  s.static_framework       = true
+
+  s.dependency "React-Core/DevSupportHeaders", version
+  s.dependency "React-RCTWebSocket", version
+  s.dependency "React-jsinspector", version
+end
@@ -36,6 +36,7 @@ Pod::Spec.new do |s|
                             "**/android/*",
  s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
  s.header_dir             = "React"
+  s.static_framework       = true
  s.framework              = "JavaScriptCore"
  s.library                = "stdc++"
  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Folly\" \"$(PODS_ROOT)/Headers/Private/React-Core\"" }
@@ -356,7 +356,6 @@ android {

 dependencies {
    api("com.facebook.infer.annotation:infer-annotation:0.11.2")
-    api("com.facebook.yoga:proguard-annotations:1.14.1")
    api("javax.inject:javax.inject:1")
    api("androidx.appcompat:appcompat:1.0.2")
    api("com.facebook.fresco:fresco:${FRESCO_VERSION}")
@@ -1,4 +1,4 @@
-VERSION_NAME=1000.0.0-master
+VERSION_NAME=0.61.0-rc.0
 GROUP=com.facebook.react

 POM_NAME=ReactNative
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
+ * directory of this source tree.
+ */
+package com.facebook.proguard.annotations;
+
+import static java.lang.annotation.RetentionPolicy.CLASS;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Add this annotation to a class, method, or field to instruct Proguard to not strip it out.
+ *
+ * <p>This is useful for methods called via reflection that could appear as unused to Proguard.
+ */
+@Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD, ElementType.CONSTRUCTOR})
+@Retention(CLASS)
+public @interface DoNotStrip {}
@@ -16,7 +16,7 @@ import java.util.Map;
 public class ReactNativeVersion {
  public static final Map<String, Object> VERSION = MapBuilder.<String, Object>of(
      "major", 0,
-      "minor", 0,
+      "minor", 61,
      "patch", 0,
-      "prerelease", null);
+      "prerelease", "rc.0");
 }
@@ -36,6 +36,7 @@ Pod::Spec.new do |s|
  s.library                = "stdc++"
  s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES",
                            "CLANG_CXX_LANGUAGE_STANDARD" => "c++14" }
+  s.static_framework       = true

  s.dependency folly_dep_name, folly_version
  s.dependency "React-graphics", version
@@ -32,6 +32,7 @@ Pod::Spec.new do |s|
  s.platforms              = { :ios => "9.0", :tvos => "9.2" }
  s.source                 = source
  s.header_dir             = "ReactCommon" # Use global header_dir for all subspecs for use_framework compatibility
+  s.static_framework       = true
  s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Headers/Private/React-Core\"",
                               "USE_HEADERMAP" => "YES",
@@ -35,6 +35,7 @@ Pod::Spec.new do |s|
  s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Folly\" \"$(PODS_ROOT)/DoubleConversion\"" }
  s.header_dir             = "cxxreact"
+  s.static_framework       = true

  s.dependency "boost-for-react-native", "1.63.0"
  s.dependency "DoubleConversion"
@@ -35,6 +35,7 @@ Pod::Spec.new do |s|
  s.exclude_files          = "**/tests/*",
                             "**/android/*"
  s.header_dir             = "react/graphics"
+  s.static_framework       = true
  s.pod_target_xcconfig  = { "USE_HEADERMAP" => "NO", "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" }

  s.dependency "Folly/Fabric", folly_version
@@ -36,6 +36,7 @@ Pod::Spec.new do |s|
  s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Folly\" \"$(PODS_ROOT)/DoubleConversion\"" }
  s.header_dir             = "jsi"
+  s.static_framework       = true
  s.default_subspec        = "Default"

  s.dependency "boost-for-react-native", "1.63.0"
@@ -34,6 +34,7 @@ Pod::Spec.new do |s|
  s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Folly\" \"$(PODS_ROOT)/DoubleConversion\"" }
  s.header_dir             = "jsireact"
+  s.static_framework       = true

  s.dependency "React-cxxreact", version
  s.dependency "React-jsi", version
@@ -28,4 +28,5 @@ Pod::Spec.new do |s|
  s.source                 = source
  s.source_files           = "*.{cpp,h}"
  s.header_dir             = 'jsinspector'
+  s.static_framework       = true
 end
@@ -1,6 +1,6 @@
 {
  "name": "react-native",
-  "version": "1000.0.0",
+  "version": "0.61.0-rc.0",
  "bin": "./cli.js",
  "description": "A framework for building native apps using React",
  "license": "MIT",
@@ -170,4 +170,4 @@
      }
    }
  }
-}
+}
@@ -26,10 +26,10 @@ def use_react_native! (options={})
  pod 'React-RCTSettings', :path => "#{prefix}/Libraries/Settings"
  pod 'React-RCTText', :path => "#{prefix}/Libraries/Text"
  pod 'React-RCTVibration', :path => "#{prefix}/Libraries/Vibration"
-  pod 'React-Core/RCTWebSocket', :path => "#{prefix}/"
+  pod 'React-RCTWebSocket', :path => "#{prefix}/Libraries/WebSocket"

  unless production
-    pod 'React-Core/DevSupport', :path => "#{prefix}/"
+    pod 'React-DevSupport', :path => "#{prefix}/React"
  end

  pod 'React-cxxreact', :path => "#{prefix}/ReactCommon/cxxreact"
@@ -53,15 +53,7 @@ read -n 1

 ./gradlew :RNTester:android:app:installJscDebug || error "Couldn't build RNTester Android"

-info "Press any key to run RNTester in an already running Android emulator/device"
-info ""
-read -n 1
-adb shell am start -n com.facebook.react.uiapp/.RNTesterActivity
-
-info "Press any key to open the workspace in Xcode, then build and test manually."
-info ""
-read -n 1
-open "RNTester/RNTesterPods.xcworkspace"
+npm pack

 info "When done testing RNTester app on iOS and Android press any key to continue."
 info ""
@@ -91,6 +83,8 @@ grep -E "com.facebook.react:react-native:\\+" "${project_name}/android/app/build

 success "New sample project generated at /tmp/${project_name}"

+cd "/tmp/${project_name}" 
+
 info "Test the following on Android:"
 info "   - Disable Fast Refresh. It might be enabled from last time (the setting is stored on the device)"
 info "   - Verify 'Reload JS' works"
@@ -98,7 +92,7 @@ info ""
 info "Press any key to run the sample in Android emulator/device"
 info ""
 read -n 1
-cd "/tmp/${project_name}" && react-native run-android
+yarn react-native run-android

 info "Test the following on iOS:"
 info "   - Disable Fast Refresh. It might be enabled from last time (the setting is stored on the device)"
@@ -111,7 +105,7 @@ info ""
 info "Press any key to open the project in Xcode"
 info ""
 read -n 1
-open "/tmp/${project_name}/ios/${project_name}.xcodeproj"
+yarn react-native run-ios

 cd "$repo_root"

@@ -10,7 +10,7 @@ target 'HelloWorld' do
  pod 'React', :path => '../node_modules/react-native/'
  pod 'React-Core', :path => '../node_modules/react-native/'
  pod 'React-CoreModules', :path => '../node_modules/react-native/React/CoreModules'
-  pod 'React-Core/DevSupport', :path => '../node_modules/react-native/'
+  pod 'React-DevSupport', :path => '../node_modules/react-native/React'
  pod 'React-RCTActionSheet', :path => '../node_modules/react-native/Libraries/ActionSheetIOS'
  pod 'React-RCTAnimation', :path => '../node_modules/react-native/Libraries/NativeAnimation'
  pod 'React-RCTBlob', :path => '../node_modules/react-native/Libraries/Blob'
@@ -20,7 +20,7 @@ target 'HelloWorld' do
  pod 'React-RCTSettings', :path => '../node_modules/react-native/Libraries/Settings'
  pod 'React-RCTText', :path => '../node_modules/react-native/Libraries/Text'
  pod 'React-RCTVibration', :path => '../node_modules/react-native/Libraries/Vibration'
-  pod 'React-Core/RCTWebSocket', :path => '../node_modules/react-native/'
+  pod 'React-RCTWebSocket', :path => '../node_modules/react-native/Libraries/WebSocket'

  pod 'React-cxxreact', :path => '../node_modules/react-native/ReactCommon/cxxreact'
  pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi'
@@ -10,7 +10,7 @@
  },
  "dependencies": {
    "react": "16.8.1",
-    "react-native": "1000.0.0"
+    "react-native": "0.61.0-rc.0"
  },
  "devDependencies": {
    "@babel/core": "^7.5.0",
Author	SHA1	Message	Date
grabbou	c57bfea01e	[0.61.0-rc.0] Bump version numbers	2019-08-27 16:20:02 +02:00
Mike Grabowski	fafc58b62d	Update CircleCI config as per support request	2019-08-27 16:18:55 +02:00
grabbou	eded25d532	Revert "[0.61.0-rc.0] Bump version numbers" This reverts commit `bc28eee87f`.	2019-08-27 16:16:31 +02:00
grabbou	bc28eee87f	[0.61.0-rc.0] Bump version numbers	2019-08-26 16:29:47 +02:00
Mehdi Mulani	104b0cc862	Remove RCTUIImageViewAnimated WeakProxy gating Summary: To help determine how severe this issue is, put the fix behind a MC. We will only pick the parent diff to the RC branch so that the fix immediately goes to master and we don't have to worry about fixing this any further. Reviewed By: fkgozali Differential Revision: D16940181 fbshipit-source-id: 91eb08181f82f51aea6a20b3fd489a33bdc0e424	2019-08-26 15:52:43 +02:00
Mehdi Mulani	6d6b532f8f	Add RCTWeakProxy to properly deallocate RCTUIImageViewAnimated Summary: @public CADisplayLink strongly holds onto its target, so you have to use a weak proxy object to pass the target into the CADisplayLink. Previously we passed a weak-self point (i.e. weakSelf) but this did not have the intended effect, since the pointer to self would still be passed to CADisplayLink, and thus it would hold onto the RCTUIImageViewAnimated strongly. So is weakSelf doing anything other than using self? It is but it's very minor and not useful. In the case that the object got de-allocated between assigning self to weakSelf and creating the CADisplayLink, then we would pass a nil target. This is actually impossible though because we are running an instance method, so self is implicitly retained! So semantically it is something different but in practice it is the same as passing self through. Notes: * This system was added originally in https://github.com/facebook/react-native/pull/24822 * https://github.com/facebook/react-native/pull/25636 then "enabled" this system by deprecating existing approach Reviewed By: fkgozali Differential Revision: D16939869 fbshipit-source-id: 7a0e947896f23aa30ad074d1dcb4d4db7543e00a	2019-08-26 15:52:37 +02:00
grabbou	1dd1152025	Revert "[0.61.0-rc.0] Bump version numbers" This reverts commit `2575eb318f`.	2019-08-26 15:52:30 +02:00
grabbou	2575eb318f	[0.61.0-rc.0] Bump version numbers	2019-08-22 12:40:24 +02:00
grabbou	1dd68819ab	Revert "[0.61.0-rc.0] Bump version numbers" This reverts commit `9296ab1a61`.	2019-08-22 12:39:59 +02:00
grabbou	9296ab1a61	[0.61.0-rc.0] Bump version numbers	2019-08-22 12:21:46 +02:00
grabbou	612c033918	Revert "Remove 's.static_framework = true' requirement for podspec (#25816 )" This reverts commit `ca9e108110`.	2019-08-22 08:59:52 +02:00
grabbou	f827ea90b0	Revert "Remove vendored proguard annotation (#26069 )" This reverts commit `35fc0add2d`.	2019-08-21 14:40:10 +02:00
Mike Grabowski	b356ac7769	Tweak script to work with no global CLI	2019-08-20 23:20:02 +02:00
Mike Grabowski	5485238bb4	Bump test version for cache issues	2019-08-20 23:18:17 +02:00