Selaa lähdekoodia

fix(ios) rework RN build workaround

This is what upstream RN does now.
factor2
Saúl Ibarra Corretgé 3 vuotta sitten
vanhempi
commit
a2155aad7f
3 muutettua tiedostoa jossa 6 lisäystä ja 8 poistoa
  1. 3
    7
      ios/Podfile
  2. 1
    1
      ios/Podfile.lock
  3. 2
    0
      ios/sdk/sdk.xcodeproj/project.pbxproj

+ 3
- 7
ios/Podfile Näytä tiedosto

@@ -41,12 +41,8 @@ post_install do |installer|
41 41
       config.build_settings['SUPPORTS_MACCATALYST'] = 'NO'
42 42
       config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0'
43 43
     end
44
-    # https://github.com/facebook/react-native/issues/32351#issuecomment-939157955
45
-    case target.name
46
-    when 'RCT-Folly'
47
-      target.build_configurations.each do |config|
48
-        config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '9.0'
49
-      end
50
-    end
51 44
   end
45
+  # https://github.com/facebook/react-native/blob/d7f748a944a9a9324e485ccbe214098e6c8645fc/scripts/react_native_pods.rb#L630
46
+  time_header = "#{Pod::Config.instance.installation_root.to_s}/Pods/RCT-Folly/folly/portability/Time.h"
47
+  `sed -i -e  $'s/ && (__IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_10_0)//' #{time_header}`
52 48
 end

+ 1
- 1
ios/Podfile.lock Näytä tiedosto

@@ -712,6 +712,6 @@ SPEC CHECKSUMS:
712 712
   RNWatch: 99637948ec9b5c9ec5a41920642594ad5ba07e80
713 713
   Yoga: e7dc4e71caba6472ff48ad7d234389b91dadc280
714 714
 
715
-PODFILE CHECKSUM: 93620e428bb16cc7fb8fd7314c0402e26929b5bf
715
+PODFILE CHECKSUM: d2617e38cab565a58af9b0f39cbea50d8af048c0
716 716
 
717 717
 COCOAPODS: 1.11.2

+ 2
- 0
ios/sdk/sdk.xcodeproj/project.pbxproj Näytä tiedosto

@@ -615,6 +615,7 @@
615 615
 				DYLIB_CURRENT_VERSION = 1;
616 616
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
617 617
 				ENABLE_BITCODE = NO;
618
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
618 619
 				INFOPLIST_FILE = src/Info.plist;
619 620
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
620 621
 				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.JitsiMeetSDK.ios;
@@ -642,6 +643,7 @@
642 643
 				DYLIB_CURRENT_VERSION = 1;
643 644
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
644 645
 				ENABLE_BITCODE = YES;
646
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
645 647
 				INFOPLIST_FILE = src/Info.plist;
646 648
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
647 649
 				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.JitsiMeetSDK.ios;

Loading…
Peruuta
Tallenna