diff --git a/Examples/UIExplorer/UIExplorerIntegrationTests/RCTLoggingTests.m b/Examples/UIExplorer/UIExplorerIntegrationTests/RCTLoggingTests.m index 5f299c02b0e5cb..030f3abd37c486 100644 --- a/Examples/UIExplorer/UIExplorerIntegrationTests/RCTLoggingTests.m +++ b/Examples/UIExplorer/UIExplorerIntegrationTests/RCTLoggingTests.m @@ -14,9 +14,9 @@ #import -#import "RCTAssert.h" -#import "RCTLog.h" -#import "RCTBridge.h" +#import +#import +#import @interface RCTLoggingTests : XCTestCase diff --git a/Examples/UIExplorer/UIExplorerIntegrationTests/RCTRootViewIntegrationTests.m b/Examples/UIExplorer/UIExplorerIntegrationTests/RCTRootViewIntegrationTests.m index 8695d27c2646ea..9f582c626a17ef 100644 --- a/Examples/UIExplorer/UIExplorerIntegrationTests/RCTRootViewIntegrationTests.m +++ b/Examples/UIExplorer/UIExplorerIntegrationTests/RCTRootViewIntegrationTests.m @@ -26,13 +26,10 @@ #import #import -#import "RCTAssert.h" - -#import "RCTEventDispatcher.h" -#import "RCTRootView.h" -#import "RCTRootViewDelegate.h" - #import +#import +#import +#import #define RCT_TEST_DATA_CONFIGURATION_BLOCK(appName, testType, input, block) \ - (void)test##appName##_##testType##_##input \ diff --git a/Examples/UIExplorer/UIExplorerIntegrationTests/RCTUIManagerScenarioTests.m b/Examples/UIExplorer/UIExplorerIntegrationTests/RCTUIManagerScenarioTests.m index d36a112775b395..dad4579e1c454e 100644 --- a/Examples/UIExplorer/UIExplorerIntegrationTests/RCTUIManagerScenarioTests.m +++ b/Examples/UIExplorer/UIExplorerIntegrationTests/RCTUIManagerScenarioTests.m @@ -14,8 +14,9 @@ #import #import -#import "RCTUIManager.h" -#import "UIView+React.h" + +#import +#import @interface RCTUIManager (Testing) diff --git a/Examples/UIExplorer/UIExplorerIntegrationTests/UIExplorerIntegrationTests.m b/Examples/UIExplorer/UIExplorerIntegrationTests/UIExplorerIntegrationTests.m index 66387ff82ef889..0630b8f8505fd8 100644 --- a/Examples/UIExplorer/UIExplorerIntegrationTests/UIExplorerIntegrationTests.m +++ b/Examples/UIExplorer/UIExplorerIntegrationTests/UIExplorerIntegrationTests.m @@ -12,8 +12,6 @@ #import -#import "RCTAssert.h" - #define RCT_TEST(name) \ - (void)test##name \ { \ diff --git a/Examples/UIExplorer/UIExplorerIntegrationTests/UIExplorerSnapshotTests.m b/Examples/UIExplorer/UIExplorerIntegrationTests/UIExplorerSnapshotTests.m index e4122e0c1c9c9c..3e194d3e5af9fa 100644 --- a/Examples/UIExplorer/UIExplorerIntegrationTests/UIExplorerSnapshotTests.m +++ b/Examples/UIExplorer/UIExplorerIntegrationTests/UIExplorerSnapshotTests.m @@ -17,10 +17,6 @@ #import -#import "RCTAssert.h" -#import "RCTRedBox.h" -#import "RCTRootView.h" - @interface UIExplorerSnapshotTests : XCTestCase { RCTTestRunner *_runner; diff --git a/Examples/UIExplorer/UIExplorerUnitTests/OCMock/OCMStubRecorder.h b/Examples/UIExplorer/UIExplorerUnitTests/OCMock/OCMStubRecorder.h index 7f52a6630bf779..86eb818048e129 100644 --- a/Examples/UIExplorer/UIExplorerUnitTests/OCMock/OCMStubRecorder.h +++ b/Examples/UIExplorer/UIExplorerUnitTests/OCMock/OCMStubRecorder.h @@ -14,7 +14,7 @@ * under the License. */ -#import +#import @interface OCMStubRecorder : OCMRecorder diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTAllocationTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTAllocationTests.m index 2b35091034330e..365e1022680e54 100644 --- a/Examples/UIExplorer/UIExplorerUnitTests/RCTAllocationTests.m +++ b/Examples/UIExplorer/UIExplorerUnitTests/RCTAllocationTests.m @@ -15,11 +15,11 @@ #import #import -#import "RCTBridge.h" -#import "RCTBridge+Private.h" -#import "RCTJSCExecutor.h" -#import "RCTModuleMethod.h" -#import "RCTRootView.h" +#import +#import +#import +#import +#import #define RUN_RUNLOOP_WHILE(CONDITION) \ { \ diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTBridgeTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTBridgeTests.m index 90dc1efc07d7c6..cdc2104c43477f 100644 --- a/Examples/UIExplorer/UIExplorerUnitTests/RCTBridgeTests.m +++ b/Examples/UIExplorer/UIExplorerUnitTests/RCTBridgeTests.m @@ -15,11 +15,11 @@ #import #import -#import "RCTBridge.h" -#import "RCTBridge+Private.h" -#import "RCTBridgeModule.h" -#import "RCTJavaScriptExecutor.h" -#import "RCTUtils.h" +#import +#import +#import +#import +#import #define RUN_RUNLOOP_WHILE(CONDITION) \ { \ diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTBundleURLProviderTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTBundleURLProviderTests.m index 3f0956b5367f7f..518fe20bf3f881 100644 --- a/Examples/UIExplorer/UIExplorerUnitTests/RCTBundleURLProviderTests.m +++ b/Examples/UIExplorer/UIExplorerUnitTests/RCTBundleURLProviderTests.m @@ -13,9 +13,8 @@ */ #import -#import "RCTBundleURLProvider.h" -#import "RCTUtils.h" - +#import +#import static NSString *const testFile = @"test.jsbundle"; static NSString *const mainBundle = @"main.jsbundle"; diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTComponentPropsTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTComponentPropsTests.m index 248a424556c6c2..fc23901a0f29bc 100644 --- a/Examples/UIExplorer/UIExplorerUnitTests/RCTComponentPropsTests.m +++ b/Examples/UIExplorer/UIExplorerUnitTests/RCTComponentPropsTests.m @@ -14,9 +14,9 @@ #import -#import "RCTUIManager.h" -#import "RCTViewManager.h" -#import "RCTView.h" +#import +#import +#import #define RUN_RUNLOOP_WHILE(CONDITION) \ { \ diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTConvert_NSURLTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTConvert_NSURLTests.m index 353bee7444588a..1f88444158e669 100644 --- a/Examples/UIExplorer/UIExplorerUnitTests/RCTConvert_NSURLTests.m +++ b/Examples/UIExplorer/UIExplorerUnitTests/RCTConvert_NSURLTests.m @@ -15,8 +15,7 @@ #import #import - -#import "RCTUtils.h" +#import @interface RCTConvert_NSURLTests : XCTestCase diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTEventDispatcherTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTEventDispatcherTests.m index 9e70eeda689408..fa6adf0ccfed85 100644 --- a/Examples/UIExplorer/UIExplorerUnitTests/RCTEventDispatcherTests.m +++ b/Examples/UIExplorer/UIExplorerUnitTests/RCTEventDispatcherTests.m @@ -16,8 +16,9 @@ #import #import -#import "RCTEventDispatcher.h" -#import "RCTBridge+Private.h" + +#import +#import @interface RCTTestEvent : NSObject @property (atomic, assign, readwrite) BOOL canCoalesce; diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTFontTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTFontTests.m index 9b4eb43f75ebb7..59ab2908795b61 100644 --- a/Examples/UIExplorer/UIExplorerUnitTests/RCTFontTests.m +++ b/Examples/UIExplorer/UIExplorerUnitTests/RCTFontTests.m @@ -12,11 +12,10 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#import #import -#import "RCTFont.h" - -#import +#import @interface RCTFontTests : XCTestCase diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTGzipTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTGzipTests.m index 9d5814c56a5b4b..c41bb35c8abafd 100644 --- a/Examples/UIExplorer/UIExplorerUnitTests/RCTGzipTests.m +++ b/Examples/UIExplorer/UIExplorerUnitTests/RCTGzipTests.m @@ -13,8 +13,9 @@ */ #import -#import "RCTUtils.h" -#import "RCTNetworking.h" + +#import +#import #define RUN_RUNLOOP_WHILE(CONDITION) \ { \ diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTImageLoaderTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTImageLoaderTests.m index 88c6d8a2fc2a80..8d590d2cb3216a 100644 --- a/Examples/UIExplorer/UIExplorerUnitTests/RCTImageLoaderTests.m +++ b/Examples/UIExplorer/UIExplorerUnitTests/RCTImageLoaderTests.m @@ -14,8 +14,9 @@ #import -#import "RCTBridge.h" -#import "RCTImageLoader.h" +#import +#import + #import "RCTImageLoaderHelpers.h" unsigned char blackGIF[] = { diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTImageUtilTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTImageUtilTests.m index 19229d045cc0d4..1c273c04f30102 100644 --- a/Examples/UIExplorer/UIExplorerUnitTests/RCTImageUtilTests.m +++ b/Examples/UIExplorer/UIExplorerUnitTests/RCTImageUtilTests.m @@ -16,7 +16,8 @@ #import #import #import -#import "RCTImageUtils.h" + +#import #define RCTAssertEqualPoints(a, b) { \ XCTAssertEqual(a.x, b.x); \ diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTJSCExecutorTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTJSCExecutorTests.m index c1404d4e033f0c..a7418e53c8bda4 100644 --- a/Examples/UIExplorer/UIExplorerUnitTests/RCTJSCExecutorTests.m +++ b/Examples/UIExplorer/UIExplorerUnitTests/RCTJSCExecutorTests.m @@ -16,8 +16,8 @@ #import -#import "RCTJSCExecutor.h" -#import "RCTUtils.h" +#import +#import @interface RCTJSCExecutorTests : XCTestCase diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTJSONTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTJSONTests.m index bbbe194c5e9867..b86288f51b9ba1 100644 --- a/Examples/UIExplorer/UIExplorerUnitTests/RCTJSONTests.m +++ b/Examples/UIExplorer/UIExplorerUnitTests/RCTJSONTests.m @@ -13,7 +13,8 @@ */ #import -#import "RCTUtils.h" + +#import @interface RCTJSONTests : XCTestCase @@ -53,7 +54,7 @@ - (void)testEncodingNSError NSString *jsonString = RCTJSONStringify(jsonObject, NULL); NSDictionary *json = RCTJSONParse(jsonString, NULL); XCTAssertEqualObjects(json[@"code"], @"EDOMAIN68"); - XCTAssertEqualObjects(json[@"message"], @"The operation couldn’t be completed. (domain error 68.)"); + XCTAssertEqualObjects(json[@"message"], @"The operation couldn\u2019t be completed. (domain error 68.)"); XCTAssertEqualObjects(json[@"domain"], @"domain"); XCTAssertEqualObjects(json[@"userInfo"][@"NSUnderlyingError"][@"code"], @"421"); XCTAssertEqualObjects(json[@"userInfo"][@"NSUnderlyingError"][@"message"], @"underlying error"); diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTMethodArgumentTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTMethodArgumentTests.m index 53d9d0f743365d..078a65e7088d35 100644 --- a/Examples/UIExplorer/UIExplorerUnitTests/RCTMethodArgumentTests.m +++ b/Examples/UIExplorer/UIExplorerUnitTests/RCTMethodArgumentTests.m @@ -15,7 +15,7 @@ #import #import -#import "RCTModuleMethod.h" +#import @interface RCTMethodArgumentTests : XCTestCase diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTModuleInitNotificationRaceTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTModuleInitNotificationRaceTests.m index 374b88a93a3437..126b466df56443 100644 --- a/Examples/UIExplorer/UIExplorerUnitTests/RCTModuleInitNotificationRaceTests.m +++ b/Examples/UIExplorer/UIExplorerUnitTests/RCTModuleInitNotificationRaceTests.m @@ -15,13 +15,13 @@ #import #import -#import "RCTBridge.h" -#import "RCTBridge+Private.h" -#import "RCTBridgeModule.h" -#import "RCTUtils.h" -#import "RCTUIManager.h" -#import "RCTViewManager.h" -#import "RCTJavaScriptExecutor.h" +#import +#import +#import +#import +#import +#import +#import #define RUN_RUNLOOP_WHILE(CONDITION) \ { \ diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTModuleInitTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTModuleInitTests.m index 3e5a350e349709..274cd8e884c2c2 100644 --- a/Examples/UIExplorer/UIExplorerUnitTests/RCTModuleInitTests.m +++ b/Examples/UIExplorer/UIExplorerUnitTests/RCTModuleInitTests.m @@ -15,11 +15,11 @@ #import #import -#import "RCTBridge.h" -#import "RCTBridge+Private.h" -#import "RCTBridgeModule.h" -#import "RCTUtils.h" -#import "RCTJavaScriptExecutor.h" +#import +#import +#import +#import +#import #define RUN_RUNLOOP_WHILE(CONDITION) \ { \ diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTModuleMethodTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTModuleMethodTests.m index f247da4ffc755f..371040832609f1 100644 --- a/Examples/UIExplorer/UIExplorerUnitTests/RCTModuleMethodTests.m +++ b/Examples/UIExplorer/UIExplorerUnitTests/RCTModuleMethodTests.m @@ -15,9 +15,9 @@ #import #import -#import "RCTBridgeModule.h" -#import "RCTModuleMethod.h" -#import "RCTLog.h" +#import +#import +#import static BOOL RCTLogsError(void (^block)(void)) { diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTMultipartStreamReaderTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTMultipartStreamReaderTests.m index 42b14c8805c14e..a3c96c084d16de 100644 --- a/Examples/UIExplorer/UIExplorerUnitTests/RCTMultipartStreamReaderTests.m +++ b/Examples/UIExplorer/UIExplorerUnitTests/RCTMultipartStreamReaderTests.m @@ -13,8 +13,9 @@ */ #import -#import "RCTUtils.h" -#import "RCTMultipartStreamReader.h" + +#import +#import @interface RCTMultipartStreamReaderTests : XCTestCase diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTShadowViewTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTShadowViewTests.m index 6e5dae34f99e70..0a07f108e629e8 100644 --- a/Examples/UIExplorer/UIExplorerUnitTests/RCTShadowViewTests.m +++ b/Examples/UIExplorer/UIExplorerUnitTests/RCTShadowViewTests.m @@ -14,8 +14,8 @@ #import -#import "RCTShadowView.h" -#import "RCTRootShadowView.h" +#import +#import @interface RCTShadowViewTests : XCTestCase diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTUIManagerTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTUIManagerTests.m index 8d6991d4d3123e..2abf3bf26f75fc 100644 --- a/Examples/UIExplorer/UIExplorerUnitTests/RCTUIManagerTests.m +++ b/Examples/UIExplorer/UIExplorerUnitTests/RCTUIManagerTests.m @@ -14,8 +14,8 @@ #import -#import "RCTUIManager.h" -#import "UIView+React.h" +#import +#import @interface RCTUIManager (Testing) diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTURLUtilsTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTURLUtilsTests.m index c2f6db568765d6..7b7c99a6a687c5 100644 --- a/Examples/UIExplorer/UIExplorerUnitTests/RCTURLUtilsTests.m +++ b/Examples/UIExplorer/UIExplorerUnitTests/RCTURLUtilsTests.m @@ -13,7 +13,8 @@ */ #import -#import "RCTUtils.h" + +#import @interface RCTURLUtilsTests : XCTestCase diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTUnicodeDecodeTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTUnicodeDecodeTests.m index 3c99cdc67d78e4..43f9ae8c15fd7b 100644 --- a/Examples/UIExplorer/UIExplorerUnitTests/RCTUnicodeDecodeTests.m +++ b/Examples/UIExplorer/UIExplorerUnitTests/RCTUnicodeDecodeTests.m @@ -14,13 +14,13 @@ #import -#import "RCTNetworking.h" +#import -static NSString* const niqqudStringB64 = @"15HWsNa816jWtdeQ16nWtNeB15nXqiwg15HWuNa816jWuNeQINeQ1rHXnNa515TWtNeZ150sINeQ1rXXqiDXlNa316nWuNa814HXnta315nWtNedLCDXldaw15DWtdeqINeU1rjXkNa416jWttelLg=="; +static NSString *const niqqudStringB64 = @"15HWsNa816jWtdeQ16nWtNeB15nXqiwg15HWuNa816jWuNeQINeQ1rHXnNa515TWtNeZ150sINeQ1rXXqiDXlNa316nWuNa814HXnta315nWtNedLCDXldaw15DWtdeqINeU1rjXkNa416jWttelLg=="; @interface RCTNetworking () -+ (NSString *)decodeTextData:(NSData *)data fromResponse:(NSURLResponse *)response withCarryData:(NSMutableData*)inputCarryData; ++ (NSString *)decodeTextData:(NSData *)data fromResponse:(NSURLResponse *)response withCarryData:(NSMutableData *)inputCarryData; @end @@ -30,47 +30,47 @@ @interface RCTUnicodeDecodeTests : XCTestCase @implementation RCTUnicodeDecodeTests -- (void)runTestForString:(NSString*)unicodeString usingEncoding:(NSString*)encodingName cutAt:(NSUInteger)cutPoint +- (void)runTestForString:(NSString *)unicodeString usingEncoding:(NSString *)encodingName cutAt:(NSUInteger)cutPoint { CFStringEncoding cfEncoding = CFStringConvertIANACharSetNameToEncoding((CFStringRef)encodingName); NSStringEncoding encoding = CFStringConvertEncodingToNSStringEncoding(cfEncoding); - - NSData* unicodeBytes = [unicodeString dataUsingEncoding:encoding]; - - NSURLResponse* fakeResponse = [[NSHTTPURLResponse alloc] initWithURL:[NSURL URLWithString:@"testurl://"] + + NSData *unicodeBytes = [unicodeString dataUsingEncoding:encoding]; + + NSURLResponse *fakeResponse = [[NSHTTPURLResponse alloc] initWithURL:[NSURL URLWithString:@"testurl://"] statusCode:200 HTTPVersion:@"1.1" headerFields:@{@"content-type": [NSString stringWithFormat:@"text/plain; charset=%@", encodingName]}]; XCTAssert([fakeResponse.textEncodingName isEqualToString:encodingName]); - - NSMutableData* carryStorage = [NSMutableData new]; - NSMutableString* parsedString = [NSMutableString new]; - + + NSMutableData *carryStorage = [NSMutableData new]; + NSMutableString *parsedString = [NSMutableString new]; + [parsedString appendString:[RCTNetworking decodeTextData:[unicodeBytes subdataWithRange:NSMakeRange(0, cutPoint)] fromResponse:fakeResponse withCarryData:carryStorage] ?: @""]; - + [parsedString appendString:[RCTNetworking decodeTextData:[unicodeBytes subdataWithRange:NSMakeRange(cutPoint, unicodeBytes.length - cutPoint)] fromResponse:fakeResponse withCarryData:carryStorage] ?: @""]; - + XCTAssert(carryStorage.length == 0); XCTAssert([parsedString isEqualToString:unicodeString]); } - (void)testNiqqud { - NSString* unicodeString = [[NSString alloc] initWithData:[[NSData alloc] initWithBase64EncodedString:niqqudStringB64 + NSString *unicodeString = [[NSString alloc] initWithData:[[NSData alloc] initWithBase64EncodedString:niqqudStringB64 options:(NSDataBase64DecodingOptions)0] encoding:NSUTF8StringEncoding]; - + [self runTestForString:unicodeString usingEncoding:@"utf-8" cutAt:25]; } - (void)testEmojis { - NSString* unicodeString = @"\U0001F602\U0001F602"; - + NSString *unicodeString = @"\U0001F602\U0001F602"; + [self runTestForString:unicodeString usingEncoding:@"utf-8" cutAt:7]; } diff --git a/Libraries/Image/RCTImage.xcodeproj/project.pbxproj b/Libraries/Image/RCTImage.xcodeproj/project.pbxproj index 1cba8165860087..faa4f3159a5b34 100644 --- a/Libraries/Image/RCTImage.xcodeproj/project.pbxproj +++ b/Libraries/Image/RCTImage.xcodeproj/project.pbxproj @@ -27,6 +27,28 @@ 2D3B5F241D9B0D1300451313 /* RCTImageUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 134B00A11B54232B00EC8DFB /* RCTImageUtils.m */; }; 35123E6B1B59C99D00EBAD80 /* RCTImageStoreManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 35123E6A1B59C99D00EBAD80 /* RCTImageStoreManager.m */; }; 354631681B69857700AA0B86 /* RCTImageEditingManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 354631671B69857700AA0B86 /* RCTImageEditingManager.m */; }; + 3DED3A8A1DE6F79800336DD7 /* RCTGIFImageDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 1304D5B01AA8C50D0002E2BE /* RCTGIFImageDecoder.h */; }; + 3DED3A8B1DE6F79800336DD7 /* RCTImageBlurUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = EEF314701C9B0DD30049118E /* RCTImageBlurUtils.h */; }; + 3DED3A8C1DE6F79800336DD7 /* RCTImageCache.h in Headers */ = {isa = PBXBuildFile; fileRef = CCD34C251D4B8FE900268922 /* RCTImageCache.h */; }; + 3DED3A8D1DE6F79800336DD7 /* RCTImageEditingManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 354631661B69857700AA0B86 /* RCTImageEditingManager.h */; }; + 3DED3A8E1DE6F79800336DD7 /* RCTImageLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D5FA63C1DE4B44A0058FD77 /* RCTImageLoader.h */; }; + 3DED3A8F1DE6F79800336DD7 /* RCTImageStoreManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D5FA63D1DE4B44A0058FD77 /* RCTImageStoreManager.h */; }; + 3DED3A901DE6F79800336DD7 /* RCTImageUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 134B00A01B54232B00EC8DFB /* RCTImageUtils.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3DED3A911DE6F79800336DD7 /* RCTImageView.h in Headers */ = {isa = PBXBuildFile; fileRef = 1304D5A71AA8C4A30002E2BE /* RCTImageView.h */; }; + 3DED3A921DE6F79800336DD7 /* RCTImageViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1304D5A91AA8C4A30002E2BE /* RCTImageViewManager.h */; }; + 3DED3A931DE6F79800336DD7 /* RCTLocalAssetImageLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 13EF7F7D1BC825B1003F47DD /* RCTLocalAssetImageLoader.h */; }; + 3DED3A941DE6F79800336DD7 /* RCTResizeMode.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D5FA63E1DE4B44A0058FD77 /* RCTResizeMode.h */; }; + 3DED3A961DE6F7A400336DD7 /* RCTGIFImageDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 1304D5B01AA8C50D0002E2BE /* RCTGIFImageDecoder.h */; }; + 3DED3A971DE6F7A400336DD7 /* RCTImageBlurUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = EEF314701C9B0DD30049118E /* RCTImageBlurUtils.h */; }; + 3DED3A981DE6F7A400336DD7 /* RCTImageCache.h in Headers */ = {isa = PBXBuildFile; fileRef = CCD34C251D4B8FE900268922 /* RCTImageCache.h */; }; + 3DED3A991DE6F7A400336DD7 /* RCTImageEditingManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 354631661B69857700AA0B86 /* RCTImageEditingManager.h */; }; + 3DED3A9A1DE6F7A400336DD7 /* RCTImageLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D5FA63C1DE4B44A0058FD77 /* RCTImageLoader.h */; }; + 3DED3A9B1DE6F7A400336DD7 /* RCTImageStoreManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D5FA63D1DE4B44A0058FD77 /* RCTImageStoreManager.h */; }; + 3DED3A9C1DE6F7A400336DD7 /* RCTImageUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 134B00A01B54232B00EC8DFB /* RCTImageUtils.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3DED3A9D1DE6F7A400336DD7 /* RCTImageView.h in Headers */ = {isa = PBXBuildFile; fileRef = 1304D5A71AA8C4A30002E2BE /* RCTImageView.h */; }; + 3DED3A9E1DE6F7A400336DD7 /* RCTImageViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1304D5A91AA8C4A30002E2BE /* RCTImageViewManager.h */; }; + 3DED3A9F1DE6F7A400336DD7 /* RCTLocalAssetImageLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 13EF7F7D1BC825B1003F47DD /* RCTLocalAssetImageLoader.h */; }; + 3DED3AA01DE6F7A400336DD7 /* RCTResizeMode.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D5FA63E1DE4B44A0058FD77 /* RCTResizeMode.h */; }; CCD34C271D4B8FE900268922 /* RCTImageCache.m in Sources */ = {isa = PBXBuildFile; fileRef = CCD34C261D4B8FE900268922 /* RCTImageCache.m */; }; EEF314721C9B0DD30049118E /* RCTImageBlurUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = EEF314711C9B0DD30049118E /* RCTImageBlurUtils.m */; }; /* End PBXBuildFile section */ @@ -111,11 +133,51 @@ }; /* End PBXGroup section */ +/* Begin PBXHeadersBuildPhase section */ + 3DED3A891DE6F78800336DD7 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 3DED3A8A1DE6F79800336DD7 /* RCTGIFImageDecoder.h in Headers */, + 3DED3A8B1DE6F79800336DD7 /* RCTImageBlurUtils.h in Headers */, + 3DED3A8C1DE6F79800336DD7 /* RCTImageCache.h in Headers */, + 3DED3A8D1DE6F79800336DD7 /* RCTImageEditingManager.h in Headers */, + 3DED3A8E1DE6F79800336DD7 /* RCTImageLoader.h in Headers */, + 3DED3A8F1DE6F79800336DD7 /* RCTImageStoreManager.h in Headers */, + 3DED3A901DE6F79800336DD7 /* RCTImageUtils.h in Headers */, + 3DED3A911DE6F79800336DD7 /* RCTImageView.h in Headers */, + 3DED3A921DE6F79800336DD7 /* RCTImageViewManager.h in Headers */, + 3DED3A931DE6F79800336DD7 /* RCTLocalAssetImageLoader.h in Headers */, + 3DED3A941DE6F79800336DD7 /* RCTResizeMode.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 3DED3A951DE6F79D00336DD7 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 3DED3A961DE6F7A400336DD7 /* RCTGIFImageDecoder.h in Headers */, + 3DED3A971DE6F7A400336DD7 /* RCTImageBlurUtils.h in Headers */, + 3DED3A981DE6F7A400336DD7 /* RCTImageCache.h in Headers */, + 3DED3A991DE6F7A400336DD7 /* RCTImageEditingManager.h in Headers */, + 3DED3A9A1DE6F7A400336DD7 /* RCTImageLoader.h in Headers */, + 3DED3A9B1DE6F7A400336DD7 /* RCTImageStoreManager.h in Headers */, + 3DED3A9C1DE6F7A400336DD7 /* RCTImageUtils.h in Headers */, + 3DED3A9D1DE6F7A400336DD7 /* RCTImageView.h in Headers */, + 3DED3A9E1DE6F7A400336DD7 /* RCTImageViewManager.h in Headers */, + 3DED3A9F1DE6F7A400336DD7 /* RCTLocalAssetImageLoader.h in Headers */, + 3DED3AA01DE6F7A400336DD7 /* RCTResizeMode.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + /* Begin PBXNativeTarget section */ 2D2A28391D9B042B00D4039D /* RCTImage-tvOS */ = { isa = PBXNativeTarget; buildConfigurationList = 2D2A28421D9B042B00D4039D /* Build configuration list for PBXNativeTarget "RCTImage-tvOS" */; buildPhases = ( + 3DED3A951DE6F79D00336DD7 /* Headers */, 2D2A28361D9B042B00D4039D /* Sources */, ); buildRules = ( @@ -131,6 +193,7 @@ isa = PBXNativeTarget; buildConfigurationList = 58B511711A9E6B3D00147676 /* Build configuration list for PBXNativeTarget "RCTImage" */; buildPhases = ( + 3DED3A891DE6F78800336DD7 /* Headers */, 58B511591A9E6B3D00147676 /* Sources */, ); buildRules = ( @@ -230,6 +293,7 @@ GCC_NO_COMMON_BLOCKS = YES; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; + PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/RCTImage; SDKROOT = appletvos; SKIP_INSTALL = YES; TVOS_DEPLOYMENT_TARGET = 9.2; @@ -248,6 +312,7 @@ GCC_NO_COMMON_BLOCKS = YES; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; + PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/RCTImage; SDKROOT = appletvos; SKIP_INSTALL = YES; TVOS_DEPLOYMENT_TARGET = 9.2; @@ -359,6 +424,7 @@ ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = RCTImage; + PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/RCTImage; RUN_CLANG_STATIC_ANALYZER = YES; SKIP_INSTALL = YES; }; @@ -374,6 +440,7 @@ ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = RCTImage; + PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/RCTImage; RUN_CLANG_STATIC_ANALYZER = NO; SKIP_INSTALL = YES; }; diff --git a/Libraries/RCTTest/RCTTest.xcodeproj/project.pbxproj b/Libraries/RCTTest/RCTTest.xcodeproj/project.pbxproj index 64beb16aede36c..f8f21699d4b064 100644 --- a/Libraries/RCTTest/RCTTest.xcodeproj/project.pbxproj +++ b/Libraries/RCTTest/RCTTest.xcodeproj/project.pbxproj @@ -13,37 +13,16 @@ 2D3B5F301D9B0F3D00451313 /* FBSnapshotTestController.m in Sources */ = {isa = PBXBuildFile; fileRef = 58E64FE71AB964CD007446E2 /* FBSnapshotTestController.m */; }; 2D3B5F311D9B0F4200451313 /* UIImage+Compare.m in Sources */ = {isa = PBXBuildFile; fileRef = 58E64FE91AB964CD007446E2 /* UIImage+Compare.m */; }; 2D3B5F321D9B0F4500451313 /* UIImage+Diff.m in Sources */ = {isa = PBXBuildFile; fileRef = 58E64FEB1AB964CD007446E2 /* UIImage+Diff.m */; }; + 3DED3AA21DE6FC3400336DD7 /* RCTTestRunner.h in Headers */ = {isa = PBXBuildFile; fileRef = 585135351AB3C56F00882537 /* RCTTestRunner.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3DED3AA41DE6FC4C00336DD7 /* RCTTestRunner.h in Headers */ = {isa = PBXBuildFile; fileRef = 585135351AB3C56F00882537 /* RCTTestRunner.h */; settings = {ATTRIBUTES = (Public, ); }; }; 585135371AB3C56F00882537 /* RCTTestModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 585135341AB3C56F00882537 /* RCTTestModule.m */; }; 585135381AB3C57000882537 /* RCTTestRunner.m in Sources */ = {isa = PBXBuildFile; fileRef = 585135361AB3C56F00882537 /* RCTTestRunner.m */; }; - 585135391AB3C59A00882537 /* RCTTestRunner.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 585135351AB3C56F00882537 /* RCTTestRunner.h */; }; 58E64FED1AB964CD007446E2 /* FBSnapshotTestController.m in Sources */ = {isa = PBXBuildFile; fileRef = 58E64FE71AB964CD007446E2 /* FBSnapshotTestController.m */; }; 58E64FEE1AB964CD007446E2 /* UIImage+Compare.m in Sources */ = {isa = PBXBuildFile; fileRef = 58E64FE91AB964CD007446E2 /* UIImage+Compare.m */; }; 58E64FEF1AB964CD007446E2 /* UIImage+Diff.m in Sources */ = {isa = PBXBuildFile; fileRef = 58E64FEB1AB964CD007446E2 /* UIImage+Diff.m */; }; 9913A84B1BBE833400D70E66 /* RCTSnapshotManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 9913A84A1BBE833400D70E66 /* RCTSnapshotManager.m */; }; /* End PBXBuildFile section */ -/* Begin PBXCopyFilesBuildPhase section */ - 2D2A286C1D9B047700D4039D /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "include/$(PRODUCT_NAME)"; - dstSubfolderSpec = 16; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 580C376D1AB104AF0015E709 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "include/$(PRODUCT_NAME)"; - dstSubfolderSpec = 16; - files = ( - 585135391AB3C59A00882537 /* RCTTestRunner.h in CopyFiles */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - /* Begin PBXFileReference section */ 2D2A286E1D9B047700D4039D /* libRCTTest-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libRCTTest-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 580C376F1AB104AF0015E709 /* libRCTTest.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTTest.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -123,14 +102,33 @@ }; /* End PBXGroup section */ +/* Begin PBXHeadersBuildPhase section */ + 3DED3AA11DE6FC2200336DD7 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 3DED3AA21DE6FC3400336DD7 /* RCTTestRunner.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 3DED3AA31DE6FC4700336DD7 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 3DED3AA41DE6FC4C00336DD7 /* RCTTestRunner.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + /* Begin PBXNativeTarget section */ 2D2A286D1D9B047700D4039D /* RCTTest-tvOS */ = { isa = PBXNativeTarget; buildConfigurationList = 2D2A28761D9B047700D4039D /* Build configuration list for PBXNativeTarget "RCTTest-tvOS" */; buildPhases = ( + 3DED3AA31DE6FC4700336DD7 /* Headers */, 2D2A286A1D9B047700D4039D /* Sources */, 2D2A286B1D9B047700D4039D /* Frameworks */, - 2D2A286C1D9B047700D4039D /* CopyFiles */, ); buildRules = ( ); @@ -145,9 +143,9 @@ isa = PBXNativeTarget; buildConfigurationList = 580C37831AB104AF0015E709 /* Build configuration list for PBXNativeTarget "RCTTest" */; buildPhases = ( + 3DED3AA11DE6FC2200336DD7 /* Headers */, 580C376B1AB104AF0015E709 /* Sources */, 580C376C1AB104AF0015E709 /* Frameworks */, - 580C376D1AB104AF0015E709 /* CopyFiles */, ); buildRules = ( ); @@ -236,6 +234,7 @@ GCC_NO_COMMON_BLOCKS = YES; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; + PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/RCTTest; SDKROOT = appletvos; SKIP_INSTALL = YES; TVOS_DEPLOYMENT_TARGET = 9.2; @@ -254,6 +253,7 @@ GCC_NO_COMMON_BLOCKS = YES; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; + PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/RCTTest; SDKROOT = appletvos; SKIP_INSTALL = YES; TVOS_DEPLOYMENT_TARGET = 9.2; @@ -358,6 +358,7 @@ XCTest, ); PRODUCT_NAME = "$(TARGET_NAME)"; + PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/RCTTest; RUN_CLANG_STATIC_ANALYZER = YES; SKIP_INSTALL = YES; }; @@ -373,6 +374,7 @@ XCTest, ); PRODUCT_NAME = "$(TARGET_NAME)"; + PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/RCTTest; SKIP_INSTALL = YES; }; name = Release; diff --git a/Libraries/RCTTest/RCTTestRunner.m b/Libraries/RCTTest/RCTTestRunner.m index 4c8b3b89b43a32..6ce9ce0df954fa 100644 --- a/Libraries/RCTTest/RCTTestRunner.m +++ b/Libraries/RCTTest/RCTTestRunner.m @@ -10,13 +10,13 @@ #import "RCTTestRunner.h" #import +#import +#import #import +#import #import #import "FBSnapshotTestController.h" -#import "RCTBridge+Private.h" -#import "RCTJSCExecutor.h" -#import "RCTRootView.h" #import "RCTTestModule.h" static const NSTimeInterval kTestTimeoutSeconds = 120; diff --git a/React/React.xcodeproj/project.pbxproj b/React/React.xcodeproj/project.pbxproj index f33e25be04a7f3..85f9ad9592809e 100644 --- a/React/React.xcodeproj/project.pbxproj +++ b/React/React.xcodeproj/project.pbxproj @@ -217,7 +217,7 @@ 3D3CD9481DE5FC7800167DC4 /* oss-compat-util.h in Headers */ = {isa = PBXBuildFile; fileRef = AC70D2EE1DE48AC5002E6351 /* oss-compat-util.h */; }; 3D4545AC1DE32FB300C6C478 /* RCTAssert.h in Headers */ = {isa = PBXBuildFile; fileRef = 83CBBA4A1A601E3B00E9B192 /* RCTAssert.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3D4545AD1DE32FB300C6C478 /* RCTBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 83CBBA5E1A601EAA00E9B192 /* RCTBridge.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 3D4545AE1DE32FB300C6C478 /* RCTBridge+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 14A43DB81C1F849600794BC8 /* RCTBridge+Private.h */; }; + 3D4545AE1DE32FB300C6C478 /* RCTBridge+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 14A43DB81C1F849600794BC8 /* RCTBridge+Private.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3D4545AF1DE32FB300C6C478 /* RCTBridgeDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1482F9E61B55B927000ADFF3 /* RCTBridgeDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3D4545B01DE32FB300C6C478 /* RCTBridgeMethod.h in Headers */ = {isa = PBXBuildFile; fileRef = 13AFBCA11C07287B00BBAEAA /* RCTBridgeMethod.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3D4545B11DE32FB300C6C478 /* RCTBridgeModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 830213F31A654E0800B993E6 /* RCTBridgeModule.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -332,7 +332,7 @@ 3D4546201DE32FB300C6C478 /* UIView+React.h in Headers */ = {isa = PBXBuildFile; fileRef = 13E067531A70F44B002CDEE1 /* UIView+React.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3D4546221DE32FEC00C6C478 /* RCTAssert.h in Headers */ = {isa = PBXBuildFile; fileRef = 83CBBA4A1A601E3B00E9B192 /* RCTAssert.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3D4546231DE32FEC00C6C478 /* RCTBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 83CBBA5E1A601EAA00E9B192 /* RCTBridge.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 3D4546241DE32FEC00C6C478 /* RCTBridge+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 14A43DB81C1F849600794BC8 /* RCTBridge+Private.h */; }; + 3D4546241DE32FEC00C6C478 /* RCTBridge+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 14A43DB81C1F849600794BC8 /* RCTBridge+Private.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3D4546251DE32FEC00C6C478 /* RCTBridgeDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1482F9E61B55B927000ADFF3 /* RCTBridgeDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3D4546261DE32FEC00C6C478 /* RCTBridgeMethod.h in Headers */ = {isa = PBXBuildFile; fileRef = 13AFBCA11C07287B00BBAEAA /* RCTBridgeMethod.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3D4546271DE32FEC00C6C478 /* RCTBridgeModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 830213F31A654E0800B993E6 /* RCTBridgeModule.h */; settings = {ATTRIBUTES = (Public, ); }; };