Bump RN to 69 (software-mansion#3339)

## Description

Bump version of react-native to 69.

Author: piaskowyk

android/CMakeLists.txt

@@ -119,12 +119,23 @@ find_library(
         PATHS ${LIBRN_DIR}
         NO_CMAKE_FIND_ROOT_PATH
 )
-find_library(
-        FOLLY_JSON_LIB
-        folly_json
-        PATHS ${LIBRN_DIR}
-        NO_CMAKE_FIND_ROOT_PATH
-)
+
+if(${REACT_NATIVE_TARGET_VERSION} LESS 69)
+        find_library(
+                FOLLY_LIB
+                folly_json
+                PATHS ${LIBRN_DIR}
+                NO_CMAKE_FIND_ROOT_PATH
+        )
+else()
+        find_library(
+                FOLLY_LIB
+                folly_runtime
+                PATHS ${LIBRN_DIR}
+                NO_CMAKE_FIND_ROOT_PATH
+        )
+endif()
+
 find_library(
         REACT_NATIVE_JNI_LIB
         reactnativejni
@@ -169,7 +180,7 @@ if(${FOR_HERMES})
             ${HERMES_LIB}
             ${GLOG_LIB}
             ${FBJNI_LIB}
-            ${FOLLY_JSON_LIB}
+            ${FOLLY_LIB}
             ${REACT_NATIVE_JNI_LIB}
             android
     )
@@ -181,7 +192,7 @@ else()
             ${JSEXECUTOR_LIB}
             ${GLOG_LIB}
             ${FBJNI_LIB}
-            ${FOLLY_JSON_LIB}
+            ${FOLLY_LIB}
             ${REACT_NATIVE_JNI_LIB}
             android
     )

android/build.gradle

@@ -351,8 +351,8 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.2.2"
-        classpath "de.undercouch:gradle-download-task:4.1.2"
+        classpath "com.android.tools.build:gradle:7.1.1"
+        classpath "de.undercouch:gradle-download-task:5.0.1"
         classpath "com.diffplug.spotless:spotless-plugin-gradle:5.15.0"
     }
 }
@@ -381,8 +381,7 @@ android {
                         "-DBOOST_VERSION=${BOOST_VERSION}",
                         "-DBUILD_DIR=${buildDir}",
                         "-DFOR_HERMES=${FOR_HERMES}",
-                        "-DCLIENT_SIDE_BUILD=${CLIENT_SIDE_BUILD}",
-                        "--clean-first"
+                        "-DCLIENT_SIDE_BUILD=${CLIENT_SIDE_BUILD}"
                 abiFilters (*reactNativeArchitectures())
                 _stackProtectorFlag ? (cppFlags("-fstack-protector-all")) : null
             }
@@ -459,7 +458,12 @@ task createNativeDepsDirectories(dependsOn: applyJavaPatches) {
 }
 
 task downloadBoost(dependsOn: createNativeDepsDirectories, type: Download) {
-    src("https://github.com/react-native-community/boost-for-react-native/releases/download/v${BOOST_VERSION.replace("_", ".")}-0/boost_${BOOST_VERSION}.tar.gz")
+    def transformedVersion = BOOST_VERSION.replace("_", ".")
+    def srcUrl = "https://boostorg.jfrog.io/artifactory/main/release/${transformedVersion}/source/boost_${BOOST_VERSION}.tar.gz"
+    if (rnMinorVersion < 69) {
+        srcUrl = "https://github.com/react-native-community/boost-for-react-native/releases/download/v${transformedVersion}-0/boost_${BOOST_VERSION}.tar.gz"
+    }
+    src(srcUrl)
     onlyIfNewer(true)
     overwrite(false)
     dest(new File(downloadsDir, "boost_${BOOST_VERSION}.tar.gz"))
@@ -672,7 +676,17 @@ dependencies {
     extractHeaders("com.facebook.fbjni:fbjni:" + FBJNI_VERSION + ":headers")
     extractSO("com.facebook.fbjni:fbjni:" + FBJNI_VERSION)
 
-    def rnAAR = fileTree("$reactNative/android").matching({ it.include "**/**/*.aar" }).singleFile
+    def buildType = "debug"
+    tasks.all({ task ->
+        if (task.name == "buildCMakeRelease") {
+            buildType = "release"
+        }
+    })
+    def rnAarMatcher = "**/react-native/**/*${buildType}.aar"
+    if (rnMinorVersion < 69) {
+        rnAarMatcher = "**/**/*.aar"
+    }
+    def rnAAR = fileTree("$reactNative/android").matching({ it.include rnAarMatcher }).singleFile
     def jscAAR = fileTree("$reactNative/../jsc-android/dist/org/webkit/android-jsc").matching({ it.include "**/**/*.aar" }).singleFile
     extractSO(files(rnAAR, jscAAR))
 }

android/rnVersionPatch/69/.gitkeep

@@ -6,8 +6,8 @@ ROOT=$(pwd)
 
 unset CI
 
-versions=("0.68.0" "0.67.3" "0.66.3" "0.65.1" "0.64.3")
-version_name=("68" "67" "66" "65" "64")
+versions=("0.69.1" "0.68.2" "0.67.3" "0.66.3" "0.65.1")
+version_name=("69" "68" "67" "66" "65")
 
 for index in {0..4}
 do

createNPMPackage.sh

@@ -1,6 +1,6 @@
 {
   "name": "react-native-reanimated",
-  "version": "2.8.0",
+  "version": "2.9.0",
   "description": "More powerful alternative to Animated library for React Native.",
   "scripts": {
     "start": "node node_modules/react-native/local-cli/cli.js start",
@@ -84,9 +84,9 @@
     "string-hash-64": "^1.0.3"
   },
   "peerDependencies": {
+    "@babel/core": "^7.0.0-0",
     "react": "*",
-    "react-native": "*",
-    "@babel/core": "^7.0.0-0"
+    "react-native": "*"
   },
   "devDependencies": {
     "@babel/core": "^7.17.2",
@@ -122,11 +122,11 @@
     "lint-staged": "^11.2.0",
     "madge": "^5.0.1",
     "prettier": "^2.5.1",
-    "react": "17.0.2",
-    "react-native": "0.68.0",
+    "react": "18.0.0",
+    "react-native": "0.69.1",
     "react-native-codegen": "^0.0.7",
     "react-native-gesture-handler": "^1.6.1",
-    "react-test-renderer": "17.0.2",
+    "react-test-renderer": "18.0.0",
     "release-it": "^13.7.2",
     "typescript": "^4.1.3"
   },

package.json

@@ -9,4 +9,5 @@ export { default as View } from './reanimated2/component/View';
 export { default as ScrollView } from './reanimated2/component/ScrollView';
 export { default as Image } from './reanimated2/component/Image';
 export { default as FlatList } from './reanimated2/component/FlatList';
+// @ts-ignore backward compatibility with treeshaking
 export * from './reanimated1';

src/Animated.ts

@@ -1,6 +1,7 @@
 // tree-shaken side effects
 import './reanimated2/js-reanimated/global';
 
+// @ts-ignore backward compatibility with treeshaking
 export * from './reanimated1';
 export * from './reanimated2';
 export * as default from './Animated';

src/index.ts

@@ -25,11 +25,6 @@ if (shouldBeUseWeb()) {
       "[Reanimated] You can't use `scrollTo` with Chrome Debugger or with web version"
     );
   };
-  global._dispatchCommand = () => {
-    console.warn(
-      "[Reanimated] You can't use `scrollTo` or `dispatchCommand` methods with Chrome Debugger or with web version"
-    );
-  };
   global._setGestureState = () => {
     console.warn(
       "[Reanimated] You can't use `setGestureState` with Chrome Debugger or with web version"