Skip to content

Commit 572f973

Browse files
HeyImChrisHeyImChris
committed
tv OS .58 fixes
1 parent a9f4ec2 commit 572f973

File tree

2 files changed

+34
-32
lines changed

2 files changed

+34
-32
lines changed

‎Libraries/Text/TextInput/RCTBaseTextInputView.m

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -274,25 +274,23 @@ - (void)setTextContentType:(NSString *)type
274274
};
275275

276276
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000 /* __IPHONE_11_0 */
277-
if (@available(iOS 11.0, *)) {
277+
if (@available(iOS 11.0, tvOS 11.0, *)) {
278278
NSDictionary<NSString *, NSString *> * iOS11extras = @{@"username": UITextContentTypeUsername,
279279
@"password": UITextContentTypePassword};
280-
280+
281281
NSMutableDictionary<NSString *, NSString *> * iOS11baseMap = [contentTypeMap mutableCopy];
282282
[iOS11baseMap addEntriesFromDictionary:iOS11extras];
283-
284283
contentTypeMap = [iOS11baseMap copy];
285284
}
286285
#endif
287286

288287
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 120000 /* __IPHONE_12_0 */
289-
if (@available(iOS 12.0, *)) {
288+
if (@available(iOS 12.0, tvOS 12.0, *)) {
290289
NSDictionary<NSString *, NSString *> * iOS12extras = @{@"newPassword": UITextContentTypeNewPassword,
291290
@"oneTimeCode": UITextContentTypeOneTimeCode};
292-
291+
293292
NSMutableDictionary<NSString *, NSString *> * iOS12baseMap = [contentTypeMap mutableCopy];
294293
[iOS12baseMap addEntriesFromDictionary:iOS12extras];
295-
296294
contentTypeMap = [iOS12baseMap copy];
297295
}
298296
#endif

‎RNTester/RNTester.xcodeproj/project.pbxproj

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,10 @@
6161
18316E1B1EF9EB7D003DADF3 /* RCTAllocationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1497CFA41B21F5E400C1F8F2 /* RCTAllocationTests.m */; };
6262
1834500B1EFAD54F0000CF82 /* libRCTTest-macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 18DF57271EFA056600BF4666 /* libRCTTest-macOS.a */; };
6363
183938D01F9A55AE00930D92 /* RNTesterTestModule.m in Sources */ = {isa = PBXBuildFile; fileRef = C654F0B21EB34A73000B7A9A /* RNTesterTestModule.m */; };
64-
184808F321668CA100C3C43F /* libRCTLinking-macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D429028F1F1CE21600685AE7 /* libRCTLinking-macOS.a */; };
6564
1879ECF921E84E2800D98372 /* RCTConvert_NSColorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1879ECDE21E84E2800D98372 /* RCTConvert_NSColorTests.m */; };
6665
18AA4BD41EF9C724008C7756 /* RCTURLUtilsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B6C1A21C34225900D3FAF5 /* RCTURLUtilsTests.m */; };
67-
18BF6FE92149CF3200D438C7 /* (null) in Frameworks */ = {isa = PBXBuildFile; };
68-
18BF70042149CF6900D438C7 /* (null) in Frameworks */ = {isa = PBXBuildFile; };
6966
18BFA4C51F01C46D00969486 /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 18BFA4931F01C46700969486 /* OCMock.framework */; };
7067
18BFA4CB1F01C52400969486 /* RCTEventDispatcherTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1497CFA91B21F5E400C1F8F2 /* RCTEventDispatcherTests.m */; };
71-
18CD948B2149BA90009E2179 /* libRCTTest-macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 18DF57271EFA056600BF4666 /* libRCTTest-macOS.a */; };
7268
18CF508F1F9A6A3B0038A244 /* RNTesterBundle-macOS.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 641DD8EE1F16AA8500B6415F /* RNTesterBundle-macOS.bundle */; };
7369
18D5934D1EF9F8BC005F0CEC /* RCTImageLoaderHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 8385CF031B87479200C6273E /* RCTImageLoaderHelpers.m */; };
7470
18D593781EF9F8CB005F0CEC /* RCTImageLoaderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8385CEF41B873B5C00C6273E /* RCTImageLoaderTests.m */; };
@@ -81,7 +77,6 @@
8177
18D593801EF9FA48005F0CEC /* RCTShadowViewTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 138D6A161B53CD440074A87E /* RCTShadowViewTests.m */; };
8278
18D593811EF9FA57005F0CEC /* RCTUIManagerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1497CFAB1B21F5E400C1F8F2 /* RCTUIManagerTests.m */; };
8379
18D593841EF9FAB9005F0CEC /* RCTUnicodeDecodeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 39AA31A31DC1DFDC000F7EBB /* RCTUnicodeDecodeTests.m */; };
84-
18D8A3152149C99200086F45 /* (null) in Frameworks */ = {isa = PBXBuildFile; };
8580
18D949451F9AC375007BB668 /* RCTRootViewIntegrationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 27B885551BED29AF00008352 /* RCTRootViewIntegrationTests.m */; };
8681
18D9497D1F9AC3D0007BB668 /* RCTUIManagerScenarioTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 83636F8E1B53F22C009F943E /* RCTUIManagerScenarioTests.m */; };
8782
18DF57111EFA047400BF4666 /* RCTComponentPropsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 13BCE84E1C9C209600DD7AAD /* RCTComponentPropsTests.m */; };
@@ -91,13 +86,7 @@
9186
18FC77951EF4770B002B3F17 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 18FC77931EF4770B002B3F17 /* Main.storyboard */; };
9287
18FC77A01EF4770B002B3F17 /* RNTesterUnitTests_macOS.m in Sources */ = {isa = PBXBuildFile; fileRef = 18FC779F1EF4770B002B3F17 /* RNTesterUnitTests_macOS.m */; };
9388
18FC77AB1EF4770B002B3F17 /* RNTesterIntegrationTests_macOS.m in Sources */ = {isa = PBXBuildFile; fileRef = 18FC77AA1EF4770B002B3F17 /* RNTesterIntegrationTests_macOS.m */; };
94-
18FE57A82149BC50000CB2A7 /* (null) in Frameworks */ = {isa = PBXBuildFile; };
95-
18FE57AE2149BC65000CB2A7 /* (null) in Frameworks */ = {isa = PBXBuildFile; };
96-
18FE57AF2149BCB9000CB2A7 /* (null) in Frameworks */ = {isa = PBXBuildFile; };
9789
18FE57B02149BCDB000CB2A7 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 647647C81F0BCC5500C2D89B /* libRCTAnimation.a */; };
98-
18FE57B12149BD03000CB2A7 /* (null) in Frameworks */ = {isa = PBXBuildFile; };
99-
18FE57B22149BD08000CB2A7 /* (null) in Frameworks */ = {isa = PBXBuildFile; };
100-
18FE57B32149BD0D000CB2A7 /* (null) in Frameworks */ = {isa = PBXBuildFile; };
10190
192F69B81E82409A008692C7 /* RCTAnimationUtilsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 192F69B51E82409A008692C7 /* RCTAnimationUtilsTests.m */; };
10291
192F69B91E82409A008692C7 /* RCTConvert_YGValueTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 192F69B61E82409A008692C7 /* RCTConvert_YGValueTests.m */; };
10392
192F69BA1E82409A008692C7 /* RCTNativeAnimatedNodesManagerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 192F69B71E82409A008692C7 /* RCTNativeAnimatedNodesManagerTests.m */; };
@@ -143,7 +132,6 @@
143132
2DD323E71DA2DE3F000FE1B8 /* libRCTSettings-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD323C81DA2DD8B000FE1B8 /* libRCTSettings-tvOS.a */; };
144133
2DD323E81DA2DE3F000FE1B8 /* libRCTText-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD323D01DA2DD8B000FE1B8 /* libRCTText-tvOS.a */; };
145134
2DD323E91DA2DE3F000FE1B8 /* libRCTWebSocket-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD323D51DA2DD8B000FE1B8 /* libRCTWebSocket-tvOS.a */; };
146-
2DD323EA1DA2DE3F000FE1B8 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD323D91DA2DD8B000FE1B8 /* libReact.a */; };
147135
2DDEF0101F84BF7B00DBDF73 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2DDEF00F1F84BF7B00DBDF73 /* Images.xcassets */; };
148136
2DE7E7FD1FB2A4F3009E225D /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD323B51DA2DD8B000FE1B8 /* libRCTAnimation.a */; };
149137
2DE7E7FE1FB2A4F3009E225D /* libRCTBlob-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5281CA531EEAC9A700AC40CD /* libRCTBlob-tvOS.a */; };
@@ -189,6 +177,20 @@
189177
83636F8F1B53F22C009F943E /* RCTUIManagerScenarioTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 83636F8E1B53F22C009F943E /* RCTUIManagerScenarioTests.m */; };
190178
8385CEF51B873B5C00C6273E /* RCTImageLoaderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8385CEF41B873B5C00C6273E /* RCTImageLoaderTests.m */; };
191179
8385CF041B87479200C6273E /* RCTImageLoaderHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 8385CF031B87479200C6273E /* RCTImageLoaderHelpers.m */; };
180+
9F0808A2224EBE8C009E6F5A /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FD21D122242EFA400E7F88E /* libReact.a */; };
181+
9F0808C0224EBE9A009E6F5A /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FD21CF92242EFA400E7F88E /* libRCTWebSocket.a */; };
182+
9F41BA75224EC42800E8BAA1 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD323D91DA2DD8B000FE1B8 /* libReact.a */; };
183+
9F4659FA224EAF5E005BEE04 /* libRCTBlob-macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6484CE5A201A7557004275A4 /* libRCTBlob-macOS.a */; };
184+
9F4659FB224EB002005BEE04 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 649D87D91F69DA030005AF18 /* libRCTActionSheet.a */; };
185+
9F4659FC224EB00E005BEE04 /* libRCTGeolocation-macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4633DB601F207C140080B326 /* libRCTGeolocation-macOS.a */; };
186+
9F4659FD224EB088005BEE04 /* libRCTImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FD21CE12242EFA400E7F88E /* libRCTImage.a */; };
187+
9F4659FE224EB092005BEE04 /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FD21CE72242EFA400E7F88E /* libRCTNetwork.a */; };
188+
9F4659FF224EB0D9005BEE04 /* libRCTPushNotification-macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6424F7B21F669A8E0025D741 /* libRCTPushNotification-macOS.a */; };
189+
9F465A00224EB0E5005BEE04 /* libRCTSettings-macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6448A5D21F292F16006FF1F5 /* libRCTSettings-macOS.a */; };
190+
9F465A01224EB0F8005BEE04 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FD21CF12242EFA400E7F88E /* libRCTText.a */; };
191+
9F465A02224EB106005BEE04 /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FD21CF92242EFA400E7F88E /* libRCTWebSocket.a */; };
192+
9F465A03224EB10E005BEE04 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FD21D122242EFA400E7F88E /* libReact.a */; };
193+
9F465A05224EB177005BEE04 /* libRCTTest-macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 18DF57271EFA056600BF4666 /* libRCTTest-macOS.a */; };
192194
9FB7D3EC224ABDCE00F31D11 /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FD21CF92242EFA400E7F88E /* libRCTWebSocket.a */; };
193195
9FB7D3ED224ABEFE00F31D11 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FD21D122242EFA400E7F88E /* libReact.a */; };
194196
9FB7D3EF224AC0DE00F31D11 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FB7D3EE224AC0DE00F31D11 /* JavaScriptCore.framework */; };
@@ -1018,27 +1020,29 @@
10181020
isa = PBXFrameworksBuildPhase;
10191021
buildActionMask = 2147483647;
10201022
files = (
1021-
18BFA4C51F01C46D00969486 /* OCMock.framework in Frameworks */,
1022-
1834500B1EFAD54F0000CF82 /* libRCTTest-macOS.a in Frameworks */,
1023-
18FE57AF2149BCB9000CB2A7 /* (null) in Frameworks */,
1023+
9F4659FA224EAF5E005BEE04 /* libRCTBlob-macOS.a in Frameworks */,
10241024
18FE57B02149BCDB000CB2A7 /* libRCTAnimation.a in Frameworks */,
1025-
18FE57B32149BD0D000CB2A7 /* (null) in Frameworks */,
1026-
18FE57B12149BD03000CB2A7 /* (null) in Frameworks */,
1027-
18FE57B22149BD08000CB2A7 /* (null) in Frameworks */,
1025+
9F4659FB224EB002005BEE04 /* libRCTActionSheet.a in Frameworks */,
1026+
9F4659FC224EB00E005BEE04 /* libRCTGeolocation-macOS.a in Frameworks */,
1027+
9F4659FD224EB088005BEE04 /* libRCTImage.a in Frameworks */,
1028+
9F4659FE224EB092005BEE04 /* libRCTNetwork.a in Frameworks */,
1029+
9F4659FF224EB0D9005BEE04 /* libRCTPushNotification-macOS.a in Frameworks */,
1030+
9F465A00224EB0E5005BEE04 /* libRCTSettings-macOS.a in Frameworks */,
1031+
1834500B1EFAD54F0000CF82 /* libRCTTest-macOS.a in Frameworks */,
1032+
9F465A01224EB0F8005BEE04 /* libRCTText.a in Frameworks */,
1033+
9F465A02224EB106005BEE04 /* libRCTWebSocket.a in Frameworks */,
1034+
9F465A03224EB10E005BEE04 /* libReact.a in Frameworks */,
1035+
18BFA4C51F01C46D00969486 /* OCMock.framework in Frameworks */,
10281036
);
10291037
runOnlyForDeploymentPostprocessing = 0;
10301038
};
10311039
18FC77A31EF4770B002B3F17 /* Frameworks */ = {
10321040
isa = PBXFrameworksBuildPhase;
10331041
buildActionMask = 2147483647;
10341042
files = (
1035-
18CD948B2149BA90009E2179 /* libRCTTest-macOS.a in Frameworks */,
1036-
18FE57A82149BC50000CB2A7 /* (null) in Frameworks */,
1037-
18D8A3152149C99200086F45 /* (null) in Frameworks */,
1038-
18BF6FE92149CF3200D438C7 /* (null) in Frameworks */,
1039-
18BF70042149CF6900D438C7 /* (null) in Frameworks */,
1040-
18FE57AE2149BC65000CB2A7 /* (null) in Frameworks */,
1041-
184808F321668CA100C3C43F /* libRCTLinking-macOS.a in Frameworks */,
1043+
9F0808C0224EBE9A009E6F5A /* libRCTWebSocket.a in Frameworks */,
1044+
9F0808A2224EBE8C009E6F5A /* libReact.a in Frameworks */,
1045+
9F465A05224EB177005BEE04 /* libRCTTest-macOS.a in Frameworks */,
10421046
);
10431047
runOnlyForDeploymentPostprocessing = 0;
10441048
};
@@ -1054,10 +1058,10 @@
10541058
isa = PBXFrameworksBuildPhase;
10551059
buildActionMask = 2147483647;
10561060
files = (
1061+
9F41BA75224EC42800E8BAA1 /* libReact.a in Frameworks */,
10571062
ED2970992150247000B7C4FE /* JavaScriptCore.framework in Frameworks */,
10581063
52C11BE11EEACA7800C1A058 /* libRCTBlob-tvOS.a in Frameworks */,
10591064
2D66FF901ECA407E00F0A767 /* libART-tvOS.a in Frameworks */,
1060-
2DD323EA1DA2DE3F000FE1B8 /* libReact.a in Frameworks */,
10611065
2DD323E31DA2DE3F000FE1B8 /* libRCTAnimation.a in Frameworks */,
10621066
3D302F221DF8285100D6DDAE /* libRCTImage-tvOS.a in Frameworks */,
10631067
2DD323E51DA2DE3F000FE1B8 /* libRCTLinking-tvOS.a in Frameworks */,

0 commit comments

Comments
 (0)