From 3b7fd9617ab4124316bbb06fa19110c813df1ac3 Mon Sep 17 00:00:00 2001 From: Juan David Nicholls Cardona Date: Mon, 25 Nov 2019 16:27:05 -0500 Subject: [PATCH 1/3] Remove build warnings with iOS 13 using Pragmas --- ios/RNInAppBrowser.h | 5 +-- ios/RNInAppBrowser.m | 79 +++++++++++++++----------------------------- 2 files changed, 27 insertions(+), 57 deletions(-) diff --git a/ios/RNInAppBrowser.h b/ios/RNInAppBrowser.h index 02ef63e..60a6e7a 100644 --- a/ios/RNInAppBrowser.h +++ b/ios/RNInAppBrowser.h @@ -5,7 +5,4 @@ #endif @interface RNInAppBrowser : NSObject -@end - -@interface ModalSafariViewController : UINavigationController -@end +@end \ No newline at end of file diff --git a/ios/RNInAppBrowser.m b/ios/RNInAppBrowser.m index 260e1a9..6de1524 100644 --- a/ios/RNInAppBrowser.m +++ b/ios/RNInAppBrowser.m @@ -15,50 +15,15 @@ #import #endif -#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_13_0 +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wpartial-availability" +#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_13_0) && __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_13_0 @interface RNInAppBrowser () -@end #else @interface RNInAppBrowser () -@end #endif - -@interface ModalSafariViewController () -@end - -@implementation ModalSafariViewController - -- (void)viewDidLoad { - [super viewDidLoad]; -} - -- (void)viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; -} - -- (void)viewDidDisappear:(BOOL)animated { - [super viewDidDisappear:animated]; -} - -- (BOOL)shouldAutorotate { - return YES; -} - -#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED < 90000 -- (NSUInteger)supportedInterfaceOrientations -#else -- (UIInterfaceOrientationMask)supportedInterfaceOrientations -#endif -{ - return UIInterfaceOrientationMaskAll; -} - -- (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation { - UIInterfaceOrientation orientation = [UIApplication sharedApplication].statusBarOrientation; - return orientation; -} - @end +#pragma clang diagnostic pop NSString *RNInAppBrowserErrorCode = @"RNInAppBrowser"; @@ -66,12 +31,12 @@ @implementation RNInAppBrowser #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wpartial-availability" -static SFAuthenticationSession *sfAuthSession API_AVAILABLE(ios(11.0)) API_DEPRECATED("Use ASWebAuthenticationSession instead", ios(11.0, 12.0)); +static SFAuthenticationSession *authSession API_AVAILABLE(ios(11.0)) API_DEPRECATED("Use ASWebAuthenticationSession instead", ios(11.0, 12.0)); #pragma clang diagnostic pop #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wpartial-availability" -static ASWebAuthenticationSession *authSession API_AVAILABLE(ios(12.0)); +static ASWebAuthenticationSession *webAuthSession API_AVAILABLE(ios(12.0)); #pragma clang diagnostic pop static SFSafariViewController *safariVC; @@ -123,27 +88,29 @@ + (BOOL)requiresMainQueueSetup }; if (@available(iOS 12.0, *)) { - authSession = [[ASWebAuthenticationSession alloc] + webAuthSession = [[ASWebAuthenticationSession alloc] initWithURL:url callbackURLScheme:redirectURL completionHandler:completionHandler]; } else { - sfAuthSession = [[SFAuthenticationSession alloc] + authSession = [[SFAuthenticationSession alloc] initWithURL:url callbackURLScheme:redirectURL completionHandler:completionHandler]; } -#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0 +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wpartial-availability" +#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_13_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0 if (@available(iOS 13.0, *)) { - authSession.presentationContextProvider = self; + webAuthSession.presentationContextProvider = self; } #endif - +#pragma clang diagnostic pop if (@available(iOS 12.0, *)) { - [authSession start]; + [webAuthSession start]; } else { - [sfAuthSession start]; + [authSession start]; } } else { resolve(@{ @@ -209,7 +176,7 @@ + (BOOL)requiresMainQueueSetup UIViewController *ctrl = RCTPresentedViewController(); if (modalEnabled) { // This is a hack to present the SafariViewController modally - UINavigationController *safariHackVC = [[ModalSafariViewController alloc] initWithRootViewController:safariVC]; + UINavigationController *safariHackVC = [[UINavigationController alloc] initWithRootViewController:safariVC]; [safariHackVC setNavigationBarHidden:true animated:false]; safariHackVC.modalPresentationStyle = [self getPresentationStyle: modalPresentationStyle]; @@ -217,11 +184,14 @@ + (BOOL)requiresMainQueueSetup safariHackVC.modalTransitionStyle = [self getTransitionStyle: modalTransitionStyle]; } safariHackVC.presentationController.delegate = self; -#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0 +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wpartial-availability" +#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_13_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0 if (@available(iOS 13.0, *)) { [safariHackVC setModalInPresentation:TRUE]; } #endif +#pragma clang diagnostic pop [ctrl presentViewController:safariHackVC animated:animated completion:nil]; } else { @@ -268,9 +238,9 @@ - (void)_close [self flowDidFinish]; } if (@available(iOS 12.0, *)) { - [authSession cancel]; + [webAuthSession cancel]; } else { - [sfAuthSession cancel]; + [authSession cancel]; } } else { [self close]; @@ -334,12 +304,15 @@ - (UIModalPresentationStyle)getPresentationStyle:(NSString *)styleKey { @"overCurrentContext": @(UIModalPresentationOverCurrentContext), @"popover": @(UIModalPresentationPopover) }; +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wpartial-availability" UIModalPresentationStyle modalPresentationStyle = UIModalPresentationFullScreen; -#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0 +#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_13_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0 if (@available(iOS 13.0, *)) { modalPresentationStyle = UIModalPresentationAutomatic; } #endif +#pragma clang diagnostic pop NSNumber *style = [styles objectForKey: styleKey]; if (style != nil) { modalPresentationStyle = [style intValue]; From 37c0b9afd6203de8e71ace45fbcf4d03d9332c8d Mon Sep 17 00:00:00 2001 From: Juan David Nicholls Cardona Date: Mon, 25 Nov 2019 17:02:18 -0500 Subject: [PATCH 2/3] Update Changelog --- CHANGELOG.md | 8 +- example/ios/Podfile.lock | 8 +- example/ios/example.xcodeproj/project.pbxproj | 104 +++++++++--------- package.json | 2 +- 4 files changed, 64 insertions(+), 58 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61cdef4..b1b2d00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,11 @@ in case of vulnerabilities. ## [Unreleased] +## [3.3.3] - 2019-11-25 + +### Fixed +- Remove build warnings with **iOS** 13 using [Pragmas](https://clang.llvm.org/docs/UsersManual.html#controlling-diagnostics-via-pragmas). + ## [3.3.2] - 2019-11-15 ### Fixed @@ -135,7 +140,8 @@ Missing tags for previous versions 🤷‍♂ - Fix `EventBusException` on **Android** by [@Almouro](https://github.com/Almouro) ([9cf4cbb](https://github.com/proyecto26/react-native-inappbrowser/commit/9cf4cbb58d55c8b534dabac6791e6a2a5428253f)). -[Unreleased]: https://github.com/proyecto26/react-native-inappbrowser/compare/v3.3.2...HEAD +[Unreleased]: https://github.com/proyecto26/react-native-inappbrowser/compare/v3.3.3...HEAD +[3.3.3]: https://github.com/proyecto26/react-native-inappbrowser/compare/v3.3.2...v3.3.3 [3.3.2]: https://github.com/proyecto26/react-native-inappbrowser/compare/v3.3.1...v3.3.2 [3.3.1]: https://github.com/proyecto26/react-native-inappbrowser/compare/v3.3.0...v3.3.1 [3.3.0]: https://github.com/proyecto26/react-native-inappbrowser/compare/v3.2.0...v3.3.0 diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 658b8c7..4e6394b 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -81,7 +81,7 @@ PODS: - React-RCTWebSocket (0.60.0): - React-Core (= 0.60.0) - React-fishhook (= 0.60.0) - - RNInAppBrowser (3.0.0): + - RNInAppBrowser (3.3.3): - React - yoga (0.60.0.React) @@ -111,7 +111,7 @@ DEPENDENCIES: - yoga (from `../node_modules/react-native/ReactCommon/yoga`) SPEC REPOS: - https://github.com/cocoapods/specs.git: + https://github.com/CocoaPods/Specs.git: - boost-for-react-native EXTERNAL SOURCES: @@ -185,9 +185,9 @@ SPEC CHECKSUMS: React-RCTText: 685fca2e13b024271048e7e247ef24476f28a41e React-RCTVibration: 4ee1cf208ab17a50fafb1c16ffe28fe594a64e4f React-RCTWebSocket: fca087d583724aa0e5fef7d911f0f2a28d0f2736 - RNInAppBrowser: 5bf209eafe43a1de18b81125ed1f9f5702b2ec1a + RNInAppBrowser: 0800f17fd7ed9fc503eb68e427befebb41ee719b yoga: 616fde658be980aa60a2158835170f3f9c2d04b4 PODFILE CHECKSUM: e6321daab2a139195c1bcaad4b674c568140b44a -COCOAPODS: 1.7.3 +COCOAPODS: 1.8.0 diff --git a/example/ios/example.xcodeproj/project.pbxproj b/example/ios/example.xcodeproj/project.pbxproj index 0453545..cb07d8b 100644 --- a/example/ios/example.xcodeproj/project.pbxproj +++ b/example/ios/example.xcodeproj/project.pbxproj @@ -12,14 +12,14 @@ 13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; - 213016E2623992D12C612E35 /* libPods-exampleTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A462B31E29444E3BA7C1DB60 /* libPods-exampleTests.a */; }; + 17CE312FE34A14259426923C /* libPods-exampleTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F6FD16DCBD4CCDE45189C5F /* libPods-exampleTests.a */; }; 2D02E4BC1E0B4A80006451C7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; }; 2D02E4BD1E0B4A84006451C7 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 2D02E4BF1E0B4AB3006451C7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 2DCD954D1E0B4F2C00145EB5 /* exampleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* exampleTests.m */; }; - 3A690F136B0DFEE45089090D /* libPods-example.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A1E47C47DAEB65E6DFBBCD1B /* libPods-example.a */; }; - 42543A95BB8C78D48892BA8B /* libPods-example-tvOSTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0EEB355733CF89112F65B734 /* libPods-example-tvOSTests.a */; }; - 55E2CCEE6DE70C1E5DC4BBFC /* libPods-example-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D2F0C2B460D130D254275232 /* libPods-example-tvOS.a */; }; + 7DDBC4C3A101FCB96D3C2F63 /* libPods-example-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E138ED60A890F0679259DD /* libPods-example-tvOS.a */; }; + 86C2A96807F124389903DAB8 /* libPods-example.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4EFA27625BE97B0228F4CF6E /* libPods-example.a */; }; + 96E771CB6D0F7AA1AC122A19 /* libPods-example-tvOSTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2AA1FA33F69A4B07B2B079C1 /* libPods-example-tvOSTests.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -44,7 +44,6 @@ 00E356EE1AD99517003FC87E /* exampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = exampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 00E356F21AD99517003FC87E /* exampleTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = exampleTests.m; sourceTree = ""; }; - 0EEB355733CF89112F65B734 /* libPods-example-tvOSTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-example-tvOSTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 13B07F961A680F5B00A75B9A /* example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = example.app; sourceTree = BUILT_PRODUCTS_DIR; }; 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = example/AppDelegate.h; sourceTree = ""; }; 13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = example/AppDelegate.m; sourceTree = ""; }; @@ -52,21 +51,22 @@ 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = example/Images.xcassets; sourceTree = ""; }; 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = example/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = example/main.m; sourceTree = ""; }; - 18F3EFC24A336ACE19C2D3D7 /* Pods-exampleTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-exampleTests.debug.xcconfig"; path = "Target Support Files/Pods-exampleTests/Pods-exampleTests.debug.xcconfig"; sourceTree = ""; }; + 14B4ED99DBDBDB0B895B78F4 /* Pods-example-tvOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example-tvOS.release.xcconfig"; path = "Target Support Files/Pods-example-tvOS/Pods-example-tvOS.release.xcconfig"; sourceTree = ""; }; + 22E138ED60A890F0679259DD /* libPods-example-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-example-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 2AA1FA33F69A4B07B2B079C1 /* libPods-example-tvOSTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-example-tvOSTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 2AE904E0D3B9FCB60F5E7058 /* Pods-example-tvOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example-tvOS.debug.xcconfig"; path = "Target Support Files/Pods-example-tvOS/Pods-example-tvOS.debug.xcconfig"; sourceTree = ""; }; 2D02E47B1E0B4A5D006451C7 /* example-tvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "example-tvOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 2D02E4901E0B4A5D006451C7 /* example-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "example-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; - 391306DEC17DB8145320C80F /* Pods-example-tvOSTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example-tvOSTests.debug.xcconfig"; path = "Target Support Files/Pods-example-tvOSTests/Pods-example-tvOSTests.debug.xcconfig"; sourceTree = ""; }; - 471E3578D8364F09D2EC5D2A /* Pods-example-tvOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example-tvOS.debug.xcconfig"; path = "Target Support Files/Pods-example-tvOS/Pods-example-tvOS.debug.xcconfig"; sourceTree = ""; }; - 6455228CF9D45978022CAD61 /* Pods-example-tvOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example-tvOS.release.xcconfig"; path = "Target Support Files/Pods-example-tvOS/Pods-example-tvOS.release.xcconfig"; sourceTree = ""; }; - 823C85293B3494CAAED2C397 /* Pods-example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example.debug.xcconfig"; path = "Target Support Files/Pods-example/Pods-example.debug.xcconfig"; sourceTree = ""; }; - A1E47C47DAEB65E6DFBBCD1B /* libPods-example.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-example.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - A462B31E29444E3BA7C1DB60 /* libPods-exampleTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-exampleTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - AFE3BE2BE7B697F5B2BC1E30 /* Pods-exampleTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-exampleTests.release.xcconfig"; path = "Target Support Files/Pods-exampleTests/Pods-exampleTests.release.xcconfig"; sourceTree = ""; }; - B85DEBC21EE90EBA5F1273A5 /* Pods-example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example.release.xcconfig"; path = "Target Support Files/Pods-example/Pods-example.release.xcconfig"; sourceTree = ""; }; - D2F0C2B460D130D254275232 /* libPods-example-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-example-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - E90D68FB847A8CB0D6E41E06 /* Pods-example-tvOSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example-tvOSTests.release.xcconfig"; path = "Target Support Files/Pods-example-tvOSTests/Pods-example-tvOSTests.release.xcconfig"; sourceTree = ""; }; + 4CB4FD962E67204C3BC05AA4 /* Pods-exampleTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-exampleTests.debug.xcconfig"; path = "Target Support Files/Pods-exampleTests/Pods-exampleTests.debug.xcconfig"; sourceTree = ""; }; + 4EFA27625BE97B0228F4CF6E /* libPods-example.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-example.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 704A0276314575E55873D5A1 /* Pods-example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example.release.xcconfig"; path = "Target Support Files/Pods-example/Pods-example.release.xcconfig"; sourceTree = ""; }; + 7F6FD16DCBD4CCDE45189C5F /* libPods-exampleTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-exampleTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + CCCE650503E6765A6EC2738E /* Pods-example-tvOSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example-tvOSTests.release.xcconfig"; path = "Target Support Files/Pods-example-tvOSTests/Pods-example-tvOSTests.release.xcconfig"; sourceTree = ""; }; + D0C291082240FB899337A194 /* Pods-example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example.debug.xcconfig"; path = "Target Support Files/Pods-example/Pods-example.debug.xcconfig"; sourceTree = ""; }; + E34BACC614E4363D9B32A351 /* Pods-example-tvOSTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example-tvOSTests.debug.xcconfig"; path = "Target Support Files/Pods-example-tvOSTests/Pods-example-tvOSTests.debug.xcconfig"; sourceTree = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; ED2971642150620600B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; }; + FDC73B3C33CC809B3AC40476 /* Pods-exampleTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-exampleTests.release.xcconfig"; path = "Target Support Files/Pods-exampleTests/Pods-exampleTests.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -74,7 +74,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 213016E2623992D12C612E35 /* libPods-exampleTests.a in Frameworks */, + 17CE312FE34A14259426923C /* libPods-exampleTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -82,7 +82,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 3A690F136B0DFEE45089090D /* libPods-example.a in Frameworks */, + 86C2A96807F124389903DAB8 /* libPods-example.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -90,7 +90,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 55E2CCEE6DE70C1E5DC4BBFC /* libPods-example-tvOS.a in Frameworks */, + 7DDBC4C3A101FCB96D3C2F63 /* libPods-example-tvOS.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -98,7 +98,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 42543A95BB8C78D48892BA8B /* libPods-example-tvOSTests.a in Frameworks */, + 96E771CB6D0F7AA1AC122A19 /* libPods-example-tvOSTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -141,10 +141,10 @@ children = ( ED297162215061F000B7C4FE /* JavaScriptCore.framework */, ED2971642150620600B7C4FE /* JavaScriptCore.framework */, - A1E47C47DAEB65E6DFBBCD1B /* libPods-example.a */, - D2F0C2B460D130D254275232 /* libPods-example-tvOS.a */, - 0EEB355733CF89112F65B734 /* libPods-example-tvOSTests.a */, - A462B31E29444E3BA7C1DB60 /* libPods-exampleTests.a */, + 4EFA27625BE97B0228F4CF6E /* libPods-example.a */, + 22E138ED60A890F0679259DD /* libPods-example-tvOS.a */, + 2AA1FA33F69A4B07B2B079C1 /* libPods-example-tvOSTests.a */, + 7F6FD16DCBD4CCDE45189C5F /* libPods-exampleTests.a */, ); name = Frameworks; sourceTree = ""; @@ -152,14 +152,14 @@ 369A97B1D93E2DAAC5078E2F /* Pods */ = { isa = PBXGroup; children = ( - 823C85293B3494CAAED2C397 /* Pods-example.debug.xcconfig */, - B85DEBC21EE90EBA5F1273A5 /* Pods-example.release.xcconfig */, - 471E3578D8364F09D2EC5D2A /* Pods-example-tvOS.debug.xcconfig */, - 6455228CF9D45978022CAD61 /* Pods-example-tvOS.release.xcconfig */, - 391306DEC17DB8145320C80F /* Pods-example-tvOSTests.debug.xcconfig */, - E90D68FB847A8CB0D6E41E06 /* Pods-example-tvOSTests.release.xcconfig */, - 18F3EFC24A336ACE19C2D3D7 /* Pods-exampleTests.debug.xcconfig */, - AFE3BE2BE7B697F5B2BC1E30 /* Pods-exampleTests.release.xcconfig */, + D0C291082240FB899337A194 /* Pods-example.debug.xcconfig */, + 704A0276314575E55873D5A1 /* Pods-example.release.xcconfig */, + 2AE904E0D3B9FCB60F5E7058 /* Pods-example-tvOS.debug.xcconfig */, + 14B4ED99DBDBDB0B895B78F4 /* Pods-example-tvOS.release.xcconfig */, + E34BACC614E4363D9B32A351 /* Pods-example-tvOSTests.debug.xcconfig */, + CCCE650503E6765A6EC2738E /* Pods-example-tvOSTests.release.xcconfig */, + 4CB4FD962E67204C3BC05AA4 /* Pods-exampleTests.debug.xcconfig */, + FDC73B3C33CC809B3AC40476 /* Pods-exampleTests.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -204,7 +204,7 @@ isa = PBXNativeTarget; buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "exampleTests" */; buildPhases = ( - 6C946C3368CC66954D854BFB /* [CP] Check Pods Manifest.lock */, + 7A2D19DA610EF7E695070128 /* [CP] Check Pods Manifest.lock */, 00E356EA1AD99517003FC87E /* Sources */, 00E356EB1AD99517003FC87E /* Frameworks */, 00E356EC1AD99517003FC87E /* Resources */, @@ -223,7 +223,7 @@ isa = PBXNativeTarget; buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "example" */; buildPhases = ( - EE21776808CF18A98010905B /* [CP] Check Pods Manifest.lock */, + 48E18988509FF3AEABC9910E /* [CP] Check Pods Manifest.lock */, FD10A7F022414F080027D42C /* Start Packager */, 13B07F871A680F5B00A75B9A /* Sources */, 13B07F8C1A680F5B00A75B9A /* Frameworks */, @@ -243,7 +243,7 @@ isa = PBXNativeTarget; buildConfigurationList = 2D02E4BA1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "example-tvOS" */; buildPhases = ( - C51034D9FBE43EB2F95AB711 /* [CP] Check Pods Manifest.lock */, + 12637EBEFF9EF9FB34002A28 /* [CP] Check Pods Manifest.lock */, FD10A7F122414F3F0027D42C /* Start Packager */, 2D02E4771E0B4A5D006451C7 /* Sources */, 2D02E4781E0B4A5D006451C7 /* Frameworks */, @@ -263,7 +263,7 @@ isa = PBXNativeTarget; buildConfigurationList = 2D02E4BB1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "example-tvOSTests" */; buildPhases = ( - 0C975CB8AA0011220420EB64 /* [CP] Check Pods Manifest.lock */, + D7B42D60DEC2ED28C7256293 /* [CP] Check Pods Manifest.lock */, 2D02E48C1E0B4A5D006451C7 /* Sources */, 2D02E48D1E0B4A5D006451C7 /* Frameworks */, 2D02E48E1E0B4A5D006451C7 /* Resources */, @@ -376,7 +376,7 @@ shellPath = /bin/sh; shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh"; }; - 0C975CB8AA0011220420EB64 /* [CP] Check Pods Manifest.lock */ = { + 12637EBEFF9EF9FB34002A28 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -391,7 +391,7 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-example-tvOSTests-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-example-tvOS-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -412,7 +412,7 @@ shellPath = /bin/sh; shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh"; }; - 6C946C3368CC66954D854BFB /* [CP] Check Pods Manifest.lock */ = { + 48E18988509FF3AEABC9910E /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -427,14 +427,14 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-exampleTests-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-example-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - C51034D9FBE43EB2F95AB711 /* [CP] Check Pods Manifest.lock */ = { + 7A2D19DA610EF7E695070128 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -449,14 +449,14 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-example-tvOS-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-exampleTests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - EE21776808CF18A98010905B /* [CP] Check Pods Manifest.lock */ = { + D7B42D60DEC2ED28C7256293 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -471,7 +471,7 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-example-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-example-tvOSTests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -583,7 +583,7 @@ /* Begin XCBuildConfiguration section */ 00E356F61AD99517003FC87E /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 18F3EFC24A336ACE19C2D3D7 /* Pods-exampleTests.debug.xcconfig */; + baseConfigurationReference = 4CB4FD962E67204C3BC05AA4 /* Pods-exampleTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -606,7 +606,7 @@ }; 00E356F71AD99517003FC87E /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = AFE3BE2BE7B697F5B2BC1E30 /* Pods-exampleTests.release.xcconfig */; + baseConfigurationReference = FDC73B3C33CC809B3AC40476 /* Pods-exampleTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; @@ -626,7 +626,7 @@ }; 13B07F941A680F5B00A75B9A /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 823C85293B3494CAAED2C397 /* Pods-example.debug.xcconfig */; + baseConfigurationReference = D0C291082240FB899337A194 /* Pods-example.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CURRENT_PROJECT_VERSION = 1; @@ -647,7 +647,7 @@ }; 13B07F951A680F5B00A75B9A /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = B85DEBC21EE90EBA5F1273A5 /* Pods-example.release.xcconfig */; + baseConfigurationReference = 704A0276314575E55873D5A1 /* Pods-example.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CURRENT_PROJECT_VERSION = 1; @@ -667,7 +667,7 @@ }; 2D02E4971E0B4A5E006451C7 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 471E3578D8364F09D2EC5D2A /* Pods-example-tvOS.debug.xcconfig */; + baseConfigurationReference = 2AE904E0D3B9FCB60F5E7058 /* Pods-example-tvOS.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image"; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; @@ -695,7 +695,7 @@ }; 2D02E4981E0B4A5E006451C7 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 6455228CF9D45978022CAD61 /* Pods-example-tvOS.release.xcconfig */; + baseConfigurationReference = 14B4ED99DBDBDB0B895B78F4 /* Pods-example-tvOS.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image"; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; @@ -723,7 +723,7 @@ }; 2D02E4991E0B4A5E006451C7 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 391306DEC17DB8145320C80F /* Pods-example-tvOSTests.debug.xcconfig */; + baseConfigurationReference = E34BACC614E4363D9B32A351 /* Pods-example-tvOSTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_ANALYZER_NONNULL = YES; @@ -750,7 +750,7 @@ }; 2D02E49A1E0B4A5E006451C7 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = E90D68FB847A8CB0D6E41E06 /* Pods-example-tvOSTests.release.xcconfig */; + baseConfigurationReference = CCCE650503E6765A6EC2738E /* Pods-example-tvOSTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_ANALYZER_NONNULL = YES; diff --git a/package.json b/package.json index ff05094..0f4ea4b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native-inappbrowser-reborn", - "version": "3.3.2", + "version": "3.3.3", "description": "InAppBrowser for React Native", "main": "index.js", "files": [ From 78ab34fcbc54c1441ae2896843c3d7c1617ca58d Mon Sep 17 00:00:00 2001 From: Juan David Nicholls Cardona Date: Mon, 25 Nov 2019 17:13:34 -0500 Subject: [PATCH 3/3] Fix validation defining interface for previous iOS versions --- ios/RNInAppBrowser.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ios/RNInAppBrowser.m b/ios/RNInAppBrowser.m index 6de1524..69417c2 100644 --- a/ios/RNInAppBrowser.m +++ b/ios/RNInAppBrowser.m @@ -17,10 +17,10 @@ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wpartial-availability" -#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_13_0) && __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_13_0 -@interface RNInAppBrowser () -#else +#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_13_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0 @interface RNInAppBrowser () +#else +@interface RNInAppBrowser () #endif @end #pragma clang diagnostic pop