From 123d0d9e9ca4bcb53051c1e9270e77adfa7a5c80 Mon Sep 17 00:00:00 2001 From: Marc Rousavy Date: Fri, 30 Jul 2021 09:50:09 +0200 Subject: [PATCH] chore(deps): Upgrade react-native-reanimated to alpha.2 (#309) * Upgrade react-native-reanimated to alpha.2 * fix Android header search path * Make `const` --- android/CMakeLists.txt | 3 +- .../src/main/cpp/JImageProxyHostObject.cpp | 2 +- android/src/main/cpp/JImageProxyHostObject.h | 2 +- example/ios/Podfile.lock | 4 +- example/package.json | 2 +- example/yarn.lock | 11 ++-- package.json | 2 +- yarn.lock | 64 ++++--------------- 8 files changed, 28 insertions(+), 62 deletions(-) diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt index 68ab0c9..b45302b 100644 --- a/android/CMakeLists.txt +++ b/android/CMakeLists.txt @@ -47,6 +47,7 @@ target_include_directories( "${NODE_MODULES_DIR}/react-native-reanimated/Common/cpp/headers/SpecTools" "${NODE_MODULES_DIR}/react-native-reanimated/Common/cpp/headers/SharedItems" "${NODE_MODULES_DIR}/react-native-reanimated/Common/cpp/headers/Registries" + "${NODE_MODULES_DIR}/react-native-reanimated/Common/cpp/headers/LayoutAnimations" "${NODE_MODULES_DIR}/react-native-reanimated/Common/cpp/hidden_headers" "src/main/cpp" ) @@ -127,4 +128,4 @@ target_link_libraries( ${FBJNI_LIB} ${FOLLY_JSON_LIB} android -) \ No newline at end of file +) diff --git a/android/src/main/cpp/JImageProxyHostObject.cpp b/android/src/main/cpp/JImageProxyHostObject.cpp index 2e7776f..1743ee7 100644 --- a/android/src/main/cpp/JImageProxyHostObject.cpp +++ b/android/src/main/cpp/JImageProxyHostObject.cpp @@ -70,7 +70,7 @@ jsi::Value JImageProxyHostObject::get(jsi::Runtime& runtime, const jsi::PropName return jsi::Value::undefined(); } -void JImageProxyHostObject::assertIsFrameStrong(jsi::Runtime& runtime, const std::string& accessedPropName) { +void JImageProxyHostObject::assertIsFrameStrong(jsi::Runtime& runtime, const std::string& accessedPropName) const { if (!this->frame) { auto message = "Cannot get `" + accessedPropName + "`, frame is already closed!"; throw jsi::JSError(runtime, message.c_str()); diff --git a/android/src/main/cpp/JImageProxyHostObject.h b/android/src/main/cpp/JImageProxyHostObject.h index db89fa8..d24dd3e 100644 --- a/android/src/main/cpp/JImageProxyHostObject.h +++ b/android/src/main/cpp/JImageProxyHostObject.h @@ -33,7 +33,7 @@ class JSI_EXPORT JImageProxyHostObject : public jsi::HostObject { private: static auto constexpr TAG = "VisionCamera"; - void assertIsFrameStrong(jsi::Runtime& runtime, const std::string& accessedPropName); // NOLINT(runtime/references) + void assertIsFrameStrong(jsi::Runtime& runtime, const std::string& accessedPropName) const; // NOLINT(runtime/references) }; } // namespace vision diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index b861748..c4b6b14 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -289,7 +289,7 @@ PODS: - React-RCTText - RNGestureHandler (1.10.3): - React-Core - - RNReanimated (2.2.0): + - RNReanimated (2.3.0-alpha.2): - DoubleConversion - FBLazyVector - FBReactNativeSpec @@ -487,7 +487,7 @@ SPEC CHECKSUMS: ReactCommon: 149906e01aa51142707a10665185db879898e966 ReactNativeNavigation: 5303d00327dab4e26f74c3164b23ba3119664e77 RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211 - RNReanimated: 9c13c86454bfd54dab7505c1a054470bfecd2563 + RNReanimated: daebbd404c0cd9df6daa248d63dd940086bea9ff RNStaticSafeAreaInsets: 6103cf09647fa427186d30f67b0f5163c1ae8252 RNVectorIcons: 31cebfcf94e8cf8686eb5303ae0357da64d7a5a4 VisionCamera: 35bd0ff9611655b0e5506c1721da45e006f3398e diff --git a/example/package.json b/example/package.json index 7e592e9..a9fbdc8 100644 --- a/example/package.json +++ b/example/package.json @@ -19,7 +19,7 @@ "react-native-gesture-handler": "^1.10.3", "react-native-navigation": "^7.16.0", "react-native-pressable-opacity": "^1.0.4", - "react-native-reanimated": "^2.2.0", + "react-native-reanimated": "^2.3.0-alpha.2", "react-native-static-safe-area-insets": "^2.1.1", "react-native-vector-icons": "^8.0.0", "react-native-video": "^5.1.1" diff --git a/example/yarn.lock b/example/yarn.lock index b024d6c..9f835c7 100644 --- a/example/yarn.lock +++ b/example/yarn.lock @@ -4726,13 +4726,14 @@ react-native-pressable-opacity@^1.0.4: resolved "https://registry.yarnpkg.com/react-native-pressable-opacity/-/react-native-pressable-opacity-1.0.4.tgz#391f33fdc25cb84551f2743a25eced892b9f30f7" integrity sha512-DBIg7UoRiuBYiFEvx+XNMqH0OEx64WrSksXhT6Kq9XuyyKsThMNDqZ9G5QV7vfu7dU2/IctwIz5c0Xwkp4K3tA== -react-native-reanimated@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-2.2.0.tgz#a6412c56b4e591d1f00fac949f62d0c72c357c78" - integrity sha512-lOJDd+5w1gY6DHGXG2jD1dsjzQmXQ2699HUc3IztvI2WP4zUT+UAA+zSG+5JiBS5DUnTL8YhhkmUQmr1KNGO5w== +react-native-reanimated@^2.3.0-alpha.2: + version "2.3.0-alpha.2" + resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-2.3.0-alpha.2.tgz#2bd0655f7a3b90606f93c59199a99885ee72b745" + integrity sha512-SpzW1rPMjpy7dMEKo30873pmgj0cgczBgUHvrOKKCCPJbaQXR6w6pOGrTW5M6BQtM8zpIPPwSJN+p3G9W49aiA== dependencies: "@babel/plugin-transform-object-assign" "^7.10.4" - fbjs "^3.0.0" + invariant "^2.2.4" + lodash.isequal "^4.5.0" mockdate "^3.0.2" string-hash-64 "^1.0.3" diff --git a/package.json b/package.json index 5a93404..fad0b70 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "react": "^17.0.2", "react-native": "^0.64.2", "react-native-builder-bob": "^0.18.1", - "react-native-reanimated": "^2.2.0", + "react-native-reanimated": "^2.3.0-alpha.2", "release-it": "^14.6.1", "typescript": "4.3.2" }, diff --git a/yarn.lock b/yarn.lock index adb991e..2406a48 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1909,7 +1909,7 @@ arrify@^1.0.1: resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0= -asap@~2.0.3, asap@~2.0.6: +asap@~2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= @@ -2784,13 +2784,6 @@ cosmiconfig@^5.0.5, cosmiconfig@^5.1.0: js-yaml "^3.13.1" parse-json "^4.0.0" -cross-fetch@^3.0.4: - version "3.1.4" - resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.4.tgz#9723f3a3a247bf8b89039f3a380a9244e8fa2f39" - integrity sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ== - dependencies: - node-fetch "2.6.1" - cross-spawn@^6.0.0: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" @@ -3501,24 +3494,6 @@ fb-watchman@^2.0.0: dependencies: bser "2.1.1" -fbjs-css-vars@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz#216551136ae02fe255932c3ec8775f18e2c078b8" - integrity sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ== - -fbjs@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-3.0.0.tgz#0907067fb3f57a78f45d95f1eacffcacd623c165" - integrity sha512-dJd4PiDOFuhe7vk4F80Mba83Vr2QuK86FoxtgPmzBqEJahncp+13YCmfoa53KHCo6OnlXLG7eeMWPfB5CrpVKg== - dependencies: - cross-fetch "^3.0.4" - fbjs-css-vars "^1.0.0" - loose-envify "^1.0.0" - object-assign "^4.1.0" - promise "^7.1.1" - setimmediate "^1.0.5" - ua-parser-js "^0.7.18" - figures@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" @@ -4953,6 +4928,11 @@ lodash.debounce@^4.0.8: resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= +lodash.isequal@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" + integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= + lodash.ismatch@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37" @@ -5577,7 +5557,7 @@ node-dir@^0.1.17: dependencies: minimatch "^3.0.2" -node-fetch@2.6.1, node-fetch@^2.2.0, node-fetch@^2.6.0, node-fetch@^2.6.1: +node-fetch@^2.2.0, node-fetch@^2.6.0, node-fetch@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== @@ -5673,7 +5653,7 @@ ob1@0.64.0: resolved "https://registry.yarnpkg.com/ob1/-/ob1-0.64.0.tgz#f254a55a53ca395c4f9090e28a85483eac5eba19" integrity sha512-CO1N+5dhvy+MoAwxz8+fymEUcwsT4a+wHhrHFb02LppcJdHxgcBWviwEhUwKOD2kLMQ7ijrrzybOqpGcqEtvpQ== -object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: +object-assign@^4.0.1, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= @@ -6177,13 +6157,6 @@ progress@^2.0.0: resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== -promise@^7.1.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" - integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg== - dependencies: - asap "~2.0.3" - promise@^8.0.3: version "8.1.0" resolved "https://registry.yarnpkg.com/promise/-/promise-8.1.0.tgz#697c25c3dfe7435dd79fcd58c38a135888eaf05e" @@ -6339,13 +6312,14 @@ react-native-codegen@^0.0.6: jscodeshift "^0.11.0" nullthrows "^1.1.1" -react-native-reanimated@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-2.2.0.tgz#a6412c56b4e591d1f00fac949f62d0c72c357c78" - integrity sha512-lOJDd+5w1gY6DHGXG2jD1dsjzQmXQ2699HUc3IztvI2WP4zUT+UAA+zSG+5JiBS5DUnTL8YhhkmUQmr1KNGO5w== +react-native-reanimated@^2.3.0-alpha.2: + version "2.3.0-alpha.2" + resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-2.3.0-alpha.2.tgz#2bd0655f7a3b90606f93c59199a99885ee72b745" + integrity sha512-SpzW1rPMjpy7dMEKo30873pmgj0cgczBgUHvrOKKCCPJbaQXR6w6pOGrTW5M6BQtM8zpIPPwSJN+p3G9W49aiA== dependencies: "@babel/plugin-transform-object-assign" "^7.10.4" - fbjs "^3.0.0" + invariant "^2.2.4" + lodash.isequal "^4.5.0" mockdate "^3.0.2" string-hash-64 "^1.0.3" @@ -6926,11 +6900,6 @@ set-value@^2.0.0, set-value@^2.0.1: is-plain-object "^2.0.3" split-string "^3.0.1" -setimmediate@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" - integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU= - setprototypeof@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" @@ -7572,11 +7541,6 @@ typescript@4.3.2: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.2.tgz#399ab18aac45802d6f2498de5054fcbbe716a805" integrity sha512-zZ4hShnmnoVnAHpVHWpTcxdv7dWP60S2FsydQLV8V5PbS3FifjWFFRiHSWpDJahly88PRyV5teTSLoq4eG7mKw== -ua-parser-js@^0.7.18: - version "0.7.28" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.28.tgz#8ba04e653f35ce210239c64661685bf9121dec31" - integrity sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g== - uglify-es@^3.1.9: version "3.3.9" resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677"