Merge react-native 0.61-stable

.ado/android-pr.yml

@@ -78,10 +78,10 @@ jobs:
           #verbosityPack: 'Detailed' # Options: quiet, normal, detailed
           #arguments: # Required when command == Custom
 
-      - task: CmdLine@2
-        displayName: Setup Build Dependencies
-        inputs:
-          script: .ado\setup_droid_deps.bat
+#      - task: CmdLine@2
+#        displayName: Setup Build Dependencies
+#        inputs:
+#          script: .ado\setup_droid_deps.bat
 
       - task: CmdLine@2
         displayName: Remove RNTesterApp.android.bundle
@@ -95,8 +95,8 @@ jobs:
 
       - task: Gradle@1
         displayName: gradlew installArchives
-        env:
-          REACT_NATIVE_DEPENDENCIES: $(System.DefaultWorkingDirectory)\build_deps
+#        env:
+#          REACT_NATIVE_DEPENDENCIES: $(System.DefaultWorkingDirectory)\build_deps
         inputs:
           gradleWrapperFile: gradlew
           # workingDirectory: src\react-native\

.ado/publish.yml

@@ -157,15 +157,15 @@ jobs:
           #verbosityPack: 'Detailed' # Options: quiet, normal, detailed
           #arguments: # Required when command == Custom
 
-      - task: CmdLine@2
-        displayName: Setup Build Dependencies
-        inputs:
-          script: .ado\setup_droid_deps.bat
+#      - task: CmdLine@2
+#        displayName: Setup Build Dependencies
+#        inputs:
+#          script: .ado\setup_droid_deps.bat
 
       - task: Gradle@1
         displayName: gradlew installArchives
-        env:
-          REACT_NATIVE_DEPENDENCIES: $(System.DefaultWorkingDirectory)\build_deps
+#        env:
+#          REACT_NATIVE_DEPENDENCIES: $(System.DefaultWorkingDirectory)\build_deps
         inputs:
           gradleWrapperFile: gradlew
           # workingDirectory: src\react-native\

.ado/templates/apple-droid-node-patching.yml

@@ -5,4 +5,4 @@ steps:
   - task: CmdLine@2
     displayName: Apply Android specific patches for Office consumption
     inputs:
-      script: node $(System.DefaultWorkingDirectory)/android-patches/bundle/bundle.js patch $(System.DefaultWorkingDirectory) BuildAndThirdPartyFixes DialogModule UIEditText UIScroll UITextFont Accessibility OfficeRNHost SecurityFixes V8Integration AnnotationProcessing --patch-store $(System.DefaultWorkingDirectory)/android-patches/patches-droid-office-grouped --log-folder $(System.DefaultWorkingDirectory)/android-patches/logs --confirm ${{ parameters.apply_office_patches }}
+      script: node $(System.DefaultWorkingDirectory)/android-patches/bundle/bundle.js patch $(System.DefaultWorkingDirectory) BasicBuild V8Integration --patch-store $(System.DefaultWorkingDirectory)/android-patches/patches-0.61.5 --log-folder $(System.DefaultWorkingDirectory)/android-patches/logs --confirm ${{ parameters.apply_office_patches }}

.ado/templates/apple-job-react-native.yml

@@ -32,6 +32,13 @@ steps:
     inputs:
       script: yarn install
 
+  - task: CmdLine@2
+    displayName: pod install
+    inputs:
+      script: |
+        cd RNTester
+        pod install
+
   - task: ShellScript@2
     displayName: 'Setup packager and WebSocket test server'
     inputs:
@@ -50,7 +57,7 @@ steps:
     parameters:
       xcode_sdk: ${{ parameters.xcode_sdk }}
       xcode_configuration: Debug
-      xcode_workspacePath: RNTester/RNTester.xcodeproj
+      xcode_workspacePath: RNTester/RNTesterPods.xcworkspace
       xcode_scheme: ${{ parameters.xcode_scheme }}
       xcode_actions: ${{ parameters.xcode_actions_debug }}
       xcode_useXcpretty: true
@@ -60,7 +67,7 @@ steps:
     parameters:
       xcode_sdk: ${{ parameters.xcode_sdk }}
       xcode_configuration: Release
-      xcode_workspacePath: RNTester/RNTester.xcodeproj
+      xcode_workspacePath: RNTester/RNTesterPods.xcworkspace
       xcode_scheme: ${{ parameters.xcode_scheme }}
       xcode_actions: ${{ parameters.xcode_actions_release }}
       xcode_useXcpretty: false

.ado/templates/prep-android-nuget.yml

@@ -14,5 +14,5 @@ steps:
     inputs:
       targetType: inline # filePath | inline
       script: |
-        (Get-Content android\com\facebook\react\react-native\0.60.0\react-native-0.60.0.pom).replace('<version>0.60.0</version>', '<version>1000.0.0-master</version>') | Set-Content android\com\facebook\react\react-native\0.60.0\react-native-0.60.0.pom
+        (Get-Content android\com\facebook\react\react-native\0.61.5\react-native-0.61.5.pom).replace('<version>0.61.5</version>', '<version>1000.0.0-master</version>') | Set-Content android\com\facebook\react\react-native\0.61.5\react-native-0.61.5.pom
 

.appveyor/config.yml

@@ -1,13 +1,13 @@
 environment:
   ANDROID_HOME: "C:\\android-sdk-windows"
-  ANDROID_NDK: "C:\\android-sdk-windows\\android-ndk-r17c"
+  ANDROID_NDK: "C:\\android-sdk-windows\\android-ndk-r19c"
   ANDROID_BUILD_VERSION: 28
   ANDROID_TOOLS_VERSION: 28.0.3
 
   GRADLE_OPTS: -Dorg.gradle.daemon=false
 
   SDK_TOOLS_URL: https://dl.google.com/android/repository/sdk-tools-windows-3859397.zip
-  NDK_TOOLS_URL: https://dl.google.com/android/repository/android-ndk-r17c-windows-x86_64.zip
+  NDK_TOOLS_URL: https://dl.google.com/android/repository/android-ndk-r19c-windows-x86_64.zip
 
   matrix:
     - nodejs_version: 8
@@ -38,7 +38,7 @@ build_script:
   - yarn run flow-check-android
   - yarn run flow-check-ios
   - yarn run test
-  - gradlew.bat RNTester:android:app:assembleRelease
+  # - gradlew.bat RNTester:android:app:assembleRelease
 
 cache:
   - node_modules