diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ffe451262f4..1261ece6103 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,7 +3,7 @@ name: Publish to GitHub Pages on: push: branches: - - main + - trunk jobs: publish: diff --git a/RNReanimated.podspec b/RNReanimated.podspec index 33ea1c6e295..dd0e076d848 100644 --- a/RNReanimated.podspec +++ b/RNReanimated.podspec @@ -2,40 +2,9 @@ require "json" package = JSON.parse(File.read(File.join(__dir__, "package.json"))) -reactVersion = '0.0.0' +reactVersion = '0.69.4' reactTargetTvOS = false -begin - # standard app - # /appName/node_modules/react-native-reanimated/RNReanimated.podspec - # /appName/node_modules/react-native/package.json - reactJson = JSON.parse(File.read(File.join(__dir__, "..", "..", "node_modules", "react-native", "package.json"))) - reactVersion = reactJson["version"] - reactTargetTvOS = reactJson["name"] == "react-native-tvos" -rescue - begin - # monorepo - # /monorepo/packages/appName/node_modules/react-native-reanimated/RNReanimated.podspec - # /monorepo/node_modules/react-native/package.json - reactJson = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "node_modules", "react-native", "package.json"))) - reactVersion = reactJson["version"] - reactTargetTvOS = reactJson["name"] == "react-native-tvos" - rescue - begin - # Example app in reanimated repo - # /react-native-reanimated/RNReanimated.podspec - # /react-native-reanimated/node_modules/react-native/package.json - reactJson = JSON.parse(File.read(File.join(__dir__, "node_modules", "react-native", "package.json"))) - reactVersion = reactJson["version"] - reactTargetTvOS = ENV["ReanimatedTVOSExample"] == "1" - rescue - # should never happen - reactVersion = '0.68.0' - puts "[RNReanimated] Unable to recognized your `react-native` version! Default `react-native` version: " + reactVersion - end - end -end - rnVersion = reactVersion.split('.')[1] folly_prefix = "" @@ -61,7 +30,7 @@ Pod::Spec.new do |s| # s.license = { :type => "MIT", :file => "FILE_LICENSE" } s.author = { "author" => "author@domain.cn" } s.platforms = { :ios => "9.0", :tvos => "9.0" } - s.source = { :git => "https://github.com/software-mansion/react-native-reanimated.git", :tag => "#{s.version}" } + s.source = { :git => "https://github.com/wordpress-mobile/react-native-reanimated.git", :tag => "#{s.version}" } s.source_files = [ "ios/**/*.{mm,h,m}", @@ -122,4 +91,3 @@ Pod::Spec.new do |s| s.dependency "#{folly_prefix}Folly" end - diff --git a/android-npm/build.gradle b/android-npm/build.gradle new file mode 100644 index 00000000000..894be9916ed --- /dev/null +++ b/android-npm/build.gradle @@ -0,0 +1,32 @@ +import groovy.json.JsonSlurper +import java.util.regex.Matcher +import java.util.regex.Pattern +configurations.maybeCreate("default") + +apply plugin: 'maven-publish' + +def reactNativeVersion = "0.69.4" +def engine = "hermes" + +def (major, minor, patch) = reactNativeVersion.tokenize('.') +def minorCopy = Integer.parseInt(minor) +def aar = file("react-native-reanimated-${minorCopy}-${engine}.aar") + +if (!aar.exists()) { + throw new GradleException('No aar for react-native-reanimated found.') +} + +artifacts.add("default", aar) + +afterEvaluate { + publishing { + publications { + release(MavenPublication) { + groupId = 'com.github.wordpress-mobile' + artifactId = 'react-native-reanimated' + artifact(aar) + + } + } + } +} diff --git a/android-npm/react-native-reanimated-66-hermes.aar b/android-npm/react-native-reanimated-66-hermes.aar new file mode 100644 index 00000000000..a2c83a1868d Binary files /dev/null and b/android-npm/react-native-reanimated-66-hermes.aar differ diff --git a/android-npm/react-native-reanimated-69-hermes.aar b/android-npm/react-native-reanimated-69-hermes.aar new file mode 100644 index 00000000000..e7d25f17c1e Binary files /dev/null and b/android-npm/react-native-reanimated-69-hermes.aar differ diff --git a/android/build.gradle b/android/build.gradle index dfb79c8fb8d..37a7318a7fa 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -351,7 +351,7 @@ buildscript { } } dependencies { - classpath "com.android.tools.build:gradle:7.1.1" + classpath "com.android.tools.build:gradle:7.2.1" classpath "de.undercouch:gradle-download-task:5.0.1" classpath "com.diffplug.spotless:spotless-plugin-gradle:5.15.0" } @@ -361,15 +361,15 @@ if (project == rootProject) { apply from: "spotless.gradle" } -apply plugin: "com.android.library" -apply plugin: "maven-publish" -apply plugin: "de.undercouch.download" +apply plugin: 'com.android.library' +apply plugin: 'maven-publish' +apply plugin: 'de.undercouch.download' android { - compileSdkVersion safeExtGet("compileSdkVersion", 30) + compileSdkVersion 33 defaultConfig { - minSdkVersion safeExtGet("minSdkVersion", 16) - targetSdkVersion safeExtGet("targetSdkVersion", 30) + minSdkVersion 24 + targetSdkVersion 33 versionCode 1 versionName "1.0" externalNativeBuild { @@ -650,20 +650,31 @@ task packageNdkLibs(type: Copy) { } repositories { - mavenCentral() - mavenLocal() - maven { - // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm - url "$reactNative/android" - } - maven { - // Android JSC is installed from npm - url "$reactNative/../jsc-android/dist" + if (project == rootProject) { + maven { url "https://a8c-libs.s3.amazonaws.com/android/react-native-mirror" } + } else { + maven { + // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm + url "$reactNative/android" + } + maven { + // Android JSC is installed from npm + url "$reactNative/../jsc-android/dist" + } } + mavenCentral() google() } dependencies { + //noinspection GradleDynamicVersion + if (project == rootProject) { + // If this is the root project (e.g. Jitpack), specify a version + implementation 'com.facebook.react:react-native:0.69.4' + } else { + //noinspection GradleDynamicVersion + api "com.facebook.react:react-native:+" + } // noinspection GradleDynamicVersion implementation "com.facebook.yoga:proguard-annotations:1.19.0" if (isDeveloperMode()) { @@ -672,7 +683,6 @@ dependencies { else { implementation "com.facebook.fbjni:fbjni-java-only:" + FBJNI_VERSION } - implementation "com.facebook.react:react-native:+" // From node_modules implementation "androidx.transition:transition:1.1.0" extractHeaders("com.facebook.fbjni:fbjni:" + FBJNI_VERSION + ":headers") extractSO("com.facebook.fbjni:fbjni:" + FBJNI_VERSION) diff --git a/android/gradle.properties b/android/gradle.properties index a67829d201f..e2bb741b648 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,25 +1,7 @@ -# Project-wide Gradle settings. - -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. - -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html - -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -# Default value: -Xmx10248m -XX:MaxPermSize=256m -org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8A --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \ - --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \ - --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \ - --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \ - --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED - -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true +org.gradle.jvmargs=-Xmx1536m -XX:+HeapDumpOnOutOfMemoryError +org.gradle.parallel=true +org.gradle.configureondemand=true +org.gradle.caching=true android.useAndroidX=true android.enableJetifier=true diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar index 7454180f2ae..5c2d1cf016b 100644 Binary files a/android/gradle/wrapper/gradle-wrapper.jar and b/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index ffed3a254e9..92f06b50fd6 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/android/gradlew b/android/gradlew index 1b6c787337f..b0d6d0ab5de 100755 --- a/android/gradlew +++ b/android/gradlew @@ -1,13 +1,13 @@ -#!/bin/sh +#!/usr/bin/env sh # -# Copyright © 2015-2021 the original authors. +# Copyright 2015 the original author or authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# https://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -17,113 +17,78 @@ # ############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# +## +## Gradle start up script for UN*X +## ############################################################################## # Attempt to set APP_HOME - # Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi done - -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null APP_NAME="Gradle" -APP_BASE_NAME=${0##*/} +APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum +MAX_FD="maximum" warn () { echo "$*" -} >&2 +} die () { echo echo "$*" echo exit 1 -} >&2 +} # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java + JAVACMD="$JAVA_HOME/jre/sh/java" else - JAVACMD=$JAVA_HOME/bin/java + JAVACMD="$JAVA_HOME/bin/java" fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -132,7 +97,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD=java + JAVACMD="java" which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -140,95 +105,84 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi fi -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg + i=$((i+1)) done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi exec "$JAVACMD" "$@" diff --git a/android/gradlew.bat b/android/gradlew.bat index ac1b06f9382..15e1ee37a70 100644 --- a/android/gradlew.bat +++ b/android/gradlew.bat @@ -5,7 +5,7 @@ @rem you may not use this file except in compliance with the License. @rem You may obtain a copy of the License at @rem -@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem http://www.apache.org/licenses/LICENSE-2.0 @rem @rem Unless required by applicable law or agreed to in writing, software @rem distributed under the License is distributed on an "AS IS" BASIS, @@ -29,9 +29,6 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @@ -40,7 +37,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if "%ERRORLEVEL%" == "0" goto init echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -54,7 +51,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto execute +if exist "%JAVA_EXE%" goto init echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -64,14 +61,28 @@ echo location of your Java installation. goto fail +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% :end @rem End local scope for the variables with windows NT shell diff --git a/android/settings.gradle b/android/settings.gradle deleted file mode 100644 index c8e23f4979e..00000000000 --- a/android/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include 'lib' \ No newline at end of file diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts new file mode 100644 index 00000000000..d1f51e370a2 --- /dev/null +++ b/android/settings.gradle.kts @@ -0,0 +1,9 @@ +pluginManagement { + plugins { + id("com.android.library") version "4.2.2" + } + repositories { + gradlePluginPortal() + google() + } +} diff --git a/createNPMPackage.sh b/createNPMPackage.sh index 473a3905709..64ff7fce21d 100755 --- a/createNPMPackage.sh +++ b/createNPMPackage.sh @@ -6,66 +6,60 @@ ROOT=$(pwd) unset CI -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 - yarn add react-native@"${versions[$index]}" - for for_hermes in "True" "False" - do - engine="jsc" - if [ "$for_hermes" == "True" ]; then - engine="hermes" - fi - echo "engine=${engine}" - - cd android - - echo "APPLY PATCH" - versionNumber=${version_name[$index]} - cd ./rnVersionPatch/$versionNumber - rm -rf ../backup/* - cp -r . ../backup - if [ "$(find . | grep 'java')" ]; - then - fileList=$(find . | grep -i 'java') - for file in $fileList; do - echo "COPY: $file" - cp ../../src/main/java/com/swmansion/reanimated/$file ../backup/$file - cp $file ../../src/main/java/com/swmansion/reanimated/$file - done - else - pwd - echo "NO PATCH"; - fi - cd ../.. - - ./gradlew clean - - CLIENT_SIDE_BUILD="False" FOR_HERMES=${for_hermes} ./gradlew :assembleDebug --no-build-cache --rerun-tasks - - cd ./rnVersionPatch/$versionNumber - if [ $(find . | grep 'java') ]; - then - echo "RESTORE BACKUP" - for file in $fileList; do - echo "BACKUP: $file" - cp ../backup/$file ../../src/main/java/com/swmansion/reanimated/$file - done - echo "CLEAR BACKUP" - rm -rf ../backup/* - fi - cd ../.. - - cd $ROOT - - rm -rf android/react-native-reanimated-"${version_name[$index]}-${engine}".aar - cp android/build/outputs/aar/*.aar android/react-native-reanimated-"${version_name[$index]}-${engine}".aar +# Specify the RN version and engine to be used for generating the Android binaries +version="0.69.4" +version_name="69" +for_hermes="True" +engine="hermes" + +echo "Generating Android binaries for RN version '$version' and engine '$engine'" + +yarn add react-native@"${version}" + +cd android + +echo "APPLY PATCH" +versionNumber=${version_name} +cd ./rnVersionPatch/$versionNumber +rm -rf ../backup/* +cp -r . ../backup +if [ "$(find . | grep 'java')" ]; +then + fileList=$(find . | grep -i 'java') + for file in $fileList; do + echo "COPY: $file" + cp ../../src/main/java/com/swmansion/reanimated/$file ../backup/$file + cp $file ../../src/main/java/com/swmansion/reanimated/$file + done +else +pwd + echo "NO PATCH"; +fi +cd ../.. + +./gradlew clean + +FOR_HERMES=${for_hermes} ./gradlew :assembleDebug + +cd ./rnVersionPatch/$versionNumber +if [ $(find . | grep 'java') ]; +then + echo "RESTORE BACKUP" + for file in $fileList; do + echo "BACKUP: $file" + cp ../backup/$file ../../src/main/java/com/swmansion/reanimated/$file done -done + echo "CLEAR BACKUP" + rm -rf ../backup/* +fi +cd ../.. + +cd $ROOT + +rm -rf android-npm/react-native-reanimated-"${version_name}-${engine}".aar +cp android/build/outputs/aar/*.aar android-npm/react-native-reanimated-"${version_name}-${engine}".aar -yarn add react-native@"${versions[0]}" --dev +yarn add react-native@"${version}" --dev cp -R android/build build_output cd android && ./gradlew clean && cd .. diff --git a/jitpack.yml b/jitpack.yml new file mode 100644 index 00000000000..4cb2b0004d0 --- /dev/null +++ b/jitpack.yml @@ -0,0 +1,2 @@ +install: + - android/gradlew -p android-npm publishToMavenLocal \ No newline at end of file diff --git a/package.json b/package.json index 3030c366e07..813ee35ad2a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native-reanimated", - "version": "2.9.1", + "version": "2.9.1-wp-4", "description": "More powerful alternative to Animated library for React Native.", "scripts": { "start": "node node_modules/react-native/local-cli/cli.js start", @@ -123,7 +123,7 @@ "madge": "^5.0.1", "prettier": "^2.5.1", "react": "18.0.0", - "react-native": "0.69.1", + "react-native": "0.69.4", "react-native-codegen": "^0.0.7", "react-native-gesture-handler": "^1.6.1", "react-test-renderer": "18.0.0", diff --git a/react-native-reanimated-2.9.1-wp-4.tgz b/react-native-reanimated-2.9.1-wp-4.tgz new file mode 100644 index 00000000000..630fe5f7336 Binary files /dev/null and b/react-native-reanimated-2.9.1-wp-4.tgz differ diff --git a/src/reanimated2/jestUtils.ts b/src/reanimated2/jestUtils.ts index 16df51409ce..e1aad6c0667 100644 --- a/src/reanimated2/jestUtils.ts +++ b/src/reanimated2/jestUtils.ts @@ -188,7 +188,23 @@ export const advanceAnimationByFrame = (count) => { }; export const setUpTests = (userConfig = {}) => { - const expect = require('expect'); + let expect = global.expect; + if (expect === undefined) { + const expectModule = require('expect'); + expect = expectModule; + // Starting from Jest 28, "expect" package uses named exports instead of default export. + // So, requiring "expect" package doesn't give direct access to "expect" function anymore. + // It gives access to the module object instead. + // We use this info to detect if the project uses Jest 28 or higher. + if (typeof expect === 'object') { + const jestGlobals = require('@jest/globals'); + expect = jestGlobals.expect; + } + if (expect === undefined || expect.extend === undefined) { + expect = expectModule.default; + } + } + require('setimmediate'); frameTime = Math.round(1000 / config.fps); diff --git a/yarn.lock b/yarn.lock index 6b804ca442b..984939d31aa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3046,22 +3046,22 @@ optionalDependencies: jetifier "^1.6.6" -"@react-native-community/cli-clean@^8.0.0": - version "8.0.0" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-clean/-/cli-clean-8.0.0.tgz#c8fc6e8d6a84c90ca0839d48080a87ad455613db" - integrity sha512-VY/kwyH5xp6oXiB9bcwa+I9W5k6WR/nX3s85FuMW76hSlgG1UVAGL04uZPwYlSmMZuSOSuoXOaIjJ7wAvQMBpg== +"@react-native-community/cli-clean@^8.0.4": + version "8.0.4" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-clean/-/cli-clean-8.0.4.tgz#97e16a20e207b95de12e29b03816e8f2b2c80cc7" + integrity sha512-IwS1M1NHg6+qL8PThZYMSIMYbZ6Zbx+lIck9PLBskbosFo24M3lCOflOl++Bggjakp6mR+sRXxLMexid/GeOsQ== dependencies: - "@react-native-community/cli-tools" "^8.0.0" + "@react-native-community/cli-tools" "^8.0.4" chalk "^4.1.2" execa "^1.0.0" prompts "^2.4.0" -"@react-native-community/cli-config@^8.0.2": - version "8.0.2" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-config/-/cli-config-8.0.2.tgz#dd033cf51fae2b046304b40bb166f577165c6c48" - integrity sha512-q0mL6QBzoLDHmlvkAKdgioIsMeyvvgRyu0WVLvT/v5DX6OVRvq4UEULLEY+7/P+760nPBQo4Ou1KqpP/SxmbXA== +"@react-native-community/cli-config@^8.0.4": + version "8.0.4" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-config/-/cli-config-8.0.4.tgz#40e9e4e12ba70a6e12d1e777373af6fa1ac2e4e6" + integrity sha512-0vcrIETka1Tr0blr0AjVkoP/1yynvarJQXi8Yry/XB3BLenrkUFxolqqA3Ff55KFQ7t1IzAuFtfuVZs25LvyDQ== dependencies: - "@react-native-community/cli-tools" "^8.0.0" + "@react-native-community/cli-tools" "^8.0.4" cosmiconfig "^5.1.0" deepmerge "^3.2.0" glob "^7.1.3" @@ -3074,14 +3074,14 @@ dependencies: serve-static "^1.13.1" -"@react-native-community/cli-doctor@^8.0.2": - version "8.0.2" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-doctor/-/cli-doctor-8.0.2.tgz#2f166812d9b410de66e811fe2d84512157322289" - integrity sha512-XOimZcBR8n0Ipuk0iXfbZwxrt1r+2fZnskInZRf3SkYrLIKzDLF+ylKbNWJeuMWZSz9lQimo2cI/978bH1JQGw== +"@react-native-community/cli-doctor@^8.0.4": + version "8.0.4" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-doctor/-/cli-doctor-8.0.4.tgz#9216867f0d8590868dc5b8035f62bbcac68b3254" + integrity sha512-Blw/66qwoEoKrtwn3O9iTtXbt4YWlwqNse5BJeRDzlSdutWTX4PgJu/34gyvOHGysNlrf+GYkeyqqxI/y0s07A== dependencies: - "@react-native-community/cli-config" "^8.0.2" - "@react-native-community/cli-platform-ios" "^8.0.2" - "@react-native-community/cli-tools" "^8.0.0" + "@react-native-community/cli-config" "^8.0.4" + "@react-native-community/cli-platform-ios" "^8.0.4" + "@react-native-community/cli-tools" "^8.0.4" chalk "^4.1.2" command-exists "^1.2.8" envinfo "^7.7.2" @@ -3096,23 +3096,23 @@ sudo-prompt "^9.0.0" wcwidth "^1.0.1" -"@react-native-community/cli-hermes@^8.0.2": - version "8.0.2" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-hermes/-/cli-hermes-8.0.2.tgz#d0c3945b4093128d3095032595c3112378c5cc5e" - integrity sha512-RZ9uHTf3UFtGTYxq88uENJEdaDB8ab+YPBDn+Li1u78IKwNeL04F0A1A3ab3hYUkG4PEPnL2rkYSlzzNFLOSPQ== +"@react-native-community/cli-hermes@^8.0.5": + version "8.0.5" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-hermes/-/cli-hermes-8.0.5.tgz#639edc6b0ce73f705e4b737e3de1cc47d42516ff" + integrity sha512-Zm0wM6SfgYAEX1kfJ1QBvTayabvh79GzmjHyuSnEROVNPbl4PeCG4WFbwy489tGwOP9Qx9fMT5tRIFCD8bp6/g== dependencies: - "@react-native-community/cli-platform-android" "^8.0.2" - "@react-native-community/cli-tools" "^8.0.0" + "@react-native-community/cli-platform-android" "^8.0.5" + "@react-native-community/cli-tools" "^8.0.4" chalk "^4.1.2" hermes-profile-transformer "^0.0.6" ip "^1.1.5" -"@react-native-community/cli-platform-android@^8.0.0", "@react-native-community/cli-platform-android@^8.0.2": - version "8.0.2" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-android/-/cli-platform-android-8.0.2.tgz#5e408f06a33712263c2a4c4ef3fde4e43c660585" - integrity sha512-pAEkt+GULesr8FphTpaNYSmu+O1CPQ2zCXkAg4kRd0WXpq3BsVqomyDWd/eMXTkY/yYQMGl6KilU2p9r/hnfhA== +"@react-native-community/cli-platform-android@^8.0.4", "@react-native-community/cli-platform-android@^8.0.5": + version "8.0.5" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-android/-/cli-platform-android-8.0.5.tgz#da11d2678adeca98e83494d68de80e50571b4af4" + integrity sha512-z1YNE4T1lG5o9acoQR1GBvf7mq6Tzayqo/za5sHVSOJAC9SZOuVN/gg/nkBa9a8n5U7qOMFXfwhTMNqA474gXA== dependencies: - "@react-native-community/cli-tools" "^8.0.0" + "@react-native-community/cli-tools" "^8.0.4" chalk "^4.1.2" execa "^1.0.0" fs-extra "^8.1.0" @@ -3122,12 +3122,12 @@ logkitty "^0.7.1" slash "^3.0.0" -"@react-native-community/cli-platform-ios@^8.0.0", "@react-native-community/cli-platform-ios@^8.0.2": - version "8.0.2" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-8.0.2.tgz#603079d9def2f2159a40f9905a26c19dbbe6f0ef" - integrity sha512-LxWzj6jIZr5Ot893TKFbt0/T3WkVe6pbc/FSTo+TDQq1FQr/Urv16Uqn0AcL4IX2O1g3Qd13d0vtR/Cdpn3VNw== +"@react-native-community/cli-platform-ios@^8.0.4": + version "8.0.4" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-8.0.4.tgz#15225c09a1218a046f11165a54bf14b59dad7020" + integrity sha512-7Jdptedfg/J0Xo2rQbJ4jmo+PMYOiIiRcNDCSI5dBcNkQfSq4MMYUnKQx5DdZHgrfxE0O1vE4iNmJdd4wePz8w== dependencies: - "@react-native-community/cli-tools" "^8.0.0" + "@react-native-community/cli-tools" "^8.0.4" chalk "^4.1.2" execa "^1.0.0" glob "^7.1.3" @@ -3136,13 +3136,13 @@ ora "^5.4.1" plist "^3.0.2" -"@react-native-community/cli-plugin-metro@^8.0.0": - version "8.0.0" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-plugin-metro/-/cli-plugin-metro-8.0.0.tgz#0b355a7a6fe93b347ec32b3edb3b2cd96b04dfd8" - integrity sha512-eIowV2ZRbzIWL3RIKVUUSahntXTuAeKzBSsFuhffLZphsV+UdKdtg5ATR9zbq7nsKap4ZseO5DkVqZngUkC7iQ== +"@react-native-community/cli-plugin-metro@^8.0.4": + version "8.0.4" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-plugin-metro/-/cli-plugin-metro-8.0.4.tgz#a364a50a2e05fc5d0b548759e499e5b681b6e4cc" + integrity sha512-UWzY1eMcEr/6262R2+d0Is5M3L/7Y/xXSDIFMoc5Rv5Wucl3hJM/TxHXmByvHpuJf6fJAfqOskyt4bZCvbI+wQ== dependencies: - "@react-native-community/cli-server-api" "^8.0.0" - "@react-native-community/cli-tools" "^8.0.0" + "@react-native-community/cli-server-api" "^8.0.4" + "@react-native-community/cli-tools" "^8.0.4" chalk "^4.1.2" metro "^0.70.1" metro-config "^0.70.1" @@ -3152,13 +3152,13 @@ metro-runtime "^0.70.1" readline "^1.3.0" -"@react-native-community/cli-server-api@^8.0.0": - version "8.0.0" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-server-api/-/cli-server-api-8.0.0.tgz#562fee6da9f880531db2af1d3439efb7309281f8" - integrity sha512-TxUs3sMl9clt7sdv30XETc6VRzyaEli2vDrk3TB5W5o5nSd1PmQdP4ccdGLO/nDRXwOy72QmmXlYWMg1XGU0Gg== +"@react-native-community/cli-server-api@^8.0.4": + version "8.0.4" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-server-api/-/cli-server-api-8.0.4.tgz#d45d895a0a6e8b960c9d677188d414a996faa4d3" + integrity sha512-Orr14njx1E70CVrUA8bFdl+mrnbuXUjf1Rhhm0RxUadFpvkHuOi5dh8Bryj2MKtf8eZrpEwZ7tuQPhJEULW16A== dependencies: "@react-native-community/cli-debugger-ui" "^8.0.0" - "@react-native-community/cli-tools" "^8.0.0" + "@react-native-community/cli-tools" "^8.0.4" compression "^1.7.1" connect "^3.6.5" errorhandler "^1.5.0" @@ -3167,13 +3167,14 @@ serve-static "^1.13.1" ws "^7.5.1" -"@react-native-community/cli-tools@^8.0.0": - version "8.0.0" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-tools/-/cli-tools-8.0.0.tgz#2ca9177d7cdf352f6863f278cdacd44066d10473" - integrity sha512-jA4y8CebrRZaOJFjc5zMOnls4KfHkBl2FUtBZV2vcWuedQHa6JVwo+KO88ta3Ysby3uY0+mrZagZfXk7c0mrBw== +"@react-native-community/cli-tools@^8.0.4": + version "8.0.4" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-tools/-/cli-tools-8.0.4.tgz#994b9d56c84472491c876b71acd4356773fcbe65" + integrity sha512-ePN9lGxh6LRFiotyddEkSmuqpQhnq2iw9oiXYr4EFWpIEy0yCigTuSTiDF68+c8M9B+7bTwkRpz/rMPC4ViO5Q== dependencies: appdirsjs "^1.2.4" chalk "^4.1.2" + find-up "^5.0.0" lodash "^4.17.15" mime "^2.4.1" node-fetch "^2.6.0" @@ -3189,19 +3190,19 @@ dependencies: joi "^17.2.1" -"@react-native-community/cli@^8.0.0": - version "8.0.2" - resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-8.0.2.tgz#d3657017a5438862881e9e773ab4d252e3afa950" - integrity sha512-IwG3f6gKPlJucFH1Ex0SMD1P1rtOpdR9lloWoBZh3y0dbUbsNtiZZz0zJjZFm/2mtrIihplL7Yz3LmQBNm7xBQ== +"@react-native-community/cli@^8.0.4": + version "8.0.5" + resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-8.0.5.tgz#902a13b5336508f7989fddf39e6bf85b63a66de9" + integrity sha512-X0AMNK+sKDJQX8eQRkqgddJsZPWlHgLryX7O9usj78UFEK8VqVYtpv08piWecfAhC2mZU4/Lww4bKu9uJ1rdyQ== dependencies: - "@react-native-community/cli-clean" "^8.0.0" - "@react-native-community/cli-config" "^8.0.2" + "@react-native-community/cli-clean" "^8.0.4" + "@react-native-community/cli-config" "^8.0.4" "@react-native-community/cli-debugger-ui" "^8.0.0" - "@react-native-community/cli-doctor" "^8.0.2" - "@react-native-community/cli-hermes" "^8.0.2" - "@react-native-community/cli-plugin-metro" "^8.0.0" - "@react-native-community/cli-server-api" "^8.0.0" - "@react-native-community/cli-tools" "^8.0.0" + "@react-native-community/cli-doctor" "^8.0.4" + "@react-native-community/cli-hermes" "^8.0.5" + "@react-native-community/cli-plugin-metro" "^8.0.4" + "@react-native-community/cli-server-api" "^8.0.4" + "@react-native-community/cli-tools" "^8.0.4" "@react-native-community/cli-types" "^8.0.0" chalk "^4.1.2" commander "^2.19.0" @@ -5952,7 +5953,7 @@ find-cache-dir@^2.0.0: make-dir "^2.0.0" pkg-dir "^3.0.0" -find-up@5.0.0: +find-up@5.0.0, find-up@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== @@ -9258,15 +9259,15 @@ react-error-boundary@^3.1.0: resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339" integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA== -react-is@^16.8.1, react-is@^16.8.4: - version "16.9.0" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.9.0.tgz#21ca9561399aad0ff1a7701c01683e8ca981edcb" - -react-is@^18.0.0: +"react-is@^16.12.0 || ^17.0.0 || ^18.0.0", react-is@^18.0.0: version "18.2.0" resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w== +react-is@^16.8.1, react-is@^16.8.4: + version "16.9.0" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.9.0.tgz#21ca9561399aad0ff1a7701c01683e8ca981edcb" + react-native-codegen@^0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/react-native-codegen/-/react-native-codegen-0.0.7.tgz#86651c5c5fec67a8077ef7f4e36f7ed459043e14" @@ -9300,15 +9301,15 @@ react-native-gradle-plugin@^0.0.7: resolved "https://registry.yarnpkg.com/react-native-gradle-plugin/-/react-native-gradle-plugin-0.0.7.tgz#96602f909745239deab7b589443f14fce5da2056" integrity sha512-+4JpbIx42zGTONhBTIXSyfyHICHC29VTvhkkoUOJAh/XHPEixpuBduYgf6Y4y9wsN1ARlQhBBoptTvXvAFQf5g== -react-native@0.69.1: - version "0.69.1" - resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.69.1.tgz#093363ea697185b5d8f0e523fce3654b833ad0be" - integrity sha512-585NmzSuYUfday8YsfqgreFAZbXRI/kxKsiuaShwGHgkwdtmE5qA7WfGItgxZBOZD6g/Hm1YBUqSwIm07tPa6A== +react-native@0.69.4: + version "0.69.4" + resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.69.4.tgz#d66f2a117442a9398b065876afdc568b209dc4da" + integrity sha512-rqNMialM/T4pHRKWqTIpOxA65B/9kUjtnepxwJqvsdCeMP9Q2YdSx4VASFR9RoEFYcPRU41yGf6EKrChNfns3g== dependencies: "@jest/create-cache-key-function" "^27.0.1" - "@react-native-community/cli" "^8.0.0" - "@react-native-community/cli-platform-android" "^8.0.0" - "@react-native-community/cli-platform-ios" "^8.0.0" + "@react-native-community/cli" "^8.0.4" + "@react-native-community/cli-platform-android" "^8.0.4" + "@react-native-community/cli-platform-ios" "^8.0.4" "@react-native/assets" "1.0.0" "@react-native/normalize-color" "2.0.0" "@react-native/polyfills" "2.0.0" @@ -9331,7 +9332,7 @@ react-native@0.69.1: react-native-codegen "^0.69.1" react-native-gradle-plugin "^0.0.7" react-refresh "^0.4.0" - react-shallow-renderer "16.14.1" + react-shallow-renderer "16.15.0" regenerator-runtime "^0.13.2" scheduler "^0.21.0" stacktrace-parser "^0.1.3" @@ -9343,7 +9344,15 @@ react-refresh@^0.4.0: version "0.4.2" resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.4.2.tgz#54a277a6caaac2803d88f1d6f13c1dcfbd81e334" -react-shallow-renderer@16.14.1, react-shallow-renderer@^16.13.1: +react-shallow-renderer@16.15.0: + version "16.15.0" + resolved "https://registry.yarnpkg.com/react-shallow-renderer/-/react-shallow-renderer-16.15.0.tgz#48fb2cf9b23d23cde96708fe5273a7d3446f4457" + integrity sha512-oScf2FqQ9LFVQgA73vr86xl2NaOIX73rh+YFqcOp68CWj56tSfgtGKrEbyhCj0rSijyG9M1CYprTh39fBi5hzA== + dependencies: + object-assign "^4.1.1" + react-is "^16.12.0 || ^17.0.0 || ^18.0.0" + +react-shallow-renderer@^16.13.1: version "16.14.1" resolved "https://registry.yarnpkg.com/react-shallow-renderer/-/react-shallow-renderer-16.14.1.tgz#bf0d02df8a519a558fd9b8215442efa5c840e124" integrity sha512-rkIMcQi01/+kxiTE9D3fdS959U1g7gs+/rborw++42m1O9FAQiNI/UNRZExVUoAOprn4umcXf+pFRou8i4zuBg==