From a324f2bac22e96597628e71af51f04893300ac8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Thu, 29 Jun 2023 10:51:58 +0200 Subject: [PATCH] ios: drop pr config references to fix error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Error: ``` There seems to be a mismatch between your provided `export_method` in gym and the selected provisioning profiles. You passed the following options: export_method: app-store Bundle identifier: im.status.ethereum.pr Profile name: match AdHoc im.status.ethereum.pr Profile type: ad-hoc Make sure to either change the `export_method` passed from your Fastfile or CLI or select the correct provisioning profiles by updating your Xcode project or passing the profiles to use by using match or manually via the `export_options` hash ``` Signed-off-by: Jakub SokoĊ‚owski --- fastlane/Appfile | 10 +- fastlane/Fastfile | 5 +- fastlane/Matchfile | 2 +- ios/StatusIm.xcodeproj/project.pbxproj | 131 ------------------------- 4 files changed, 10 insertions(+), 138 deletions(-) diff --git a/fastlane/Appfile b/fastlane/Appfile index f01e56d20d..efb3788a78 100644 --- a/fastlane/Appfile +++ b/fastlane/Appfile @@ -4,11 +4,11 @@ app_identifier('im.status.ethereum') # The bundle identifier of your app apple_id(ENV['FASTLANE_APPLE_ID']) # Your Apple email address itc_team_id('118430139') # iTunes Connect Team ID -for_platform :ios do - for_lane :pr do - app_identifier('im.status.ethereum.pr') - end -end +#for_platform :ios do +# for_lane :pr do +# app_identifier('im.status.ethereum.pr') +# end +#end # Android diff --git a/fastlane/Fastfile b/fastlane/Fastfile index f2d794ccce..bcaddd03f8 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -254,7 +254,10 @@ platform :ios do export_options: { "combileBitcode": true, "uploadBitcode": false, - "ITSAppUsesNonExemptEncryption": false + "ITSAppUsesNonExemptEncryption": false, + provisioningProfiles: { + "im.status.ethereum": "match AdHoc im.status.ethereum" + } } ) diff --git a/fastlane/Matchfile b/fastlane/Matchfile index 0d17f94ad3..3f5f7d2bb2 100644 --- a/fastlane/Matchfile +++ b/fastlane/Matchfile @@ -2,7 +2,7 @@ git_url('git@github.com:status-im/ios-certificates.git') type('development') # The default type, can be: appstore, adhoc, enterprise or development -app_identifier(['im.status.ethereum', 'im.status.ethereum.pr']) +app_identifier(['im.status.ethereum']) username(ENV['FASTLANE_APPLE_ID']) # Your Apple Developer Portal username # For all available options run `fastlane match --help` diff --git a/ios/StatusIm.xcodeproj/project.pbxproj b/ios/StatusIm.xcodeproj/project.pbxproj index e8531250fe..6c1aac1752 100644 --- a/ios/StatusIm.xcodeproj/project.pbxproj +++ b/ios/StatusIm.xcodeproj/project.pbxproj @@ -1088,137 +1088,6 @@ }; name = Release; }; - 3AAD2ADA24A3A60E0075D594 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = C64AC3132D007A4AB8C9F4CB /* Pods-Status-StatusImPR.debug.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)"; - BUNDLE_ID_SUFFIX = .debug; - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_ENTITLEMENTS = StatusImPR/StatusImPR.entitlements; - CODE_SIGN_IDENTITY = "iPhone Distribution"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CODE_SIGN_STYLE = Manual; - CUSTOM_PRODUCT_NAME = "Status Debug"; - DEAD_CODE_STRIPPING = YES; - DEVELOPMENT_TEAM = 8B5X2M6H2Y; - FRAMEWORK_SEARCH_PATHS = ( - "$(PROJECT_DIR)/../modules/react-native-status/ios/RCTStatus", - "$(inherited)", - "$(PROJECT_DIR)/Pods/**", - "$(PROJECT_DIR)", - ); - GCC_PRECOMPILE_PREFIX_HEADER = NO; - GCC_PREFIX_HEADER = ""; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - "COCOAPODS=1", - "$(inherited)", - "SQLITE_HAS_CODEC=1", - ); - HEADER_SEARCH_PATHS = ( - "$(inherited)", - /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../node_modules/react-native/React/**", - "$(SRCROOT)/../node_modules/react-native-camera/ios", - "$(SRCROOT)/../node_modules/react-native-fs/**", - "$(SRCROOT)/../node_modules/react-native-languages/RNLanguages", - "$(SRCROOT)/../modules/react-native-status/ios/RCTStatus/**", - "$(SRCROOT)/../node_modules/react-native-image-resizer/ios/RCTImageResizer", - "$(SRCROOT)/../node_modules/react-native-lottie-splash-screen/ios", - "$(SRCROOT)/../node_modules/react-native-config/ios/**", - "$(SRCROOT)/../node_modules/react-native-webview/ios", - "$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS", - ); - INFOPLIST_FILE = StatusImPR/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; - LD_RUNPATH_SEARCH_PATHS = ( - /usr/lib/swift, - "$(inherited)", - "@executable_path/Frameworks", - ); - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)", - ); - OTHER_LDFLAGS = ( - "$(inherited)", - "-lc++", - "-ObjC", - ); - PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum.pr; - PRODUCT_NAME = "Status PR"; - PROVISIONING_PROFILE_SPECIFIER = "match Development im.status.ethereum.pr"; - SWIFT_OBJC_BRIDGING_HEADER = "StatusIm-Bridging-Header.h"; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = 1; - VALID_ARCHS = arm64; - }; - name = Debug; - }; - 3AAD2ADB24A3A60E0075D594 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 8EB2CA54138E544D35CE8D5D /* Pods-Status-StatusImPR.release.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = "AppIconPR$(BUNDLE_ID_SUFFIX)"; - BUNDLE_ID_SUFFIX = ""; - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_ENTITLEMENTS = StatusImPR/StatusImPR.entitlements; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; - CODE_SIGN_STYLE = Manual; - CUSTOM_PRODUCT_NAME = Status; - DEAD_CODE_STRIPPING = YES; - DEVELOPMENT_TEAM = 8B5X2M6H2Y; - FRAMEWORK_SEARCH_PATHS = ( - "$(PROJECT_DIR)/../modules/react-native-status/ios/RCTStatus", - "$(inherited)", - "$(PROJECT_DIR)/Pods/**", - "$(PROJECT_DIR)", - ); - GCC_PRECOMPILE_PREFIX_HEADER = NO; - GCC_PREFIX_HEADER = ""; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../node_modules/react-native/React/**", - "$(SRCROOT)/../node_modules/react-native-camera/ios", - "$(SRCROOT)/../node_modules/react-native-webview/ios", - "$(SRCROOT)/../node_modules/react-native-fs/**", - "$(SRCROOT)/../node_modules/react-native-languages/RNLanguages", - "$(SRCROOT)/../modules/react-native-status/ios/RCTStatus/**", - "$(SRCROOT)/../node_modules/react-native-image-resizer/ios/RCTImageResizer", - "$(SRCROOT)/../node_modules/react-native-lottie-splash-screen/ios", - "$(SRCROOT)/../node_modules/react-native-config/ios/**", - "$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS", - ); - INFOPLIST_FILE = StatusImPR/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; - LD_RUNPATH_SEARCH_PATHS = ( - /usr/lib/swift, - "$(inherited)", - "@executable_path/Frameworks", - ); - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)", - ); - OTHER_LDFLAGS = ( - "$(inherited)", - "-lc++", - "-ObjC", - ); - PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum.pr; - PRODUCT_NAME = "Status PR"; - PROVISIONING_PROFILE_SPECIFIER = "match AdHoc im.status.ethereum.pr"; - SWIFT_OBJC_BRIDGING_HEADER = "StatusIm-Bridging-Header.h"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = 1; - VALID_ARCHS = arm64; - }; - name = Release; - }; 83CBBA201A601CBA00E9B192 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = {