From a378ba7827fd19baf9ccb0695a7237163f293189 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Sat, 17 Sep 2022 00:24:54 +0200 Subject: [PATCH] feat(ios) Xcode 14 compatibility Bitcode is no longer supported, so remove it. The M106 WebRTC version no longer contains bitcode either, but it embeds dSYMs. --- ios/Podfile | 7 ++++++- ios/app/app.xcodeproj/project.pbxproj | 4 ---- ios/fastlane/Fastfile | 1 - ios/scripts/release-sdk-lite.sh | 2 -- ios/scripts/release-sdk.sh | 4 ---- ios/sdk/sdk.xcodeproj/project.pbxproj | 10 ++-------- 6 files changed, 8 insertions(+), 20 deletions(-) diff --git a/ios/Podfile b/ios/Podfile index 0f908fdad..be8dad187 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -72,8 +72,13 @@ post_install do |installer| react_native_post_install(installer) __apply_Xcode_12_5_M1_post_install_workaround(installer) installer.pods_project.targets.each do |target| + # https://github.com/CocoaPods/CocoaPods/issues/11402 + if target.respond_to?(:product_type) and target.product_type == "com.apple.product-type.bundle" + target.build_configurations.each do |config| + config.build_settings['CODE_SIGNING_ALLOWED'] = 'NO' + end + end target.build_configurations.each do |config| - config.build_settings['ENABLE_BITCODE'] = 'YES' config.build_settings['SUPPORTS_MACCATALYST'] = 'NO' config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0' end diff --git a/ios/app/app.xcodeproj/project.pbxproj b/ios/app/app.xcodeproj/project.pbxproj index 6ca576265..5f360423c 100644 --- a/ios/app/app.xcodeproj/project.pbxproj +++ b/ios/app/app.xcodeproj/project.pbxproj @@ -854,7 +854,6 @@ CURRENT_PROJECT_VERSION = 1; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = FC967L3QRG; - ENABLE_BITCODE = NO; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; INFOPLIST_FILE = src/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -885,7 +884,6 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = FC967L3QRG; - ENABLE_BITCODE = YES; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; INFOPLIST_FILE = src/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -1003,7 +1001,6 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - ENABLE_BITCODE = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; @@ -1064,7 +1061,6 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; - ENABLE_BITCODE = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index 338f90849..c077c7702 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -78,7 +78,6 @@ platform :ios do # Actually build the app build_app( scheme: "JitsiMeet", - include_bitcode: true, include_symbols: true, export_xcargs: "-allowProvisioningUpdates" ) diff --git a/ios/scripts/release-sdk-lite.sh b/ios/scripts/release-sdk-lite.sh index f4ac3560d..2379f3371 100755 --- a/ios/scripts/release-sdk-lite.sh +++ b/ios/scripts/release-sdk-lite.sh @@ -35,7 +35,6 @@ xcodebuild archive \ -sdk iphonesimulator \ -destination='generic/platform=iOS Simulator' \ -archivePath ios/sdk/out/ios-simulator \ - ENABLE_BITCODE=NO \ SKIP_INSTALL=NO \ BUILD_LIBRARY_FOR_DISTRIBUTION=YES xcodebuild archive \ @@ -45,7 +44,6 @@ xcodebuild archive \ -sdk iphoneos \ -destination='generic/platform=iOS' \ -archivePath ios/sdk/out/ios-device \ - ENABLE_BITCODE=NO \ SKIP_INSTALL=NO \ BUILD_LIBRARY_FOR_DISTRIBUTION=YES xcodebuild -create-xcframework \ diff --git a/ios/scripts/release-sdk.sh b/ios/scripts/release-sdk.sh index 6b349292f..4689d9c45 100755 --- a/ios/scripts/release-sdk.sh +++ b/ios/scripts/release-sdk.sh @@ -12,8 +12,6 @@ DO_GIT_TAG=${GIT_TAG:-0} echo "Releasing Jitsi Meet SDK ${SDK_VERSION}" -${THIS_DIR}/../../node_modules/react-native-webrtc/tools/downloadBitcode.sh - pushd ${RELEASE_REPO} # Generate podspec file @@ -37,7 +35,6 @@ xcodebuild archive \ -sdk iphonesimulator \ -destination='generic/platform=iOS Simulator' \ -archivePath ios/sdk/out/ios-simulator \ - ENABLE_BITCODE=YES \ SKIP_INSTALL=NO \ BUILD_LIBRARY_FOR_DISTRIBUTION=YES xcodebuild archive \ @@ -47,7 +44,6 @@ xcodebuild archive \ -sdk iphoneos \ -destination='generic/platform=iOS' \ -archivePath ios/sdk/out/ios-device \ - ENABLE_BITCODE=YES \ SKIP_INSTALL=NO \ BUILD_LIBRARY_FOR_DISTRIBUTION=YES xcodebuild -create-xcframework \ diff --git a/ios/sdk/sdk.xcodeproj/project.pbxproj b/ios/sdk/sdk.xcodeproj/project.pbxproj index 1172bcd72..29c195d4c 100644 --- a/ios/sdk/sdk.xcodeproj/project.pbxproj +++ b/ios/sdk/sdk.xcodeproj/project.pbxproj @@ -43,7 +43,7 @@ 4ED4FFF42721B9B90074E620 /* JitsiAudioSession.m in Sources */ = {isa = PBXBuildFile; fileRef = 4ED4FFF22721B9B90074E620 /* JitsiAudioSession.m */; }; 4EEC9630286C73A2008705FA /* JitsiMeetView+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 4EEC962E286C73A2008705FA /* JitsiMeetView+Private.h */; }; 4EEC9631286C73A2008705FA /* JitsiMeetView+Private.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EEC962F286C73A2008705FA /* JitsiMeetView+Private.m */; }; - 6F08DF7D4458EE3CF3F36F6D /* (null) in Frameworks */ = {isa = PBXBuildFile; }; + 6F08DF7D4458EE3CF3F36F6D /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; 9A8EE79C77C17743BB66E8BD /* libPods-JitsiMeetSDKLite.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B46497DE9A95BDF5E312AF48 /* libPods-JitsiMeetSDKLite.a */; }; A4A934E9212F3ADB001E9388 /* Dropbox.m in Sources */ = {isa = PBXBuildFile; fileRef = A4A934E8212F3ADB001E9388 /* Dropbox.m */; }; C6245F5D2053091D0040BE68 /* image-resize@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6245F5B2053091D0040BE68 /* image-resize@2x.png */; }; @@ -206,7 +206,7 @@ files = ( 0BB9AD791F5EC6D7001C08DB /* Intents.framework in Frameworks */, 0BB9AD771F5EC6CE001C08DB /* CallKit.framework in Frameworks */, - 6F08DF7D4458EE3CF3F36F6D /* (null) in Frameworks */, + 6F08DF7D4458EE3CF3F36F6D /* BuildFile in Frameworks */, 3453F4A32680898C4A40E821 /* libPods-JitsiMeetSDK.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -788,7 +788,6 @@ COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_BITCODE = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; @@ -851,7 +850,6 @@ COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_BITCODE = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; @@ -888,7 +886,6 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_BITCODE = NO; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; INFOPLIST_FILE = src/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -918,7 +915,6 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_BITCODE = YES; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; INFOPLIST_FILE = src/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -947,7 +943,6 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_BITCODE = NO; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -982,7 +977,6 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_BITCODE = YES; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)",