Skip to content

Commit cb20f50

Browse files
authored
Merge branch '0.87-stable' into zeyap/hermesv1version-fix
2 parents c66b08d + d045236 commit cb20f50

7 files changed

Lines changed: 421 additions & 644 deletions

File tree

.github/actions/test-ios-rntester/action.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@ inputs:
2727
config of the 2026-07-03 SocketRocket dual-copy regression).
2828
required: false
2929
default: auto
30+
build-from-source:
31+
description: >-
32+
Force building ReactCore/ReactNativeDependencies from source, disabling the
33+
prebuilt Maven fallback (RCT_USE_PREBUILT_RNCORE / RCT_USE_RN_DEP, which
34+
otherwise default to '1'). Used by the from-source dynamic-frameworks lane.
35+
required: false
36+
default: false
3037

3138
runs:
3239
using: composite
@@ -100,6 +107,17 @@ runs:
100107
export RCT_USE_LOCAL_RN_DEP="/tmp/third-party/ReactNativeDependencies${{ inputs.flavor }}.xcframework.tar.gz"
101108
export RCT_TESTONLY_RNCORE_TARBALL_PATH="/tmp/ReactCore/ReactCore${{ inputs.flavor }}.xcframework.tar.gz"
102109
fi
110+
if [[ "${{ inputs.build-from-source }}" == "true" ]]; then
111+
# Force building ReactCore/ReactNativeDependencies from source. Both
112+
# RCT_USE_PREBUILT_RNCORE and RCT_USE_RN_DEP default to '1', so on a stable
113+
# branch (where released Maven artifacts exist for the current version) the
114+
# install would otherwise consume those prebuilts instead of building from
115+
# source. That is wrong for the from-source dynamic-frameworks lane and also
116+
# fails when a published artifact predates newer podspec layout changes
117+
# (e.g. a React core tarball without ReactNativeHeaders.xcframework).
118+
export RCT_USE_PREBUILT_RNCORE=0
119+
export RCT_USE_RN_DEP=0
120+
fi
103121
104122
cd packages/rn-tester
105123

.github/workflows/test-all.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ jobs:
136136
with:
137137
flavor: ${{ matrix.flavor }}
138138
use-frameworks: true
139+
build-from-source: true
139140
run-unit-tests: false # tests for dynamic frameworks are already run in the test_ios_rntester job; this is to just a test build from source (no prebuilds)
140141

141142
test_ios_rntester:

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/SynchronousMountItem.kt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,14 @@ internal class SynchronousMountItem(private val reactTag: Int, private val props
2828
}
2929

3030
override fun toString(): String {
31-
val propsString = if (IS_DEVELOPMENT_ENVIRONMENT) props.toHashMap().toString() else "<hidden>"
32-
return "SYNC UPDATE PROPS [$reactTag]: $propsString"
31+
// NOTE: Intentionally written as an early return rather than assigning the result of an
32+
// `if` expression to a local `val`. The latter shape triggers a crash in the Android lint
33+
// K2 UAST analyzer (resolveSyntheticJavaPropertyAccessorCall) while resolving the local
34+
// variable's `if`-expression initializer, failing `lintVitalAnalyzeRelease`.
35+
if (!IS_DEVELOPMENT_ENVIRONMENT) {
36+
return "SYNC UPDATE PROPS [$reactTag]: <hidden>"
37+
}
38+
return "SYNC UPDATE PROPS [$reactTag]: ${props.toHashMap()}"
3339
}
3440

3541
override fun getSurfaceId(): Int = View.NO_ID

packages/react-native/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
"base64-js": "^1.5.1",
161161
"commander": "^12.0.0",
162162
"flow-enums-runtime": "^0.0.6",
163-
"hermes-compiler": "250829098.0.15",
163+
"hermes-compiler": "250829098.0.16",
164164
"invariant": "^2.2.4",
165165
"memoize-one": "^5.0.0",
166166
"metro-runtime": "^0.87.0",
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
hermes-v250829098.0.16
1+
hermes-v250829098.0.16
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
HERMES_VERSION_NAME=250829098.0.13
1+
HERMES_VERSION_NAME=250829098.0.16

0 commit comments

Comments
 (0)