Skip to content

Commit 2951db0

Browse files
acoates-msacoates-ms
committed
Fix tvOS
2 parents a1eea05 + 572f973 commit 2951db0

File tree

2 files changed

+34
-38
lines changed

2 files changed

+34
-38
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 & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +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 */; };
6766
18BFA4C51F01C46D00969486 /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 18BFA4931F01C46700969486 /* OCMock.framework */; };
6867
18BFA4CB1F01C52400969486 /* RCTEventDispatcherTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1497CFA91B21F5E400C1F8F2 /* RCTEventDispatcherTests.m */; };
69-
18CD948B2149BA90009E2179 /* libRCTTest-macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 18DF57271EFA056600BF4666 /* libRCTTest-macOS.a */; };
7068
18CF508F1F9A6A3B0038A244 /* RNTesterBundle-macOS.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 641DD8EE1F16AA8500B6415F /* RNTesterBundle-macOS.bundle */; };
7169
18D5934D1EF9F8BC005F0CEC /* RCTImageLoaderHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 8385CF031B87479200C6273E /* RCTImageLoaderHelpers.m */; };
7270
18D593781EF9F8CB005F0CEC /* RCTImageLoaderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8385CEF41B873B5C00C6273E /* RCTImageLoaderTests.m */; };
@@ -134,7 +132,6 @@
134132
2DD323E71DA2DE3F000FE1B8 /* libRCTSettings-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD323C81DA2DD8B000FE1B8 /* libRCTSettings-tvOS.a */; };
135133
2DD323E81DA2DE3F000FE1B8 /* libRCTText-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD323D01DA2DD8B000FE1B8 /* libRCTText-tvOS.a */; };
136134
2DD323E91DA2DE3F000FE1B8 /* libRCTWebSocket-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD323D51DA2DD8B000FE1B8 /* libRCTWebSocket-tvOS.a */; };
137-
2DD323EA1DA2DE3F000FE1B8 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD323D91DA2DD8B000FE1B8 /* libReact.a */; };
138135
2DDEF0101F84BF7B00DBDF73 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2DDEF00F1F84BF7B00DBDF73 /* Images.xcassets */; };
139136
2DE7E7FD1FB2A4F3009E225D /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD323B51DA2DD8B000FE1B8 /* libRCTAnimation.a */; };
140137
2DE7E7FE1FB2A4F3009E225D /* libRCTBlob-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5281CA531EEAC9A700AC40CD /* libRCTBlob-tvOS.a */; };
@@ -180,18 +177,20 @@
180177
83636F8F1B53F22C009F943E /* RCTUIManagerScenarioTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 83636F8E1B53F22C009F943E /* RCTUIManagerScenarioTests.m */; };
181178
8385CEF51B873B5C00C6273E /* RCTImageLoaderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8385CEF41B873B5C00C6273E /* RCTImageLoaderTests.m */; };
182179
8385CF041B87479200C6273E /* RCTImageLoaderHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 8385CF031B87479200C6273E /* RCTImageLoaderHelpers.m */; };
183-
9F080905224EBF4A009E6F5A /* libRCTBlob-macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6484CE5A201A7557004275A4 /* libRCTBlob-macOS.a */; };
184-
9F080906224EBF55009E6F5A /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FD21D122242EFA400E7F88E /* libReact.a */; };
185-
9F080907224EBF74009E6F5A /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FD21CF92242EFA400E7F88E /* libRCTWebSocket.a */; };
186-
9F080908224EBF7B009E6F5A /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FD21CF12242EFA400E7F88E /* libRCTText.a */; };
187-
9F080909224EBF8D009E6F5A /* libRCTSettings-macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6448A5D21F292F16006FF1F5 /* libRCTSettings-macOS.a */; };
188-
9F08090A224EBF94009E6F5A /* libRCTPushNotification-macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6424F7B21F669A8E0025D741 /* libRCTPushNotification-macOS.a */; };
189-
9F08090B224EBF9A009E6F5A /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FD21CE72242EFA400E7F88E /* libRCTNetwork.a */; };
190-
9F08090C224EBFA0009E6F5A /* libRCTImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FD21CE12242EFA400E7F88E /* libRCTImage.a */; };
191-
9F08090D224EBFA5009E6F5A /* libRCTGeolocation-macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4633DB601F207C140080B326 /* libRCTGeolocation-macOS.a */; };
192-
9F08090E224EBFAC009E6F5A /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 649D87D91F69DA030005AF18 /* libRCTActionSheet.a */; };
193-
9F08090F224EBFCF009E6F5A /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FD21D122242EFA400E7F88E /* libReact.a */; };
194-
9F080910224EBFD7009E6F5A /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FD21CF92242EFA400E7F88E /* libRCTWebSocket.a */; };
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 */; };
195194
9FB7D3EC224ABDCE00F31D11 /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FD21CF92242EFA400E7F88E /* libRCTWebSocket.a */; };
196195
9FB7D3ED224ABEFE00F31D11 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FD21D122242EFA400E7F88E /* libReact.a */; };
197196
9FB7D3EF224AC0DE00F31D11 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FB7D3EE224AC0DE00F31D11 /* JavaScriptCore.framework */; };
@@ -1021,30 +1020,29 @@
10211020
isa = PBXFrameworksBuildPhase;
10221021
buildActionMask = 2147483647;
10231022
files = (
1024-
9F08090E224EBFAC009E6F5A /* libRCTActionSheet.a in Frameworks */,
1025-
9F08090D224EBFA5009E6F5A /* libRCTGeolocation-macOS.a in Frameworks */,
1026-
9F08090C224EBFA0009E6F5A /* libRCTImage.a in Frameworks */,
1027-
9F08090B224EBF9A009E6F5A /* libRCTNetwork.a in Frameworks */,
1028-
9F08090A224EBF94009E6F5A /* libRCTPushNotification-macOS.a in Frameworks */,
1029-
9F080909224EBF8D009E6F5A /* libRCTSettings-macOS.a in Frameworks */,
1030-
9F080908224EBF7B009E6F5A /* libRCTText.a in Frameworks */,
1031-
9F080907224EBF74009E6F5A /* libRCTWebSocket.a in Frameworks */,
1032-
9F080906224EBF55009E6F5A /* libReact.a in Frameworks */,
1033-
9F080905224EBF4A009E6F5A /* libRCTBlob-macOS.a in Frameworks */,
1034-
18BFA4C51F01C46D00969486 /* OCMock.framework in Frameworks */,
1035-
1834500B1EFAD54F0000CF82 /* libRCTTest-macOS.a in Frameworks */,
1023+
9F4659FA224EAF5E005BEE04 /* libRCTBlob-macOS.a in Frameworks */,
10361024
18FE57B02149BCDB000CB2A7 /* libRCTAnimation.a 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 */,
10371036
);
10381037
runOnlyForDeploymentPostprocessing = 0;
10391038
};
10401039
18FC77A31EF4770B002B3F17 /* Frameworks */ = {
10411040
isa = PBXFrameworksBuildPhase;
10421041
buildActionMask = 2147483647;
10431042
files = (
1044-
9F080910224EBFD7009E6F5A /* libRCTWebSocket.a in Frameworks */,
1045-
9F08090F224EBFCF009E6F5A /* libReact.a in Frameworks */,
1046-
18CD948B2149BA90009E2179 /* libRCTTest-macOS.a in Frameworks */,
1047-
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 */,
10481046
);
10491047
runOnlyForDeploymentPostprocessing = 0;
10501048
};
@@ -1060,10 +1058,10 @@
10601058
isa = PBXFrameworksBuildPhase;
10611059
buildActionMask = 2147483647;
10621060
files = (
1061+
9F41BA75224EC42800E8BAA1 /* libReact.a in Frameworks */,
10631062
ED2970992150247000B7C4FE /* JavaScriptCore.framework in Frameworks */,
10641063
52C11BE11EEACA7800C1A058 /* libRCTBlob-tvOS.a in Frameworks */,
10651064
2D66FF901ECA407E00F0A767 /* libART-tvOS.a in Frameworks */,
1066-
2DD323EA1DA2DE3F000FE1B8 /* libReact.a in Frameworks */,
10671065
2DD323E31DA2DE3F000FE1B8 /* libRCTAnimation.a in Frameworks */,
10681066
3D302F221DF8285100D6DDAE /* libRCTImage-tvOS.a in Frameworks */,
10691067
2DD323E51DA2DE3F000FE1B8 /* libRCTLinking-tvOS.a in Frameworks */,

0 commit comments

Comments
 (0)