Просмотр исходного кода

ios: support building with Xcode 11

master
Saúl Ibarra Corretgé 6 лет назад
Родитель
Сommit
a6d3b09796
3 измененных файлов: 18 добавлений и 3 удалений
  1. 1
    0
      ios/Podfile
  2. 1
    1
      ios/Podfile.lock
  3. 16
    2
      ios/sdk/sdk.xcodeproj/project.pbxproj

+ 1
- 0
ios/Podfile Просмотреть файл

81
   installer.pods_project.targets.each do |target|
81
   installer.pods_project.targets.each do |target|
82
     target.build_configurations.each do |config|
82
     target.build_configurations.each do |config|
83
       config.build_settings['ENABLE_BITCODE'] = 'YES'
83
       config.build_settings['ENABLE_BITCODE'] = 'YES'
84
+      config.build_settings['SUPPORTS_MACCATALYST'] = 'NO'
84
     end
85
     end
85
   end
86
   end
86
 end
87
 end

+ 1
- 1
ios/Podfile.lock Просмотреть файл

546
   RNWatch: 09738b339eceb66e4d80a2371633ca5fb380fa42
546
   RNWatch: 09738b339eceb66e4d80a2371633ca5fb380fa42
547
   Yoga: d8c572ddec8d05b7dba08e4e5f1924004a177078
547
   Yoga: d8c572ddec8d05b7dba08e4e5f1924004a177078
548
 
548
 
549
-PODFILE CHECKSUM: 5d4de5dc42643ef3864a9100b834caeafd625db7
549
+PODFILE CHECKSUM: 0ac392c47cc78d9db03eea7b58950184336d6cf4
550
 
550
 
551
 COCOAPODS: 1.7.2
551
 COCOAPODS: 1.7.2

+ 16
- 2
ios/sdk/sdk.xcodeproj/project.pbxproj Просмотреть файл

634
 				ENABLE_BITCODE = NO;
634
 				ENABLE_BITCODE = NO;
635
 				INFOPLIST_FILE = src/Info.plist;
635
 				INFOPLIST_FILE = src/Info.plist;
636
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
636
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
637
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
637
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
638
+				LD_RUNPATH_SEARCH_PATHS = (
639
+					"$(inherited)",
640
+					"@executable_path/Frameworks",
641
+					"@loader_path/Frameworks",
642
+				);
638
 				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.JitsiMeetSDK.ios;
643
 				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.JitsiMeetSDK.ios;
639
 				PRODUCT_NAME = "$(TARGET_NAME)";
644
 				PRODUCT_NAME = "$(TARGET_NAME)";
640
 				PROVISIONING_PROFILE_SPECIFIER = "";
645
 				PROVISIONING_PROFILE_SPECIFIER = "";
641
 				SKIP_INSTALL = YES;
646
 				SKIP_INSTALL = YES;
647
+				SUPPORTS_MACCATALYST = NO;
642
 				SWIFT_OBJC_BRIDGING_HEADER = "";
648
 				SWIFT_OBJC_BRIDGING_HEADER = "";
643
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
649
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
644
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
650
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
645
 				SWIFT_VERSION = 5.0;
651
 				SWIFT_VERSION = 5.0;
652
+				TARGETED_DEVICE_FAMILY = "1,2";
646
 			};
653
 			};
647
 			name = Debug;
654
 			name = Debug;
648
 		};
655
 		};
662
 				ENABLE_BITCODE = YES;
669
 				ENABLE_BITCODE = YES;
663
 				INFOPLIST_FILE = src/Info.plist;
670
 				INFOPLIST_FILE = src/Info.plist;
664
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
671
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
665
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
672
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
673
+				LD_RUNPATH_SEARCH_PATHS = (
674
+					"$(inherited)",
675
+					"@executable_path/Frameworks",
676
+					"@loader_path/Frameworks",
677
+				);
666
 				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.JitsiMeetSDK.ios;
678
 				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.JitsiMeetSDK.ios;
667
 				PRODUCT_NAME = "$(TARGET_NAME)";
679
 				PRODUCT_NAME = "$(TARGET_NAME)";
668
 				PROVISIONING_PROFILE_SPECIFIER = "";
680
 				PROVISIONING_PROFILE_SPECIFIER = "";
669
 				SKIP_INSTALL = YES;
681
 				SKIP_INSTALL = YES;
682
+				SUPPORTS_MACCATALYST = NO;
670
 				SWIFT_OBJC_BRIDGING_HEADER = "";
683
 				SWIFT_OBJC_BRIDGING_HEADER = "";
671
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
684
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
672
 				SWIFT_VERSION = 5.0;
685
 				SWIFT_VERSION = 5.0;
686
+				TARGETED_DEVICE_FAMILY = "1,2";
673
 			};
687
 			};
674
 			name = Release;
688
 			name = Release;
675
 		};
689
 		};

Загрузка…
Отмена
Сохранить