mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
8131b7bb7b
Summary: This is my proposal for fixing `use_frameworks!` compatibility without breaking all `<React/*>` imports I outlined in https://github.com/facebook/react-native/pull/25393#issuecomment-508457700. If accepted, it will fix https://github.com/facebook/react-native/issues/25349. It builds on the changes I made in https://github.com/facebook/react-native/pull/25496 by ensuring each podspec has a unique value for `header_dir` so that framework imports do not conflict. Every podspec which should be included in the `<React/*>` namespace now includes it's headers from `React-Core.podspec`. The following pods can still be imported with `<React/*>` and so should not have breaking changes: `React-ART`,`React-DevSupport`, `React-CoreModules`, `React-RCTActionSheet`, `React-RCTAnimation`, `React-RCTBlob`, `React-RCTImage`, `React-RCTLinking`, `React-RCTNetwork`, `React-RCTPushNotification`, `React-RCTSettings`, `React-RCTText`, `React-RCTSettings`, `React-RCTVibration`, `React-RCTWebSocket` . There are still a few breaking changes which I hope will be acceptable: - `React-Core.podspec` has been moved to the root of the project. Any `Podfile` that references it will need to update the path. - ~~`React-turbomodule-core`'s headers now live under `<turbomodule/*>`~~ Replaced by https://github.com/facebook/react-native/pull/25619#issuecomment-511091823. - ~~`React-turbomodulesamples`'s headers now live under `<turbomodulesamples/*>`~~ Replaced by https://github.com/facebook/react-native/pull/25619#issuecomment-511091823. - ~~`React-TypeSaferty`'s headers now live under `<TypeSafety/*>`~~ Replaced by https://github.com/facebook/react-native/pull/25619#issuecomment-511040967. - ~~`React-jscallinvoker`'s headers now live under `<jscallinvoker/*>`~~ Replaced by https://github.com/facebook/react-native/pull/25619#issuecomment-511091823. - Each podspec now uses `s.static_framework = true`. This means that a minimum of CocoaPods 1.5 ([released in April 2018](http://blog.cocoapods.org/CocoaPods-1.5.0/)) is now required. This is needed so that the ` __has_include` conditions can still work when frameworks are enabled. Still to do: - ~~Including `React-turbomodule-core` with `use_frameworks!` enabled causes the C++ import failures we saw in https://github.com/facebook/react-native/issues/25349. I'm sure it will be possible to fix this but I need to dig deeper (perhaps a custom modulemap would be needed).~~ Addressed by https://github.com/facebook/react-native/pull/25619/commits/33573511f02f3502a28bad48e085e9a4b8608302. - I haven't got Fabric working yet. I wonder if it would be acceptable to move Fabric out of the `<React/*>` namespace since it is new? � ## Changelog [iOS] [Fixed] - Fixed compatibility with CocoaPods frameworks. Pull Request resolved: https://github.com/facebook/react-native/pull/25619 Test Plan: ### FB ``` buck build catalyst ``` ### Sample Project Everything should work exactly as before, where `use_frameworks!` is not in `Podfile`s. I have a branch on my [sample project](https://github.com/jtreanor/react-native-cocoapods-frameworks) here which has `use_frameworks!` in its `Podfile` to demonstrate this is fixed. You can see that it works with these steps: 1. `git clone git@github.com:jtreanor/react-native-cocoapods-frameworks.git` 2. `git checkout fix-frameworks-subspecs` 3. `cd ios && pod install` 4. `cd .. && react-native run-ios` The sample app will build and run successfully. To see that it still works without frameworks, remove `use_frameworks!` from the `Podfile` and do steps 3 and 4 again. ### RNTesterPods `RNTesterPodsPods` can now work with or without `use_frameworks!`. 1. Go to the `RNTester` directory and run `pod install`. 2. Run the tests in `RNTesterPods.xcworkspace` to see that everything still works fine. 3. Uncomment the `use_frameworks!` line at the top of `RNTester/Podfile` and run `pod install` again. 4. Run the tests again and see that it still works with frameworks enabled. Reviewed By: PeteTheHeat Differential Revision: D16465247 Pulled By: PeteTheHeat fbshipit-source-id: cad837e9cced06d30cc5b372af1c65c7780b9e7a
212 lines
7.9 KiB
Objective-C
212 lines
7.9 KiB
Objective-C
/**
|
|
* Copyright (c) Facebook, Inc. and its affiliates.
|
|
*
|
|
* This source code is licensed under the MIT license found in the
|
|
* LICENSE file in the root directory of this source tree.
|
|
*/
|
|
|
|
#import <React/RCTNetInfo.h>
|
|
|
|
#if !TARGET_OS_TV && !TARGET_OS_UIKITFORMAC
|
|
#import <CoreTelephony/CTTelephonyNetworkInfo.h>
|
|
#endif
|
|
#import <React/RCTAssert.h>
|
|
#import <React/RCTBridge.h>
|
|
#import <React/RCTEventDispatcher.h>
|
|
|
|
// Based on the ConnectionType enum described in the W3C Network Information API spec
|
|
// (https://wicg.github.io/netinfo/).
|
|
static NSString *const RCTConnectionTypeUnknown = @"unknown";
|
|
static NSString *const RCTConnectionTypeNone = @"none";
|
|
static NSString *const RCTConnectionTypeWifi = @"wifi";
|
|
static NSString *const RCTConnectionTypeCellular = @"cellular";
|
|
|
|
// Based on the EffectiveConnectionType enum described in the W3C Network Information API spec
|
|
// (https://wicg.github.io/netinfo/).
|
|
static NSString *const RCTEffectiveConnectionTypeUnknown = @"unknown";
|
|
static NSString *const RCTEffectiveConnectionType2g = @"2g";
|
|
static NSString *const RCTEffectiveConnectionType3g = @"3g";
|
|
static NSString *const RCTEffectiveConnectionType4g = @"4g";
|
|
|
|
// The RCTReachabilityState* values are deprecated.
|
|
static NSString *const RCTReachabilityStateUnknown = @"unknown";
|
|
static NSString *const RCTReachabilityStateNone = @"none";
|
|
static NSString *const RCTReachabilityStateWifi = @"wifi";
|
|
static NSString *const RCTReachabilityStateCell = @"cell";
|
|
|
|
@implementation RCTNetInfo
|
|
{
|
|
SCNetworkReachabilityRef _firstTimeReachability;
|
|
SCNetworkReachabilityRef _reachability;
|
|
NSString *_connectionType;
|
|
NSString *_effectiveConnectionType;
|
|
NSString *_statusDeprecated;
|
|
NSString *_host;
|
|
BOOL _isObserving;
|
|
RCTPromiseResolveBlock _resolve;
|
|
}
|
|
|
|
RCT_EXPORT_MODULE()
|
|
|
|
static void RCTReachabilityCallback(__unused SCNetworkReachabilityRef target, SCNetworkReachabilityFlags flags, void *info)
|
|
{
|
|
RCTNetInfo *self = (__bridge id)info;
|
|
BOOL didSetReachabilityFlags = [self setReachabilityStatus:flags];
|
|
|
|
NSString *connectionType = self->_connectionType ?: RCTConnectionTypeUnknown;
|
|
NSString *effectiveConnectionType = self->_effectiveConnectionType ?: RCTEffectiveConnectionTypeUnknown;
|
|
NSString *networkInfo = self->_statusDeprecated ?: RCTReachabilityStateUnknown;
|
|
|
|
if (self->_firstTimeReachability && self->_resolve) {
|
|
SCNetworkReachabilityUnscheduleFromRunLoop(self->_firstTimeReachability, CFRunLoopGetMain(), kCFRunLoopCommonModes);
|
|
CFRelease(self->_firstTimeReachability);
|
|
self->_resolve(@{@"connectionType": connectionType,
|
|
@"effectiveConnectionType": effectiveConnectionType,
|
|
@"network_info": networkInfo});
|
|
self->_firstTimeReachability = nil;
|
|
self->_resolve = nil;
|
|
}
|
|
|
|
if (didSetReachabilityFlags && self->_isObserving) {
|
|
[self sendEventWithName:@"networkStatusDidChange" body:@{@"connectionType": connectionType,
|
|
@"effectiveConnectionType": effectiveConnectionType,
|
|
@"network_info": networkInfo}];
|
|
}
|
|
}
|
|
|
|
// We need RCTReachabilityCallback's and module methods to be called on the same thread so that we can have
|
|
// guarantees about when we mess with the reachability callbacks.
|
|
- (dispatch_queue_t)methodQueue
|
|
{
|
|
return dispatch_get_main_queue();
|
|
}
|
|
|
|
#pragma mark - Lifecycle
|
|
|
|
- (instancetype)initWithHost:(NSString *)host
|
|
{
|
|
RCTAssertParam(host);
|
|
RCTAssert(![host hasPrefix:@"http"], @"Host value should just contain the domain, not the URL scheme.");
|
|
|
|
if ((self = [self init])) {
|
|
_host = [host copy];
|
|
}
|
|
return self;
|
|
}
|
|
|
|
- (NSArray<NSString *> *)supportedEvents
|
|
{
|
|
return @[@"networkStatusDidChange"];
|
|
}
|
|
|
|
- (void)startObserving
|
|
{
|
|
_isObserving = YES;
|
|
_connectionType = RCTConnectionTypeUnknown;
|
|
_effectiveConnectionType = RCTEffectiveConnectionTypeUnknown;
|
|
_statusDeprecated = RCTReachabilityStateUnknown;
|
|
_reachability = [self getReachabilityRef];
|
|
}
|
|
|
|
- (void)stopObserving
|
|
{
|
|
_isObserving = NO;
|
|
if (_reachability) {
|
|
SCNetworkReachabilityUnscheduleFromRunLoop(_reachability, CFRunLoopGetMain(), kCFRunLoopCommonModes);
|
|
CFRelease(_reachability);
|
|
}
|
|
}
|
|
|
|
- (void)dealloc
|
|
{
|
|
if (_firstTimeReachability) {
|
|
SCNetworkReachabilityUnscheduleFromRunLoop(self->_firstTimeReachability, CFRunLoopGetMain(), kCFRunLoopCommonModes);
|
|
CFRelease(self->_firstTimeReachability);
|
|
_firstTimeReachability = nil;
|
|
_resolve = nil;
|
|
}
|
|
}
|
|
|
|
- (SCNetworkReachabilityRef)getReachabilityRef
|
|
{
|
|
SCNetworkReachabilityRef reachability = SCNetworkReachabilityCreateWithName(kCFAllocatorDefault, _host.UTF8String ?: "apple.com");
|
|
SCNetworkReachabilityContext context = { 0, ( __bridge void *)self, NULL, NULL, NULL };
|
|
SCNetworkReachabilitySetCallback(reachability, RCTReachabilityCallback, &context);
|
|
SCNetworkReachabilityScheduleWithRunLoop(reachability, CFRunLoopGetMain(), kCFRunLoopCommonModes);
|
|
|
|
return reachability;
|
|
}
|
|
|
|
- (BOOL)setReachabilityStatus:(SCNetworkReachabilityFlags)flags
|
|
{
|
|
NSString *connectionType = RCTConnectionTypeUnknown;
|
|
NSString *effectiveConnectionType = RCTEffectiveConnectionTypeUnknown;
|
|
NSString *status = RCTReachabilityStateUnknown;
|
|
if ((flags & kSCNetworkReachabilityFlagsReachable) == 0 ||
|
|
(flags & kSCNetworkReachabilityFlagsConnectionRequired) != 0) {
|
|
connectionType = RCTConnectionTypeNone;
|
|
status = RCTReachabilityStateNone;
|
|
}
|
|
|
|
#if !TARGET_OS_TV && !TARGET_OS_UIKITFORMAC
|
|
|
|
else if ((flags & kSCNetworkReachabilityFlagsIsWWAN) != 0) {
|
|
connectionType = RCTConnectionTypeCellular;
|
|
status = RCTReachabilityStateCell;
|
|
|
|
CTTelephonyNetworkInfo *netinfo = [[CTTelephonyNetworkInfo alloc] init];
|
|
if (netinfo) {
|
|
if ([netinfo.currentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyGPRS] ||
|
|
[netinfo.currentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyEdge] ||
|
|
[netinfo.currentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyCDMA1x]) {
|
|
effectiveConnectionType = RCTEffectiveConnectionType2g;
|
|
} else if ([netinfo.currentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyWCDMA] ||
|
|
[netinfo.currentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyHSDPA] ||
|
|
[netinfo.currentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyHSUPA] ||
|
|
[netinfo.currentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyCDMAEVDORev0] ||
|
|
[netinfo.currentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyCDMAEVDORevA] ||
|
|
[netinfo.currentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyCDMAEVDORevB] ||
|
|
[netinfo.currentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyeHRPD]) {
|
|
effectiveConnectionType = RCTEffectiveConnectionType3g;
|
|
} else if ([netinfo.currentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyLTE]) {
|
|
effectiveConnectionType = RCTEffectiveConnectionType4g;
|
|
}
|
|
}
|
|
}
|
|
|
|
#endif
|
|
|
|
else {
|
|
connectionType = RCTConnectionTypeWifi;
|
|
status = RCTReachabilityStateWifi;
|
|
}
|
|
|
|
if (![connectionType isEqualToString:self->_connectionType] ||
|
|
![effectiveConnectionType isEqualToString:self->_effectiveConnectionType] ||
|
|
![status isEqualToString:self->_statusDeprecated]) {
|
|
self->_connectionType = connectionType;
|
|
self->_effectiveConnectionType = effectiveConnectionType;
|
|
self->_statusDeprecated = status;
|
|
return YES;
|
|
}
|
|
|
|
return NO;
|
|
}
|
|
|
|
#pragma mark - Public API
|
|
|
|
RCT_EXPORT_METHOD(getCurrentConnectivity:(RCTPromiseResolveBlock)resolve
|
|
reject:(__unused RCTPromiseRejectBlock)reject)
|
|
{
|
|
if (_firstTimeReachability) {
|
|
SCNetworkReachabilityUnscheduleFromRunLoop(self->_firstTimeReachability, CFRunLoopGetMain(), kCFRunLoopCommonModes);
|
|
CFRelease(self->_firstTimeReachability);
|
|
_firstTimeReachability = nil;
|
|
_resolve = nil;
|
|
}
|
|
_firstTimeReachability = [self getReachabilityRef];
|
|
_resolve = resolve;
|
|
}
|
|
|
|
@end
|