Skip to content
This repository was archived by the owner on Oct 19, 2024. It is now read-only.

Commit 3832c24

Browse files
committed
Merge branch 'main' into candidate
2 parents 4a60d81 + 0e64350 commit 3832c24

File tree

16 files changed

+2635
-2614
lines changed

16 files changed

+2635
-2614
lines changed
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
diff --git a/src/android.js b/src/android.js
2+
index fbf09855771f985c5edfc53c22cf6cfe828f45f9..7751d456e08e2dc4c78601fc9430fdbf1373e0d4 100644
3+
--- a/src/android.js
4+
+++ b/src/android.js
5+
@@ -16,7 +16,7 @@ import TextAncestor from 'react-native/Libraries/Text/TextAncestor';
6+
import TextInputState from 'react-native/Libraries/Components/TextInput/TextInputState';
7+
import invariant from 'invariant';
8+
import nullthrows from 'nullthrows';
9+
-import setAndForwardRef from 'react-native/Libraries/Utilities/setAndForwardRef';
10+
+import setAndForwardRef from './setAndForwardRef';
11+
12+
import usePressability from 'react-native/Libraries/Pressability/usePressability';
13+
14+
diff --git a/src/ios.tsx b/src/ios.tsx
15+
index b9ed28bbf9fca6fb44c27096e771d8d2b65b858f..588a75c82b2ee1123d3e48acb984bcbc8b293cc8 100644
16+
--- a/src/ios.tsx
17+
+++ b/src/ios.tsx
18+
@@ -11,7 +11,7 @@ import {
19+
} from 'react-native';
20+
import TextInputState from 'react-native/Libraries/Components/TextInput/TextInputState';
21+
import TextAncestor from 'react-native/Libraries/Text/TextAncestor';
22+
-import setAndForwardRef from 'react-native/Libraries/Utilities/setAndForwardRef';
23+
+import setAndForwardRef from './setAndForwardRef';
24+
import { getTextInputExtraProps } from './extra_props';
25+
26+
import type {
27+
diff --git a/src/setAndForwardRef.js b/src/setAndForwardRef.js
28+
new file mode 100644
29+
index 0000000000000000000000000000000000000000..ad7777e271b945c7123953f7578a8d1208ca9e48
30+
--- /dev/null
31+
+++ b/src/setAndForwardRef.js
32+
@@ -0,0 +1,17 @@
33+
+function setAndForwardRef({ getForwardedRef, setLocalRef }) {
34+
+ return function forwardRef(ref) {
35+
+ const forwardedRef = getForwardedRef();
36+
+
37+
+ setLocalRef(ref);
38+
+
39+
+ // Forward to user ref prop (if one has been specified)
40+
+ if (typeof forwardedRef === 'function') {
41+
+ // Handle function-based refs. String-based refs are handled as functions.
42+
+ forwardedRef(ref);
43+
+ } else if (typeof forwardedRef === 'object' && forwardedRef != null) {
44+
+ // Handle createRef-based refs
45+
+ forwardedRef.current = ref;
46+
+ }
47+
+ };
48+
+}
49+
+export default setAndForwardRef;
50+
\ No newline at end of file

Gemfile.lock

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,28 @@ GEM
88
i18n (>= 1.6, < 2)
99
minitest (>= 5.1)
1010
tzinfo (~> 2.0)
11-
addressable (2.8.1)
11+
addressable (2.8.4)
1212
public_suffix (>= 2.0.2, < 6.0)
1313
algoliasearch (1.27.5)
1414
httpclient (~> 2.8, >= 2.8.3)
1515
json (>= 1.5.1)
1616
artifactory (3.0.15)
1717
atomos (0.1.3)
1818
aws-eventstream (1.2.0)
19-
aws-partitions (1.722.0)
20-
aws-sdk-core (3.170.0)
19+
aws-partitions (1.785.0)
20+
aws-sdk-core (3.178.0)
2121
aws-eventstream (~> 1, >= 1.0.2)
2222
aws-partitions (~> 1, >= 1.651.0)
2323
aws-sigv4 (~> 1.5)
2424
jmespath (~> 1, >= 1.6.1)
25-
aws-sdk-kms (1.63.0)
26-
aws-sdk-core (~> 3, >= 3.165.0)
25+
aws-sdk-kms (1.71.0)
26+
aws-sdk-core (~> 3, >= 3.177.0)
2727
aws-sigv4 (~> 1.1)
28-
aws-sdk-s3 (1.119.1)
29-
aws-sdk-core (~> 3, >= 3.165.0)
28+
aws-sdk-s3 (1.129.0)
29+
aws-sdk-core (~> 3, >= 3.177.0)
3030
aws-sdk-kms (~> 1)
31-
aws-sigv4 (~> 1.4)
32-
aws-sigv4 (1.5.2)
31+
aws-sigv4 (~> 1.6)
32+
aws-sigv4 (1.6.0)
3333
aws-eventstream (~> 1, >= 1.0.2)
3434
babosa (1.0.4)
3535
claide (1.1.0)
@@ -76,7 +76,7 @@ GEM
7676
highline (~> 2.0.0)
7777
concurrent-ruby (1.2.2)
7878
declarative (0.0.20)
79-
digest-crc (0.6.4)
79+
digest-crc (0.6.5)
8080
rake (>= 12.0.0, < 14.0.0)
8181
domain_name (0.5.20190701)
8282
unf (>= 0.0.5, < 1.0.0)
@@ -85,7 +85,7 @@ GEM
8585
escape (0.0.4)
8686
ethon (0.16.0)
8787
ffi (>= 1.15.0)
88-
excon (0.99.0)
88+
excon (0.100.0)
8989
faraday (1.10.3)
9090
faraday-em_http (~> 1.0)
9191
faraday-em_synchrony (~> 1.0)
@@ -114,8 +114,8 @@ GEM
114114
faraday-retry (1.0.3)
115115
faraday_middleware (1.2.0)
116116
faraday (~> 1.0)
117-
fastimage (2.2.6)
118-
fastlane (2.212.1)
117+
fastimage (2.2.7)
118+
fastlane (2.213.0)
119119
CFPropertyList (>= 2.3, < 4.0.0)
120120
addressable (>= 2.8, < 3.0.0)
121121
artifactory (~> 3.0)
@@ -139,7 +139,7 @@ GEM
139139
json (< 3.0.0)
140140
jwt (>= 2.1.0, < 3)
141141
mini_magick (>= 4.9.4, < 5.0.0)
142-
multipart-post (~> 2.0.0)
142+
multipart-post (>= 2.0.0, < 3.0.0)
143143
naturally (~> 2.2)
144144
optparse (~> 0.1.1)
145145
plist (>= 3.1.0, < 4.0.0)
@@ -163,7 +163,7 @@ GEM
163163
fourflusher (2.3.1)
164164
fuzzy_match (2.0.4)
165165
gh_inspector (1.1.3)
166-
google-apis-androidpublisher_v3 (0.35.0)
166+
google-apis-androidpublisher_v3 (0.45.0)
167167
google-apis-core (>= 0.11.0, < 2.a)
168168
google-apis-core (0.11.0)
169169
addressable (~> 2.5, >= 2.5.1)
@@ -194,7 +194,7 @@ GEM
194194
google-cloud-core (~> 1.6)
195195
googleauth (>= 0.16.2, < 2.a)
196196
mini_mime (~> 1.0)
197-
googleauth (1.3.0)
197+
googleauth (1.6.0)
198198
faraday (>= 0.17.3, < 3.a)
199199
jwt (>= 1.4, < 3.0)
200200
memoist (~> 0.16)
@@ -209,14 +209,14 @@ GEM
209209
concurrent-ruby (~> 1.0)
210210
jmespath (1.6.2)
211211
json (2.6.3)
212-
jwt (2.7.0)
212+
jwt (2.7.1)
213213
memoist (0.16.2)
214214
mini_magick (4.12.0)
215215
mini_mime (1.1.2)
216216
minitest (5.18.0)
217217
molinillo (0.8.0)
218218
multi_json (1.15.0)
219-
multipart-post (2.0.0)
219+
multipart-post (2.3.0)
220220
nanaimo (0.3.0)
221221
nap (1.1.0)
222222
naturally (2.2.1)
@@ -280,7 +280,7 @@ PLATFORMS
280280
arm64-darwin-22
281281

282282
DEPENDENCIES
283-
cocoapods
283+
cocoapods (~> 1.12)
284284
fastlane
285285
fastlane-plugin-json
286286
fastlane-plugin-sentry

android/app/src/main/java/com/xmflsct/app/tooot/MainActivity.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
package com.xmflsct.app.tooot;
2+
import expo.modules.ReactActivityDelegateWrapper;
23
import android.os.Bundle;
34

45
import com.facebook.react.ReactActivity;
@@ -30,10 +31,10 @@ protected String getMainComponentName() {
3031
*/
3132
@Override
3233
protected ReactActivityDelegate createReactActivityDelegate() {
33-
return new DefaultReactActivityDelegate(
34+
return new ReactActivityDelegateWrapper(this, BuildConfig.IS_NEW_ARCHITECTURE_ENABLED, new DefaultReactActivityDelegate(
3435
this,
3536
getMainComponentName(),
3637
// If you opted-in for the New Architecture, we enable the Fabric Renderer.
37-
DefaultNewArchitectureEntryPoint.getFabricEnabled());
38+
DefaultNewArchitectureEntryPoint.getFabricEnabled()));
3839
}
3940
}

android/app/src/main/java/com/xmflsct/app/tooot/MainApplication.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
public class MainApplication extends Application implements ReactApplication {
2121
private final ReactNativeHost mReactNativeHost = new ReactNativeHostWrapper(
2222
this,
23-
new DefaultReactNativeHost(this) {
23+
new ReactNativeHostWrapper(this, new DefaultReactNativeHost(this) {
2424
@Override
2525
public boolean getUseDeveloperSupport() {
2626
return BuildConfig.DEBUG;
@@ -48,7 +48,7 @@ protected boolean isNewArchEnabled() {
4848
protected Boolean isHermesEnabled() {
4949
return BuildConfig.IS_HERMES_ENABLED;
5050
}
51-
});
51+
}));
5252

5353
@Override
5454
public ReactNativeHost getReactNativeHost() {
@@ -65,5 +65,12 @@ public void onCreate() {
6565
DefaultNewArchitectureEntryPoint.load();
6666
}
6767
// ReactNativeFlipper.initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
68+
ApplicationLifecycleDispatcher.onApplicationCreate(this);
69+
}
70+
71+
@Override
72+
public void onConfigurationChanged(Configuration newConfig) {
73+
super.onConfigurationChanged(newConfig);
74+
ApplicationLifecycleDispatcher.onConfigurationChanged(this, newConfig);
6875
}
6976
}

android/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ buildscript {
77
compileSdkVersion = 33
88
targetSdkVersion = 33
99
kotlinVersion = '1.8.21'
10+
frescoVersion = '2.5.0'
1011

1112
// We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
1213
ndkVersion = "23.1.7779620"

android/gradlew

Lines changed: 54 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
#
4-
# Copyright 2015 the original author or authors.
4+
# Copyright © 2015-2021 the original authors.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
@@ -17,14 +17,56 @@
1717
#
1818

1919
##############################################################################
20-
##
21-
## Gradle start up script for UN*X
22-
##
20+
#
21+
# Gradle start up script for POSIX generated by Gradle.
22+
#
23+
# Important for running:
24+
#
25+
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
26+
# noncompliant, but you have some other compliant shell such as ksh or
27+
# bash, then to run this script, type that shell name before the whole
28+
# command line, like:
29+
#
30+
# ksh Gradle
31+
#
32+
# Busybox and similar reduced shells will NOT work, because this script
33+
# requires all of these POSIX shell features:
34+
# * functions;
35+
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
36+
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
37+
# * compound commands having a testable exit status, especially «case»;
38+
# * various built-in commands including «command», «set», and «ulimit».
39+
#
40+
# Important for patching:
41+
#
42+
# (2) This script targets any POSIX shell, so it avoids extensions provided
43+
# by Bash, Ksh, etc; in particular arrays are avoided.
44+
#
45+
# The "traditional" practice of packing multiple parameters into a
46+
# space-separated string is a well documented source of bugs and security
47+
# problems, so this is (mostly) avoided, by progressively accumulating
48+
# options in "$@", and eventually passing that to Java.
49+
#
50+
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
51+
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
52+
# see the in-line comments for details.
53+
#
54+
# There are tweaks for specific operating systems such as AIX, CygWin,
55+
# Darwin, MinGW, and NonStop.
56+
#
57+
# (3) This script is generated from the Groovy template
58+
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
59+
# within the Gradle project.
60+
#
61+
# You can find Gradle at https://github.com/gradle/gradle/.
62+
#
2363
##############################################################################
2464

2565
# Attempt to set APP_HOME
66+
2667
# Resolve links: $0 may be a link
2768
app_path=$0
69+
2870
# Need this for daisy-chained symlinks.
2971
while
3072
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
@@ -38,11 +80,11 @@ do
3880
esac
3981
done
4082

41-
# This is normally unused
42-
# shellcheck disable=SC2034
43-
APP_BASE_NAME=${0##*/}
4483
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
4584

85+
APP_NAME="Gradle"
86+
APP_BASE_NAME=${0##*/}
87+
4688
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
4789
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
4890

@@ -74,6 +116,7 @@ esac
74116

75117
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
76118

119+
77120
# Determine the Java command to use to start the JVM.
78121
if [ -n "$JAVA_HOME" ] ; then
79122
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -100,16 +143,12 @@ fi
100143
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
101144
case $MAX_FD in #(
102145
max*)
103-
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
104-
# shellcheck disable=SC3045
105146
MAX_FD=$( ulimit -H -n ) ||
106147
warn "Could not query maximum file descriptor limit"
107148
esac
108149
case $MAX_FD in #(
109150
'' | soft) :;; #(
110151
*)
111-
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
112-
# shellcheck disable=SC3045
113152
ulimit -n "$MAX_FD" ||
114153
warn "Could not set maximum file descriptor limit to $MAX_FD"
115154
esac
@@ -127,7 +166,9 @@ fi
127166
if "$cygwin" || "$msys" ; then
128167
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
129168
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
169+
130170
JAVACMD=$( cygpath --unix "$JAVACMD" )
171+
131172
# Now convert the arguments - kludge to limit ourselves to /bin/sh
132173
for arg do
133174
if
@@ -157,6 +198,7 @@ fi
157198
# shell script including quotes and variable substitutions, so put them in
158199
# double quotes to make sure that they get re-expanded; and
159200
# * put everything else in single quotes, so that it's not re-expanded.
201+
160202
set -- \
161203
"-Dorg.gradle.appname=$APP_BASE_NAME" \
162204
-classpath "$CLASSPATH" \
@@ -195,4 +237,4 @@ eval "set -- $(
195237
tr '\n' ' '
196238
)" '"$@"'
197239

198-
exec "$JAVACMD" "$@"
240+
exec "$JAVACMD" "$@"

android/gradlew.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ if "%OS%"=="Windows_NT" setlocal
2626

2727
set DIRNAME=%~dp0
2828
if "%DIRNAME%"=="" set DIRNAME=.
29-
@rem This is normally unused
3029
set APP_BASE_NAME=%~n0
3130
set APP_HOME=%DIRNAME%
3231

@@ -70,6 +69,7 @@ goto fail
7069

7170
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
7271

72+
7373
@rem Execute Gradle
7474
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
7575

@@ -88,4 +88,4 @@ exit /b %EXIT_CODE%
8888
:mainEnd
8989
if "%OS%"=="Windows_NT" endlocal
9090

91-
:omega
91+
:omega

0 commit comments

Comments
 (0)