Skip to content

Commit f8da44e

Browse files
committed
Merge branch 'main' into @mbert/docs-badges-versions
2 parents f5b4656 + e566b99 commit f8da44e

52 files changed

Lines changed: 4280 additions & 2819 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

apps/basic-example/ios/BasicExample.xcodeproj/project.pbxproj

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,8 +287,10 @@
287287
);
288288
PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
289289
PRODUCT_NAME = BasicExample;
290+
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
290291
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
291292
SWIFT_VERSION = 5.0;
293+
TARGETED_DEVICE_FAMILY = "1,2";
292294
VERSIONING_SYSTEM = "apple-generic";
293295
};
294296
name = Debug;
@@ -314,7 +316,9 @@
314316
);
315317
PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
316318
PRODUCT_NAME = BasicExample;
319+
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
317320
SWIFT_VERSION = 5.0;
321+
TARGETED_DEVICE_FAMILY = "1,2";
318322
VERSIONING_SYSTEM = "apple-generic";
319323
};
320324
name = Release;
@@ -380,14 +384,18 @@
380384
);
381385
MTL_ENABLE_DEBUG_INFO = YES;
382386
ONLY_ACTIVE_ARCH = YES;
383-
OTHER_CFLAGS = "$(inherited)";
387+
OTHER_CFLAGS = (
388+
"$(inherited)",
389+
"-DRCT_REMOVE_LEGACY_ARCH=1",
390+
);
384391
OTHER_CPLUSPLUSFLAGS = (
385392
"$(OTHER_CFLAGS)",
386393
"-DFOLLY_NO_CONFIG",
387394
"-DFOLLY_MOBILE=1",
388395
"-DFOLLY_USE_LIBCPP=1",
389396
"-DFOLLY_CFG_NO_COROUTINES=1",
390397
"-DFOLLY_HAVE_CLOCK_GETTIME=1",
398+
"-DRCT_REMOVE_LEGACY_ARCH=1",
391399
);
392400
OTHER_LDFLAGS = (
393401
"$(inherited)",
@@ -396,6 +404,7 @@
396404
REACT_NATIVE_PATH = "${PODS_ROOT}/../../../../node_modules/react-native";
397405
SDKROOT = iphoneos;
398406
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
407+
SWIFT_ENABLE_EXPLICIT_MODULES = NO;
399408
USE_HERMES = true;
400409
};
401410
name = Debug;
@@ -453,21 +462,26 @@
453462
"\"$(inherited)\"",
454463
);
455464
MTL_ENABLE_DEBUG_INFO = NO;
456-
OTHER_CFLAGS = "$(inherited)";
465+
OTHER_CFLAGS = (
466+
"$(inherited)",
467+
"-DRCT_REMOVE_LEGACY_ARCH=1",
468+
);
457469
OTHER_CPLUSPLUSFLAGS = (
458470
"$(OTHER_CFLAGS)",
459471
"-DFOLLY_NO_CONFIG",
460472
"-DFOLLY_MOBILE=1",
461473
"-DFOLLY_USE_LIBCPP=1",
462474
"-DFOLLY_CFG_NO_COROUTINES=1",
463475
"-DFOLLY_HAVE_CLOCK_GETTIME=1",
476+
"-DRCT_REMOVE_LEGACY_ARCH=1",
464477
);
465478
OTHER_LDFLAGS = (
466479
"$(inherited)",
467480
" ",
468481
);
469482
REACT_NATIVE_PATH = "${PODS_ROOT}/../../../../node_modules/react-native";
470483
SDKROOT = iphoneos;
484+
SWIFT_ENABLE_EXPLICIT_MODULES = NO;
471485
USE_HERMES = true;
472486
VALIDATE_PRODUCT = YES;
473487
};

apps/basic-example/ios/BasicExample/Info.plist

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,13 @@
4747
<key>UISupportedInterfaceOrientations</key>
4848
<array>
4949
<string>UIInterfaceOrientationPortrait</string>
50+
</array>
51+
<key>UISupportedInterfaceOrientations~ipad</key>
52+
<array>
5053
<string>UIInterfaceOrientationLandscapeLeft</string>
5154
<string>UIInterfaceOrientationLandscapeRight</string>
55+
<string>UIInterfaceOrientationPortrait</string>
56+
<string>UIInterfaceOrientationPortraitUpsideDown</string>
5257
</array>
5358
<key>UIViewControllerBasedStatusBarAppearance</key>
5459
<false/>

0 commit comments

Comments
 (0)