From c0efea516862c05ca5d569aed28b16dad3a2b938 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Fri, 3 May 2019 15:44:05 +0200 Subject: [PATCH] ios: enable bitcode Time has come. We need to enable bitcode. It's optional for iOS targets, but mandatory for the entire project if there is a watchOS target. Since we have a watchOS target, it's time to enable it. --- ios/Podfile | 2 +- ios/Podfile.lock | 2 +- ios/app/app.xcodeproj/project.pbxproj | 8 ++++---- ios/fastlane/Fastfile | 2 +- ios/sdk/sdk.xcodeproj/project.pbxproj | 8 ++++---- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ios/Podfile b/ios/Podfile index ea215c398..4fc009470 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -59,7 +59,7 @@ end post_install do |installer| installer.pods_project.targets.each do |target| target.build_configurations.each do |config| - config.build_settings['ENABLE_BITCODE'] = 'NO' + config.build_settings['ENABLE_BITCODE'] = 'YES' end end end diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 5a61f7409..ff074dbc1 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -286,6 +286,6 @@ SPEC CHECKSUMS: SDWebImage: 3f3f0c02f09798048c47a5ed0a13f17b063572d8 yoga: 2e571f113e8cbeb0eb752aeebc86c1bfe7a8200c -PODFILE CHECKSUM: 8e6caba6dab554c16a3d89d1fa8b69c70c5452d0 +PODFILE CHECKSUM: 9e6bc935ea7d2974604572cc68938281a88cf35c COCOAPODS: 1.6.1 diff --git a/ios/app/app.xcodeproj/project.pbxproj b/ios/app/app.xcodeproj/project.pbxproj index 6976969b4..9e889679f 100644 --- a/ios/app/app.xcodeproj/project.pbxproj +++ b/ios/app/app.xcodeproj/project.pbxproj @@ -737,7 +737,7 @@ CURRENT_PROJECT_VERSION = 1; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = FC967L3QRG; - ENABLE_BITCODE = NO; + ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "../../node_modules/react-native-webrtc/ios", @@ -773,7 +773,7 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = FC967L3QRG; - ENABLE_BITCODE = NO; + ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "../../node_modules/react-native-webrtc/ios", @@ -828,7 +828,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - ENABLE_BITCODE = NO; + ENABLE_BITCODE = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -887,7 +887,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; - ENABLE_BITCODE = NO; + ENABLE_BITCODE = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index 8479a81b7..d7bff62e2 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -55,7 +55,7 @@ platform :ios do # Actually build the app build_app( scheme: "jitsi-meet", - include_bitcode: false, + include_bitcode: true, include_symbols: true, export_xcargs: "-allowProvisioningUpdates" ) diff --git a/ios/sdk/sdk.xcodeproj/project.pbxproj b/ios/sdk/sdk.xcodeproj/project.pbxproj index 81f1db670..71b8ed420 100644 --- a/ios/sdk/sdk.xcodeproj/project.pbxproj +++ b/ios/sdk/sdk.xcodeproj/project.pbxproj @@ -518,7 +518,7 @@ COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_BITCODE = NO; + ENABLE_BITCODE = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -580,7 +580,7 @@ COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_BITCODE = NO; + ENABLE_BITCODE = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -615,7 +615,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_BITCODE = NO; + ENABLE_BITCODE = YES; INFOPLIST_FILE = src/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -643,7 +643,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_BITCODE = NO; + ENABLE_BITCODE = YES; INFOPLIST_FILE = src/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";