Skip to content

Commit 7ee0e00

Browse files
committed
define only on macos target
1 parent 7429355 commit 7ee0e00

File tree

2 files changed

+33
-31
lines changed

2 files changed

+33
-31
lines changed

RNTester/Podfile.lock

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ DEPENDENCIES:
431431
- Yoga (from `../ReactCommon/yoga`)
432432

433433
SPEC REPOS:
434-
https://cdn.cocoapods.org/:
434+
trunk:
435435
- CocoaAsyncSocket
436436
- CocoaLibEvent
437437
- Flipper
@@ -519,8 +519,8 @@ SPEC CHECKSUMS:
519519
CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845
520520
CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f
521521
DoubleConversion: 56a44bcfd14ab2ff66f5a146b2e875eb4b69b19b
522-
FBLazyVector: e99626a767684cd45377cfb2d270260b08612394
523-
FBReactNativeSpec: 4caa8b770647aad3624a57c46871bf01c1e1ef59
522+
FBLazyVector: bfa82bc29605e7b5af78fa0f9ce18bcd2e4f3a44
523+
FBReactNativeSpec: 14631ba4ff0ce72f3c299f8dc7443a8755b83286
524524
Flipper: be611d4b742d8c87fbae2ca5f44603a02539e365
525525
Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
526526
Flipper-Folly: c12092ea368353b58e992843a990a3225d4533c3
@@ -530,37 +530,37 @@ SPEC CHECKSUMS:
530530
FlipperKit: ab353d41aea8aae2ea6daaf813e67496642f3d7d
531531
glog: 1cb7c408c781ae8f35bbababe459b45e3dee4ec1
532532
hermes: 12d049af0d8e8379c5b3b54ffb1919d670045bdc
533-
libevent: ee9265726a1fc599dea382964fa304378affaa5f
533+
libevent: d721abced7738e428c291489465953c9263d78f9
534534
OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355
535535
RCT-Folly: 1347093ffe75e152d846f7e45a3ef901b60021aa
536-
RCTRequired: 7803a0a3a3d56e3cec84ae1ccbe0f4a2476f9f69
537-
RCTTypeSafety: ae513041fa8773699d99833a8691d2e8b8d6ee8a
538-
React: d6306405782c4669fd3d4d0125a7b2cc2bb19233
539-
React-ART: 65684f957e38c119918b2ad8e2f2c386790b20d0
540-
React-callinvoker: edc229ccab488b3b57895e830d2b825e79f9f04c
541-
React-Core: 50805a8b5eb817533763ae0132a0a61fc740fddf
542-
React-CoreModules: 3147038a51e5a1a1819be556efb3c22855816aec
543-
React-cxxreact: 88f9c5fbd0c391488fb884ab4bf8af85c548230c
544-
React-jsi: e7b3496404f24299beb067b0e4fa38e836f1d6a4
545-
React-jsiexecutor: f214cb9bebf408f6deeea9f6fe6ca610ab88eb6e
546-
React-jsinspector: 7fba9bc98d5047bf5c8dae0cd8acd36b86448d04
547-
React-RCTActionSheet: c4b92af34b6f64c786a972f5c196a375b7ce6cea
548-
React-RCTAnimation: 5a0f7f7b3eaf0520e53d119f8352fdc622d0a90b
549-
React-RCTBlob: 37befa1be701fe18ab0d63eb986b65829c843fc6
550-
React-RCTImage: a02ff4f1882f35574ae589556b5c94b9eee973da
551-
React-RCTLinking: 70240d29450241879339d7384b0903232d30e2c6
552-
React-RCTNetwork: 17a1cd202a4566c25244444644a1fadd092466db
553-
React-RCTPushNotification: eec1e289dfb203ee5360a9065c4009de0c16e097
554-
React-RCTSettings: 490435d0c7767d085ebc9218d6cc9f9e2018ff1c
555-
React-RCTTest: 06e4d480573015d42b0acb110aeb343c16d0c595
556-
React-RCTText: a2a64b9c882d9b9a8e26c27773ca305ce910f4a6
557-
React-RCTVibration: d32b07b6c9e821cb784b04e1c65cee3b35099b54
536+
RCTRequired: a8f891c67319b62913c2badc69ce73b909254885
537+
RCTTypeSafety: 80af803cd8928892cf35ace0e363ae8a43e25115
538+
React: 12ab980bdd703751e20b2a6bb54d00da26b80b2a
539+
React-ART: fcbfe42d43c5b09452e5e9cb9c2ae83725276e1b
540+
React-callinvoker: 05d22194c537efac8a8e5c88d152685858539b52
541+
React-Core: e7165e51dae4928d91d2708694b2462d4298162a
542+
React-CoreModules: f20f2be8f206f7180f088a742c2a92f896f545cc
543+
React-cxxreact: c9255703132ca856cd681c6a843c5ffd6f8d2054
544+
React-jsi: e583874008829007b2b36262e441609811c93f03
545+
React-jsiexecutor: abb996a99e887a4bda2f50c9f6b51bb8af4da0c4
546+
React-jsinspector: 787710aa3699cefc794ffebe90b3af55212e9f9d
547+
React-RCTActionSheet: 55eff1adcdf9bc270e28543ff56d5bbf0a1b0fb7
548+
React-RCTAnimation: 41b06777ecaa2a22f4374b50a8e22a9e43bda32b
549+
React-RCTBlob: 482cdb38ba8f3f8960b5ff2da0ebb66ce9dd3827
550+
React-RCTImage: e5764d04bb1e526131d6fbebf4441a8186f7c8c2
551+
React-RCTLinking: f61c835f79726f8d3a72629d0cf196740efc2362
552+
React-RCTNetwork: bff2f5486541f11512f0ee1afb6fde6dc8c43af9
553+
React-RCTPushNotification: bad67de3bc9759b99c59f67765a5ce3120d27482
554+
React-RCTSettings: 102aa693ccab807cb3a95017fe1b0aafa3dbfe0e
555+
React-RCTTest: 4ab9657f8f64c87f3e22e653ce01f4be73fd9150
556+
React-RCTText: 45f963290e752e0b7be463cae13ca589e8331277
557+
React-RCTVibration: 84f5c121eb67f5f8571bbd8552858f6a12837eed
558558
React-TurboModuleCxx-RNW: 4da8eb44b10ab3c5bbab9fcb0a8ae415c20ea3c9
559-
React-TurboModuleCxx-WinRTPort: cbe13444db8dc3af024947610c537a27cea1c1cb
560-
ReactCommon: d849f99f384dafff03d56ac7e9fd173e117b1509
561-
Yoga: 5ba9af3554885e152355679790ed9be0b1d01695
559+
React-TurboModuleCxx-WinRTPort: 9fc90d3e68dfcc6c23a09db448d6181f12ffd156
560+
ReactCommon: 106c6b710d76f2382f1d7ba9f21fe668cc9eeee5
561+
Yoga: 100c4a7470d05f92ddc88834d7d6930cab11295a
562562
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
563563

564564
PODFILE CHECKSUM: 18ca7d3b0e7db79041574a8bb6200b9e1c2d5359
565565

566-
COCOAPODS: 1.8.4
566+
COCOAPODS: 1.10.0

React/CoreModules/RCTAlertController.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77

88
#import <React/RCTUIKit.h> // TODO(macOS ISS#2323203)
99

10-
#define UIAlertController NSViewController // TODO(macOS ISS#2323203)
10+
#if TARGET_OS_OSX // [TODO(macOS ISS#2323203)
11+
#define UIAlertController NSViewController
12+
#endif // ]TODO(macOS ISS#2323203)
1113

1214
@interface RCTAlertController : UIAlertController
1315

0 commit comments

Comments
 (0)