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

feat(ios) use Xcode 16 as the new baseline

factor2
Saúl Ibarra Corretgé 8 месяцев назад
Родитель
Сommit
5da69192e3
3 измененных файлов: 2 добавлений и 8 удалений
  1. 2
    2
      .github/workflows/ci.yml
  2. 0
    2
      ios/app/app.xcodeproj/project.pbxproj
  3. 0
    4
      ios/sdk/sdk.xcodeproj/project.pbxproj

+ 2
- 2
.github/workflows/ci.yml Просмотреть файл

81
     strategy:
81
     strategy:
82
       fail-fast: false
82
       fail-fast: false
83
       matrix:
83
       matrix:
84
-        os: [macos-13, macos-14]
84
+        os: [macos-14]
85
     steps:
85
     steps:
86
     - uses: actions/checkout@v4
86
     - uses: actions/checkout@v4
87
     - uses: actions/setup-node@v4
87
     - uses: actions/setup-node@v4
97
       run: |
97
       run: |
98
         uname -a
98
         uname -a
99
         xcode-select -p
99
         xcode-select -p
100
-        sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer
100
+        sudo xcode-select -s /Applications/Xcode_16.0.app/Contents/Developer
101
         xcodebuild -version
101
         xcodebuild -version
102
     - name: setup-cocoapods
102
     - name: setup-cocoapods
103
       uses: maxim-lobanov/setup-cocoapods@v1
103
       uses: maxim-lobanov/setup-cocoapods@v1

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

858
 			baseConfigurationReference = 756FCE06C08D9B947653C98A /* Pods-JitsiMeet.debug.xcconfig */;
858
 			baseConfigurationReference = 756FCE06C08D9B947653C98A /* Pods-JitsiMeet.debug.xcconfig */;
859
 			buildSettings = {
859
 			buildSettings = {
860
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
860
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
861
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
862
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconDebug;
861
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconDebug;
863
 				CODE_SIGN_ENTITLEMENTS = app.entitlements;
862
 				CODE_SIGN_ENTITLEMENTS = app.entitlements;
864
 				CODE_SIGN_IDENTITY = "Apple Development";
863
 				CODE_SIGN_IDENTITY = "Apple Development";
893
 			baseConfigurationReference = 3E0F4ED943C0B12BE77F6B45 /* Pods-JitsiMeet.release.xcconfig */;
892
 			baseConfigurationReference = 3E0F4ED943C0B12BE77F6B45 /* Pods-JitsiMeet.release.xcconfig */;
894
 			buildSettings = {
893
 			buildSettings = {
895
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
894
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
896
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
897
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconRelease;
895
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconRelease;
898
 				CODE_SIGN_ENTITLEMENTS = app.entitlements;
896
 				CODE_SIGN_ENTITLEMENTS = app.entitlements;
899
 				CODE_SIGN_IDENTITY = "Apple Development";
897
 				CODE_SIGN_IDENTITY = "Apple Development";

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

862
 			baseConfigurationReference = 09A78016288AF50ACD28A10D /* Pods-JitsiMeetSDK.debug.xcconfig */;
862
 			baseConfigurationReference = 09A78016288AF50ACD28A10D /* Pods-JitsiMeetSDK.debug.xcconfig */;
863
 			buildSettings = {
863
 			buildSettings = {
864
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
864
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
865
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
866
 				CLANG_ENABLE_MODULES = YES;
865
 				CLANG_ENABLE_MODULES = YES;
867
 				CODE_SIGN_IDENTITY = "";
866
 				CODE_SIGN_IDENTITY = "";
868
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
867
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
899
 			baseConfigurationReference = 891FE43DAD30BC8976683100 /* Pods-JitsiMeetSDK.release.xcconfig */;
898
 			baseConfigurationReference = 891FE43DAD30BC8976683100 /* Pods-JitsiMeetSDK.release.xcconfig */;
900
 			buildSettings = {
899
 			buildSettings = {
901
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
900
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
902
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
903
 				CLANG_ENABLE_MODULES = YES;
901
 				CLANG_ENABLE_MODULES = YES;
904
 				CODE_SIGN_IDENTITY = "";
902
 				CODE_SIGN_IDENTITY = "";
905
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
903
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
935
 			baseConfigurationReference = 8F48C340DE0D91D1012976C5 /* Pods-JitsiMeetSDKLite.debug.xcconfig */;
933
 			baseConfigurationReference = 8F48C340DE0D91D1012976C5 /* Pods-JitsiMeetSDKLite.debug.xcconfig */;
936
 			buildSettings = {
934
 			buildSettings = {
937
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
935
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
938
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
939
 				CLANG_ENABLE_MODULES = YES;
936
 				CLANG_ENABLE_MODULES = YES;
940
 				CODE_SIGN_IDENTITY = "";
937
 				CODE_SIGN_IDENTITY = "";
941
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
938
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
977
 			baseConfigurationReference = 86389F55993FAAF6AEB3FA3E /* Pods-JitsiMeetSDKLite.release.xcconfig */;
974
 			baseConfigurationReference = 86389F55993FAAF6AEB3FA3E /* Pods-JitsiMeetSDKLite.release.xcconfig */;
978
 			buildSettings = {
975
 			buildSettings = {
979
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
976
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
980
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
981
 				CLANG_ENABLE_MODULES = YES;
977
 				CLANG_ENABLE_MODULES = YES;
982
 				CODE_SIGN_IDENTITY = "";
978
 				CODE_SIGN_IDENTITY = "";
983
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
979
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";

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