From 50b7040d4d21a39de3485237cc17e9b38ef92906 Mon Sep 17 00:00:00 2001 From: Georgy Date: Tue, 20 Feb 2024 10:48:36 +0200 Subject: [PATCH] Revert "Support RN 73 (#7844)" This reverts commit 0be34f9f548a44d7f9bbeb2c1d0c033d8a5553d7. --- .buildkite/pipeline.yml | 61 +++++++++++++++++++ .nvmrc | 2 +- ReactNativeNavigation.podspec | 10 +-- lib/android/app/build.gradle | 24 ++++---- .../stack/topbar/button/ButtonPresenter.kt | 4 +- .../EnvironmentTest.java | 4 +- .../TestApplication.java | 3 +- lib/ios/RNNAppDelegate.mm | 3 +- lib/ios/RNNReactView.h | 4 +- lib/ios/{RNNReactView.mm => RNNReactView.m} | 10 ++- metro.config.js | 4 -- package.json | 12 ++-- playground/android/app/build.gradle | 6 +- .../playground/FragmentComponent.java | 1 - playground/android/build.gradle | 18 ++---- .../gradle/wrapper/gradle-wrapper.properties | 2 +- playground/ios/Podfile | 24 +++++--- .../ios/playground.xcodeproj/project.pbxproj | 52 +++++++--------- 18 files changed, 136 insertions(+), 108 deletions(-) create mode 100644 .buildkite/pipeline.yml rename lib/ios/{RNNReactView.mm => RNNReactView.m} (91%) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml new file mode 100644 index 00000000000..c263b57f966 --- /dev/null +++ b/.buildkite/pipeline.yml @@ -0,0 +1,61 @@ +steps: + - block: ":rocket: Release!" + prompt: "Fill out the details for release" + if: 'build.message =~ /^release\$/i' + fields: + - text: "VERSION" + key: "version" + - text: "NPM_TAG" + key: "npm-tag" + default: 'null' + required: false + - text: "BUILD_DOCUMENTATION_VERSION" + key: "build-documentation-version" + default: 'null' + hint: 'Leave NULL if no version is specified' + - text: "REMOVE_DOCUMENTATION_VERSION" + key: "remove-documentation-version" + default: 'null' + hint: 'Leave NULL if no version is specified' + + - label: ":android: Android" + command: + - "nvm install" + - "npm install" + - "npm run test-js" + - "npm run test-unit-android -- --release" + - "npm run test-e2e-android-multi -- --release --headless --verbose --ci" + key: "android_build" + timeout_in_minutes: 90 + artifact_paths: "/Users/builder/work/artifacts/**/*" + + - label: ":ios: iOS - Unit" + command: + - "nvm install" + - "npm install" + - "npm run test-unit-ios -- --release" + key: "ios_unit" + timeout_in_minutes: 90 + + - label: ":ios: iOS - E2E" + command: + - "nvm install" + - "npm install" + - "npm run test-snapshot-ios -- --release" + - "npm run test-e2e-ios -- --release --multi --ci" + key: "ios_e2e" + timeout_in_minutes: 90 + artifact_paths: "/Users/builder/work/artifacts/**/*" + + - label: ":package: Publish" + env: + if: "build.pull_request.id == null" + command: + - "nvm install" + - "npm install" + - "npm run release" + depends_on: + - "android_build" + - "ios_unit" + - "ios_e2e" + timeout_in_minutes: 90 diff --git a/.nvmrc b/.nvmrc index 209e3ef4b62..b6a7d89c68e 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -20 +16 diff --git a/ReactNativeNavigation.podspec b/ReactNativeNavigation.podspec index d52e2e7b735..6778a6ebab2 100644 --- a/ReactNativeNavigation.podspec +++ b/ReactNativeNavigation.podspec @@ -16,7 +16,7 @@ Pod::Spec.new do |s| s.module_name = 'ReactNativeNavigation' s.default_subspec = 'Core' - + s.subspec 'Core' do |ss| s.source = { :git => "https://github.com/wix/react-native-navigation.git", :tag => "#{s.version}" } s.source_files = 'lib/ios/**/*.{h,m,mm,cpp}' @@ -24,17 +24,12 @@ Pod::Spec.new do |s| end if fabric_enabled - install_modules_dependencies(s) - folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' fabric_flags = fabric_enabled ? '-DRCT_NEW_ARCH_ENABLED' : '' - s.pod_target_xcconfig = { - 'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/boost" "$(PODS_ROOT)/boost-for-react-native" "$(PODS_ROOT)/RCT-Folly" "$(PODS_ROOT)/Headers/Private/React-Core" "$(PODS_ROOT)/Headers/Private/Yoga"', + 'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/boost" "$(PODS_ROOT)/boost-for-react-native" "$(PODS_ROOT)/RCT-Folly" "$(PODS_ROOT)/Headers/Private/React-Core"', "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1", } - s.compiler_flags = folly_compiler_flags + ' ' + '-DRCT_NEW_ARCH_ENABLED' s.requires_arc = true @@ -50,7 +45,6 @@ Pod::Spec.new do |s| s.dependency "React-runtimeexecutor" s.dependency "React-rncore" end - s.dependency 'React-Core' s.dependency 'React-CoreModules' s.dependency 'React-RCTImage' diff --git a/lib/android/app/build.gradle b/lib/android/app/build.gradle index 524e3f2e98a..9d5a0fd2edd 100644 --- a/lib/android/app/build.gradle +++ b/lib/android/app/build.gradle @@ -12,9 +12,9 @@ def safeExtGetFallbackLowerBound(prop, fallback) { Math.max(safeExtGet(prop,fallback),fallback) } -def DEFAULT_COMPILE_SDK_VERSION = 34 +def DEFAULT_COMPILE_SDK_VERSION = 33 def DEFAULT_MIN_SDK_VERSION = 21 -def DEFAULT_TARGET_SDK_VERSION = 34 +def DEFAULT_TARGET_SDK_VERSION = 33 def DEFAULT_KOTLIN_VERSION = "1.5.31" def DEFAULT_KOTLIN_STDLIB = 'kotlin-stdlib-jdk8' def kotlinVersion = safeExtGet("RNNKotlinVersion", DEFAULT_KOTLIN_VERSION) @@ -22,7 +22,7 @@ def kotlinStdlib = safeExtGet('RNNKotlinStdlib',DEFAULT_KOTLIN_STDLIB ) def kotlinCoroutinesCore = safeExtGet('RNNKotlinCoroutinesCore', '1.5.2') android { compileSdkVersion safeExtGetFallbackLowerBound('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION) - buildToolsVersion = "34.0.0" + buildToolsVersion = "33.0.0" defaultConfig { minSdkVersion safeExtGetFallbackLowerBound('minSdkVersion', DEFAULT_MIN_SDK_VERSION) targetSdkVersion safeExtGetFallbackLowerBound('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION) @@ -56,17 +56,17 @@ android { def repeatLength = output.length() println '\n\n' + ('-' * repeatLength) + '\n' + output + '\n' + ('-' * repeatLength) + '\n' - println "see report at file://${t.reports.html.outputLocation}/index.html" + println "see report at file://${t.reports.html.destination}/index.html" } } } } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } kotlinOptions { - jvmTarget = JavaVersion.VERSION_17 + jvmTarget = JavaVersion.VERSION_1_8 } flavorDimensions "RNN.reactNativeVersion" @@ -172,14 +172,14 @@ List reactNativeVersionComponents(rnPackageJsonFile) { dependencies { - implementation "androidx.core:core-ktx:1.6.1" + implementation "androidx.core:core-ktx:1.6.0" implementation "org.jetbrains.kotlin:$kotlinStdlib:$kotlinVersion" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinCoroutinesCore" - implementation "androidx.constraintlayout:constraintlayout:2.1.4" + implementation "androidx.constraintlayout:constraintlayout:2.0.4" - implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'androidx.annotation:annotation:1.7.1' - implementation 'com.google.android.material:material:1.11.0' + implementation 'androidx.appcompat:appcompat:1.3.1' + implementation 'androidx.annotation:annotation:1.2.0' + implementation 'com.google.android.material:material:1.2.0-alpha03' implementation 'com.github.wix-playground:ahbottomnavigation:3.3.0' // implementation project(':AHBottomNavigation') diff --git a/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/button/ButtonPresenter.kt b/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/button/ButtonPresenter.kt index dbe077468fd..93b3b8e5690 100644 --- a/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/button/ButtonPresenter.kt +++ b/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/button/ButtonPresenter.kt @@ -194,8 +194,8 @@ open class ButtonPresenter(private val context: Context, private val button: But class WixAccessibilityDelegateCompat: AccessibilityDelegateCompat(){ override fun onInitializeAccessibilityNodeInfo( - host: View, - info: AccessibilityNodeInfoCompat + host: View?, + info: AccessibilityNodeInfoCompat? ) { super.onInitializeAccessibilityNodeInfo(host, info) diff --git a/lib/android/app/src/test/java/com/reactnativenavigation/EnvironmentTest.java b/lib/android/app/src/test/java/com/reactnativenavigation/EnvironmentTest.java index 95f35e78d1e..ec919def461 100644 --- a/lib/android/app/src/test/java/com/reactnativenavigation/EnvironmentTest.java +++ b/lib/android/app/src/test/java/com/reactnativenavigation/EnvironmentTest.java @@ -10,8 +10,6 @@ import static org.assertj.core.api.Java6Assertions.*; -import com.reactnativenavigation.R; - public class EnvironmentTest extends BaseTest { @Test public void assertJ() { @@ -35,7 +33,7 @@ public void supportDesign() { @Test public void androidR() { - assertThat(com.google.android.material.R.string.bottom_sheet_behavior).isNotZero(); + assertThat(R.string.bottom_sheet_behavior).isNotZero(); } @Test diff --git a/lib/android/app/src/test/java/com/reactnativenavigation/TestApplication.java b/lib/android/app/src/test/java/com/reactnativenavigation/TestApplication.java index b8381dab3bb..23cf871fc9f 100644 --- a/lib/android/app/src/test/java/com/reactnativenavigation/TestApplication.java +++ b/lib/android/app/src/test/java/com/reactnativenavigation/TestApplication.java @@ -9,7 +9,6 @@ import java.util.Collections; import java.util.List; - public class TestApplication extends Application implements ReactApplication { private final ReactNativeHost host = new ReactNativeHost(this) { @Override @@ -26,7 +25,7 @@ protected List getPackages() { @Override public void onCreate() { super.onCreate(); - setTheme(androidx.appcompat.R.style.Theme_AppCompat); + setTheme(R.style.Theme_AppCompat); } @Override diff --git a/lib/ios/RNNAppDelegate.mm b/lib/ios/RNNAppDelegate.mm index d74a8613a03..fcccf9410f9 100644 --- a/lib/ios/RNNAppDelegate.mm +++ b/lib/ios/RNNAppDelegate.mm @@ -6,9 +6,10 @@ #import "RCTLegacyInteropComponents.h" #import #import +#import #import +#import #import -#import #import #import #import diff --git a/lib/ios/RNNReactView.h b/lib/ios/RNNReactView.h index 9856c69c0ee..62850dcee0c 100644 --- a/lib/ios/RNNReactView.h +++ b/lib/ios/RNNReactView.h @@ -1,5 +1,5 @@ #ifdef RCT_NEW_ARCH_ENABLED -#import +#import #else #import #endif @@ -32,7 +32,7 @@ typedef void (^RNNReactViewReadyCompletionBlock)(void); #ifdef RCT_NEW_ARCH_ENABLED @interface RNNReactView - : RCTSurfaceHostingProxyRootView + : RCTFabricSurfaceHostingProxyRootView #else @interface RNNReactView : RCTRootView #endif diff --git a/lib/ios/RNNReactView.mm b/lib/ios/RNNReactView.m similarity index 91% rename from lib/ios/RNNReactView.mm rename to lib/ios/RNNReactView.m index 22129f9af83..fec6fc6299d 100644 --- a/lib/ios/RNNReactView.mm +++ b/lib/ios/RNNReactView.m @@ -1,10 +1,6 @@ #import "RNNReactView.h" #import -#ifdef RCT_NEW_ARCH_ENABLED -#import -#endif - @implementation RNNReactView { BOOL _isAppeared; } @@ -15,8 +11,10 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge eventEmitter:(RNNEventEmitter *)eventEmitter sizeMeasureMode:(RCTSurfaceSizeMeasureMode)sizeMeasureMode reactViewReadyBlock:(RNNReactViewReadyCompletionBlock)reactViewReadyBlock { - RCTFabricSurface *surface = [[RCTFabricSurface alloc] initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties]; - self = [super initWithSurface:surface sizeMeasureMode:sizeMeasureMode]; + self = [super initWithBridge:bridge + moduleName:moduleName + initialProperties:initialProperties + sizeMeasureMode:sizeMeasureMode]; #else - (instancetype)initWithBridge:(RCTBridge *)bridge moduleName:(NSString *)moduleName diff --git a/metro.config.js b/metro.config.js index 53c45a82be7..d6f79a8a4ba 100644 --- a/metro.config.js +++ b/metro.config.js @@ -1,11 +1,7 @@ -const path = require('node:path'); const { getDefaultConfig, mergeConfig } = require('@react-native/metro-config'); const config = { projectRoot: `${__dirname}`, - resolver: { - enableGlobalPackages: true, - }, watchFolders: [__dirname], }; diff --git a/package.json b/package.json index 22436ec5a50..1a209bf2fdf 100644 --- a/package.json +++ b/package.json @@ -76,16 +76,14 @@ "@babel/plugin-proposal-export-namespace-from": "7.10.1", "@babel/runtime": "7.22.6", "@babel/types": "7.22.5", - "@babel/preset-env": "^7.22.9", - "@react-native/metro-config": "^0.73.2", - "@react-native/babel-preset": "^0.73.18", - "@react-native/typescript-config": "^0.73.1", + "@react-native/metro-config": "^0.73.0", "@react-native-community/blur": "^3.6.0", "@react-native-community/datetimepicker": "^3.4.7", "@react-native-community/eslint-config": "2.0.0", "@react-native-community/netinfo": "^5.9.4", "@testing-library/jest-native": "^5.4.2", "@testing-library/react-native": "^12.0.1", + "@types/detox": "17.14.3", "@types/hoist-non-react-statics": "^3.0.1", "@types/jasmine": "3.5.10", "@types/jest": "27.0.2", @@ -97,7 +95,7 @@ "@typescript-eslint/parser": "4.33.0", "babel-jest": "^27.0.0", "clang-format": "^1.4.0", - "detox": "20.18.1", + "detox": "20.9.0", "detox-testing-library-rnn-adapter": "^2.0.3", "eslint": "7.32.0", "eslint-config-prettier": "6.11.0", @@ -112,10 +110,10 @@ "pngjs": "^6.0.0", "prettier": "2.1.2", "react": "18.2.0", - "react-native": "0.73.3", + "react-native": "0.72.3", "react-native-fast-image": "^8.6.3", "react-native-gesture-handler": "^2.10.1", - "react-native-reanimated": "3.6.2", + "react-native-reanimated": "3.4.1", "react-native-ui-lib": "7.3.6", "react-redux": "5.x.x", "react-test-renderer": "18.2.0", diff --git a/playground/android/app/build.gradle b/playground/android/app/build.gradle index 8624bb3cc60..5fde867133d 100644 --- a/playground/android/app/build.gradle +++ b/playground/android/app/build.gradle @@ -13,11 +13,9 @@ def jscFlavor = 'org.webkit:android-jsc:+' android { compileSdkVersion rootProject.ext.get("compileSdkVersion") - namespace "com.reactnativenavigation.playground" - compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } defaultConfig { diff --git a/playground/android/app/src/main/java/com/reactnativenavigation/playground/FragmentComponent.java b/playground/android/app/src/main/java/com/reactnativenavigation/playground/FragmentComponent.java index 910f40dd76a..f8ccd359a88 100644 --- a/playground/android/app/src/main/java/com/reactnativenavigation/playground/FragmentComponent.java +++ b/playground/android/app/src/main/java/com/reactnativenavigation/playground/FragmentComponent.java @@ -10,7 +10,6 @@ import androidx.annotation.NonNull; import androidx.fragment.app.FragmentActivity; -import com.reactnativenavigation.R; public class FragmentComponent implements ExternalComponent { private final FrameLayout content; diff --git a/playground/android/build.gradle b/playground/android/build.gradle index 809412b1917..f6d60a1e3ce 100644 --- a/playground/android/build.gradle +++ b/playground/android/build.gradle @@ -2,13 +2,13 @@ buildscript { ext { - kotlinVersion = "1.8.10" + kotlinVersion = "1.7.10" RNNKotlinVersion = kotlinVersion detoxKotlinVersion = kotlinVersion - compileSdkVersion = 34 - buildToolsVersion = "34.0.0" + compileSdkVersion = 33 + buildToolsVersion = "33.0.0" minSdkVersion = 21 - targetSdkVersion = 34 + targetSdkVersion = 33 // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP. ndkVersion = "23.1.7779620" } @@ -36,13 +36,3 @@ allprojects { } } } - -subprojects { - afterEvaluate { p -> - if (p.hasProperty('android')) { - android { - buildToolsVersion rootProject.ext.buildToolsVersion - } - } - } -} diff --git a/playground/android/gradle/wrapper/gradle-wrapper.properties b/playground/android/gradle/wrapper/gradle-wrapper.properties index 5fe713fe642..5a14d36da82 100644 --- a/playground/android/gradle/wrapper/gradle-wrapper.properties +++ b/playground/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Thu Jul 28 13:48:47 IDT 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/playground/ios/Podfile b/playground/ios/Podfile index 27fd6a510df..721a970e31e 100644 --- a/playground/ios/Podfile +++ b/playground/ios/Podfile @@ -16,11 +16,11 @@ if linkage != nil end -def all_pods +def all_pods config = use_native_modules! - + flags = get_default_flags() - + use_react_native!( :path => "../../node_modules/react-native", :hermes_enabled => flags[:hermes_enabled], @@ -29,17 +29,21 @@ def all_pods # An absolute path to your application root. :app_path => "#{Pod::Config.instance.installation_root}/../.." ) - + pod 'ReactNativeNavigation', :path => '../../' pod 'HMSegmentedControl' end post_install do |installer| - react_native_post_install( - installer, - "../../node_modules/react-native", - :mac_catalyst_enabled => false - ) + react_native_post_install(installer, "../../node_modules/react-native", :mac_catalyst_enabled => false) + __apply_Xcode_12_5_M1_post_install_workaround(installer) + + # This is to resolve "'shared_timed_mutex' is unavailable: introduced in iOS 10.0" error + installer.pods_project.targets.each do |t| + t.build_configurations.each do |config| + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.4' + end + end end target 'playground' do @@ -59,4 +63,4 @@ end target 'SnapshotTests' do all_pods pod 'OCMock' -end +end \ No newline at end of file diff --git a/playground/ios/playground.xcodeproj/project.pbxproj b/playground/ios/playground.xcodeproj/project.pbxproj index 3b0d52c11dc..950d56d75cd 100644 --- a/playground/ios/playground.xcodeproj/project.pbxproj +++ b/playground/ios/playground.xcodeproj/project.pbxproj @@ -164,8 +164,6 @@ 50CF233C240695B10098042D /* RNNBottomTabsController+Helpers.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "RNNBottomTabsController+Helpers.m"; sourceTree = ""; }; 50E4888A2427DA4800B11A8E /* StackOptionsTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = StackOptionsTest.m; sourceTree = ""; }; 50FDEFBB258F5C5D008C9C3C /* RNNSearchBarOptionsTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNSearchBarOptionsTest.m; sourceTree = ""; }; - 60BCFCC02B7F812F00FCDB38 /* libLLVM.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libLLVM.dylib; path = usr/lib/libLLVM.dylib; sourceTree = SDKROOT; }; - 60BCFCCA2B7F817400FCDB38 /* libReactNativeNavigation.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libReactNativeNavigation.a; sourceTree = BUILT_PRODUCTS_DIR; }; 7F8E255E2E08F6ECE7DF6FE3 /* Pods-playground.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-playground.release.xcconfig"; path = "Target Support Files/Pods-playground/Pods-playground.release.xcconfig"; sourceTree = ""; }; 9F9A3A9525260DA900AAAF37 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = ""; }; B484A10A046B0046B98A76B5 /* Pods-playground.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-playground.debug.xcconfig"; path = "Target Support Files/Pods-playground/Pods-playground.debug.xcconfig"; sourceTree = ""; }; @@ -377,8 +375,6 @@ E504607E227748E900212BD8 /* Frameworks */ = { isa = PBXGroup; children = ( - 60BCFCCA2B7F817400FCDB38 /* libReactNativeNavigation.a */, - 60BCFCC02B7F812F00FCDB38 /* libLLVM.dylib */, 50364D6B238E7F0A000E62A2 /* ReactNativeNavigation.framework */, E504607F227748EA00212BD8 /* JavaScriptCore.framework */, C10F72071A488F801E1F1116 /* libPods-NavigationIOS12Tests.a */, @@ -557,6 +553,7 @@ ORGANIZATIONNAME = Wix; TargetAttributes = { 13B07F861A680F5B00A75B9A = { + DevelopmentTeam = XPHGA2FMQQ; LastSwiftMigration = 1400; ProvisioningStyle = Automatic; }; @@ -702,11 +699,11 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-playground/Pods-playground-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -788,11 +785,11 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-NavigationTests/Pods-NavigationTests-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -830,11 +827,11 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-SnapshotTests/Pods-SnapshotTests-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -894,11 +891,11 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-NavigationIOS12Tests/Pods-NavigationIOS12Tests-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -1032,10 +1029,9 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; DEAD_CODE_STRIPPING = YES; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = XPHGA2FMQQ; ENABLE_BITCODE = NO; EXCLUDED_ARCHS = ""; - GCC_C_LANGUAGE_STANDARD = c17; HEADER_SEARCH_PATHS = ( "$(inherited)", "\"${PODS_ROOT}/Headers/Public\"", @@ -1106,6 +1102,7 @@ "\"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImageWebPCoder\"", "\"${PODS_CONFIGURATION_BUILD_DIR}/SocketRocket\"", "\"${PODS_CONFIGURATION_BUILD_DIR}/Yoga\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/YogaKit\"", "\"${PODS_CONFIGURATION_BUILD_DIR}/fmt\"", "\"${PODS_CONFIGURATION_BUILD_DIR}/glog\"", "\"${PODS_CONFIGURATION_BUILD_DIR}/libevent\"", @@ -1115,6 +1112,7 @@ ); OTHER_CFLAGS = ( "$(inherited)", + "-fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/YogaKit/YogaKit.modulemap\"", "-fmodule-map-file=\"${PODS_ROOT}/Headers/Public/FlipperKit/FlipperKit.modulemap\"", "-fmodule-map-file=\"${PODS_ROOT}/Headers/Public/RCTTypeSafety/RCTTypeSafety.modulemap\"", "-fmodule-map-file=\"${PODS_ROOT}/Headers/Public/React/React-Core.modulemap\"", @@ -1136,7 +1134,7 @@ OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", - "-lc++", + "-l\"c++\"", ); PRODUCT_BUNDLE_IDENTIFIER = com.rnn.playground; PRODUCT_NAME = playground; @@ -1157,10 +1155,9 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = XPHGA2FMQQ; ENABLE_BITCODE = NO; EXCLUDED_ARCHS = ""; - GCC_C_LANGUAGE_STANDARD = c17; HEADER_SEARCH_PATHS = ( "$(inherited)", "\"${PODS_ROOT}/Headers/Public\"", @@ -1224,6 +1221,7 @@ "\"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImageWebPCoder\"", "\"${PODS_CONFIGURATION_BUILD_DIR}/SocketRocket\"", "\"${PODS_CONFIGURATION_BUILD_DIR}/Yoga\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/YogaKit\"", "\"${PODS_CONFIGURATION_BUILD_DIR}/fmt\"", "\"${PODS_CONFIGURATION_BUILD_DIR}/glog\"", "\"${PODS_CONFIGURATION_BUILD_DIR}/libevent\"", @@ -1234,7 +1232,7 @@ OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", - "-lc++", + "-l\"c++\"", ); PRODUCT_BUNDLE_IDENTIFIER = com.rnn.playground; PRODUCT_NAME = playground; @@ -1326,6 +1324,7 @@ "\"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImageWebPCoder\"", "\"${PODS_CONFIGURATION_BUILD_DIR}/SocketRocket\"", "\"${PODS_CONFIGURATION_BUILD_DIR}/Yoga\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/YogaKit\"", "\"${PODS_CONFIGURATION_BUILD_DIR}/fmt\"", "\"${PODS_CONFIGURATION_BUILD_DIR}/glog\"", "\"${PODS_CONFIGURATION_BUILD_DIR}/libevent\"", @@ -1420,6 +1419,7 @@ "\"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImageWebPCoder\"", "\"${PODS_CONFIGURATION_BUILD_DIR}/SocketRocket\"", "\"${PODS_CONFIGURATION_BUILD_DIR}/Yoga\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/YogaKit\"", "\"${PODS_CONFIGURATION_BUILD_DIR}/fmt\"", "\"${PODS_CONFIGURATION_BUILD_DIR}/glog\"", "\"${PODS_CONFIGURATION_BUILD_DIR}/libevent\"", @@ -1440,7 +1440,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; - CLANG_CXX_LANGUAGE_STANDARD = "c++20"; + CLANG_CXX_LANGUAGE_STANDARD = "c++17"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; @@ -1494,13 +1494,9 @@ "$(inherited)", "-DRN_FABRIC_ENABLED", ); - OTHER_LDFLAGS = ( - "-Wl", - "-ld_classic", - ); + OTHER_LDFLAGS = ""; REACT_NATIVE_PATH = "${PODS_ROOT}/../../../node_modules/react-native"; SDKROOT = iphoneos; - USE_HERMES = true; }; name = Debug; }; @@ -1509,7 +1505,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; - CLANG_CXX_LANGUAGE_STANDARD = "c++20"; + CLANG_CXX_LANGUAGE_STANDARD = "c++17"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; @@ -1555,13 +1551,9 @@ "$(inherited)", "-DRN_FABRIC_ENABLED", ); - OTHER_LDFLAGS = ( - "-Wl", - "-ld_classic", - ); + OTHER_LDFLAGS = ""; REACT_NATIVE_PATH = "${PODS_ROOT}/../../../node_modules/react-native"; SDKROOT = iphoneos; - USE_HERMES = true; VALIDATE_PRODUCT = YES; }; name = Release;