diff --git a/.nx/version-plans/version-plan-1794528276174.md b/.nx/version-plans/version-plan-1794528276174.md new file mode 100644 index 000000000000..160ff0c16f34 --- /dev/null +++ b/.nx/version-plans/version-plan-1794528276174.md @@ -0,0 +1,5 @@ +--- +__default__: patch +--- + +Restore macOS native image test compilation and gzip test linkage. diff --git a/nx.json b/nx.json index 06f7fc86f307..6b2e8c592e8e 100644 --- a/nx.json +++ b/nx.json @@ -21,7 +21,7 @@ "versionActionsOptions": { "currentVersionResolver": "registry", "currentVersionResolverMetadata": { - "tag": "latest" + "tag": "0.81-stable" } }, "useLegacyVersioning": false diff --git a/packages/react-native/React/Base/RCTUtils.h b/packages/react-native/React/Base/RCTUtils.h index 5915558a7cc2..ac4fcbae93d2 100644 --- a/packages/react-native/React/Base/RCTUtils.h +++ b/packages/react-native/React/Base/RCTUtils.h @@ -142,6 +142,12 @@ RCT_EXTERN NSURL *RCTDataURL(NSString *mimeType, NSData *data); // Gzip functionality - compression level in range 0 - 1 (-1 for default) RCT_EXTERN NSData *__nullable RCTGzipData(NSData *__nullable data, float level); +// [macOS +// Determines whether data is already gzipped. Declared here (rather than only in +// RCTUtils.mm) so it keeps C linkage and can be called from .m unit tests. +RCT_EXTERN BOOL RCTIsGzippedData(NSData *__nullable data); +// macOS] + // Returns the relative path within the main bundle for an absolute URL // (or nil, if the URL does not specify a path within the main bundle) RCT_EXTERN NSString *__nullable RCTBundlePathForURL(NSURL *__nullable URL); diff --git a/packages/react-native/React/Base/RCTUtils.mm b/packages/react-native/React/Base/RCTUtils.mm index 61c2191ba57e..a03abcb857a1 100644 --- a/packages/react-native/React/Base/RCTUtils.mm +++ b/packages/react-native/React/Base/RCTUtils.mm @@ -781,7 +781,7 @@ BOOL RCTForceTouchAvailable(void) [data base64EncodedStringWithOptions:(NSDataBase64EncodingOptions)0]]]; } -BOOL RCTIsGzippedData(NSData *__nullable); // exposed for unit testing purposes +// [macOS] RCTUtils.h supplies C linkage for Objective-C callers. BOOL RCTIsGzippedData(NSData *__nullable data) { UInt8 *bytes = (UInt8 *)data.bytes; diff --git a/packages/rn-tester/RNTesterUnitTests/RCTGzipTests.m b/packages/rn-tester/RNTesterUnitTests/RCTGzipTests.m index a24d9972be77..3c13e6a3fad6 100644 --- a/packages/rn-tester/RNTesterUnitTests/RCTGzipTests.m +++ b/packages/rn-tester/RNTesterUnitTests/RCTGzipTests.m @@ -9,9 +9,7 @@ #import #import -#import - -extern BOOL RCTIsGzippedData(NSData *data); +#import // [macOS] @interface RCTNetworking (Private) diff --git a/packages/rn-tester/RNTesterUnitTests/RCTImageLoaderTests.m b/packages/rn-tester/RNTesterUnitTests/RCTImageLoaderTests.m index 6c58e9cb26d0..baedbf966369 100644 --- a/packages/rn-tester/RNTesterUnitTests/RCTImageLoaderTests.m +++ b/packages/rn-tester/RNTesterUnitTests/RCTImageLoaderTests.m @@ -7,6 +7,8 @@ #import +#import // [macOS] + #import #import @@ -35,7 +37,7 @@ - (void)setUp - (void)testImageLoading { - UIImage *image = [UIImage new]; + RCTPlatformImage *image = [RCTPlatformImage new]; // [macOS] id loader = [[RCTImageLoaderTestsURLLoader1 alloc] initWithPriority:1.0 canLoadImageURLHandler:^BOOL(__unused NSURL *requestURL) { @@ -70,7 +72,7 @@ - (void)testImageLoading XCTAssertEqual(progress, 1); XCTAssertEqual(total, 1); } - partialLoadBlock:^(UIImage *loadedImage) { + partialLoadBlock:^(RCTPlatformImage *loadedImage) { // [macOS] } completionBlock:^(NSError *loadError, id loadedImage) { XCTAssertEqualObjects(loadedImage, image); @@ -80,7 +82,7 @@ - (void)testImageLoading - (void)testImageLoaderUsesImageURLLoaderWithHighestPriority { - UIImage *image = [UIImage new]; + RCTPlatformImage *image = [RCTPlatformImage new]; // [macOS] id loader1 = [[RCTImageLoaderTestsURLLoader1 alloc] initWithPriority:1.0 canLoadImageURLHandler:^BOOL(__unused NSURL *requestURL) { @@ -130,7 +132,7 @@ - (void)testImageLoaderUsesImageURLLoaderWithHighestPriority XCTAssertEqual(progress, 1); XCTAssertEqual(total, 1); } - partialLoadBlock:^(UIImage *loadedImage) { + partialLoadBlock:^(RCTPlatformImage *loadedImage) { // [macOS] } completionBlock:^(NSError *loadError, id loadedImage) { XCTAssertEqualObjects(loadedImage, image); @@ -141,7 +143,7 @@ - (void)testImageLoaderUsesImageURLLoaderWithHighestPriority - (void)testImageDecoding { NSData *data = [NSData dataWithBytesNoCopy:blackGIF length:sizeof(blackGIF) freeWhenDone:NO]; - UIImage *image = [[UIImage alloc] initWithData:data]; + RCTPlatformImage *image = [[RCTPlatformImage alloc] initWithData:data]; // [macOS] id decoder = [[RCTImageLoaderTestsDecoder1 alloc] initWithPriority:1.0 canDecodeImageDataHandler:^BOOL(__unused NSData *imageData) { @@ -180,7 +182,7 @@ - (void)testImageDecoding - (void)testImageLoaderUsesImageDecoderWithHighestPriority { NSData *data = [NSData dataWithBytesNoCopy:blackGIF length:sizeof(blackGIF) freeWhenDone:NO]; - UIImage *image = [[UIImage alloc] initWithData:data]; + RCTPlatformImage *image = [[RCTPlatformImage alloc] initWithData:data]; // [macOS] id decoder1 = [[RCTImageLoaderTestsDecoder1 alloc] initWithPriority:1.0 canDecodeImageDataHandler:^BOOL(__unused NSData *imageData) {