Skip to content

Commit 23a6d4f

Browse files
authored
Merge branch '0.74-stable' into 0.74/ubsan
2 parents 96cc444 + 557d1cd commit 23a6d4f

7 files changed

Lines changed: 7 additions & 7 deletions

File tree

packages/react-native/Libraries/Core/ReactNativeVersion.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const version: $ReadOnly<{
1616
}> = {
1717
major: 0,
1818
minor: 74,
19-
patch: 31,
19+
patch: 32,
2020
prerelease: null,
2121
};
2222

packages/react-native/React/Base/RCTVersion.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
__rnVersion = @{
2424
RCTVersionMajor: @(0),
2525
RCTVersionMinor: @(74),
26-
RCTVersionPatch: @(31),
26+
RCTVersionPatch: @(32),
2727
RCTVersionPrerelease: [NSNull null],
2828
};
2929
});

packages/react-native/React/Base/macOS/RCTUIKit.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ void UIGraphicsBeginImageContextWithOptions(CGSize size, __unused BOOL opaque, C
4444
size_t height = ceilf(size.height * scale);
4545

4646
CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
47-
CGContextRef ctx = CGBitmapContextCreate(NULL, width, height, 8/*bitsPerComponent*/, width * 4/*bytesPerRow*/, colorSpace, kCGImageAlphaPremultipliedFirst);
47+
CGContextRef ctx = CGBitmapContextCreate(NULL, width, height, 8/*bitsPerComponent*/, width * 4/*bytesPerRow*/, colorSpace, (CGBitmapInfo)kCGImageAlphaPremultipliedFirst);
4848
CGColorSpaceRelease(colorSpace);
4949

5050
if (ctx != NULL)

packages/react-native/ReactAndroid/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION_NAME=0.74.31
1+
VERSION_NAME=0.74.32
22
react.internal.publishingGroup=com.facebook.react
33

44
android.useAndroidX=true

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ public class ReactNativeVersion {
1717
public static final Map<String, Object> VERSION = MapBuilder.<String, Object>of(
1818
"major", 0,
1919
"minor", 74,
20-
"patch", 31,
20+
"patch", 32,
2121
"prerelease", null);
2222
}

packages/react-native/ReactCommon/cxxreact/ReactNativeVersion.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace facebook::react {
1717
constexpr struct {
1818
int32_t Major = 0;
1919
int32_t Minor = 74;
20-
int32_t Patch = 31;
20+
int32_t Patch = 32;
2121
std::string_view Prerelease = "";
2222
} ReactNativeVersion;
2323

packages/react-native/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-native-macos",
3-
"version": "0.74.31",
3+
"version": "0.74.32",
44
"description": "React Native for macOS",
55
"license": "MIT",
66
"repository": {

0 commit comments

Comments
 (0)