From 02f38ee2932472bd91fa94f1fbeb1e270ea400d3 Mon Sep 17 00:00:00 2001 From: Sreenadh S <32409698+sree96@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:32:56 +0530 Subject: [PATCH] [INJIMOB-1339] - iOS pipeline fix Signed-off-by: Sreenadh S <32409698+sree96@users.noreply.github.com> --- ios/Inji.xcodeproj/project.pbxproj | 19 +++++++++++++------ ios/Inji/InjiRelease.entitlements | 27 +++++++++++++++++++++++++++ ios/Podfile | 5 +++++ ios/Podfile.lock | 2 +- ios/fastlane/Fastfile | 2 +- 5 files changed, 47 insertions(+), 8 deletions(-) create mode 100644 ios/Inji/InjiRelease.entitlements diff --git a/ios/Inji.xcodeproj/project.pbxproj b/ios/Inji.xcodeproj/project.pbxproj index 0b13659547..946e265f14 100644 --- a/ios/Inji.xcodeproj/project.pbxproj +++ b/ios/Inji.xcodeproj/project.pbxproj @@ -50,6 +50,7 @@ 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = Inji/Images.xcassets; sourceTree = ""; }; 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Inji/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Inji/main.m; sourceTree = ""; }; + 182671E22C11BFD0007B2B46 /* InjiRelease.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = InjiRelease.entitlements; path = Inji/InjiRelease.entitlements; sourceTree = ""; }; 58EEBF8E8E6FB1BC6CAF49B5 /* libPods-Inji.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Inji.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 6C2E3173556A471DD304B334 /* Pods-Inji.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Inji.debug.xcconfig"; path = "Target Support Files/Pods-Inji/Pods-Inji.debug.xcconfig"; sourceTree = ""; }; 7A4D352CD337FB3A3BF06240 /* Pods-Inji.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Inji.release.xcconfig"; path = "Target Support Files/Pods-Inji/Pods-Inji.release.xcconfig"; sourceTree = ""; }; @@ -100,6 +101,7 @@ 13B07FAE1A68108700A75B9A /* Inji */ = { isa = PBXGroup; children = ( + 182671E22C11BFD0007B2B46 /* InjiRelease.entitlements */, BB2F792B24A3F905000567C9 /* Supporting */, 008F07F21AC5B25A0029DE68 /* main.jsbundle */, 13B07FAF1A68108700A75B9A /* AppDelegate.h */, @@ -472,10 +474,11 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Inji/Inji.entitlements; - CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_IDENTITY = "Apple Distribution"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 8; DEVELOPMENT_TEAM = V2ABX7953Z; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = V2ABX7953Z; ENABLE_BITCODE = NO; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -498,6 +501,7 @@ PRODUCT_BUNDLE_IDENTIFIER = io.mosip.inji.wallet.mobileid; PRODUCT_NAME = Inji; PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = ""; SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -512,11 +516,13 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_ENTITLEMENTS = Inji/Inji.entitlements; - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_ENTITLEMENTS = Inji/InjiRelease.entitlements; + CODE_SIGN_IDENTITY = "Apple Distribution"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 8; - DEVELOPMENT_TEAM = V2ABX7953Z; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = V2ABX7953Z; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; INFOPLIST_FILE = Inji/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; @@ -533,7 +539,8 @@ OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE"; PRODUCT_BUNDLE_IDENTIFIER = io.mosip.inji.wallet.mobileid; PRODUCT_NAME = Inji; - PROVISIONING_PROFILE_SPECIFIER = ""; + PROVISIONING_PROFILE_SPECIFIER = "match AppStore io.mosip.inji.wallet.mobileid"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore io.mosip.inji.wallet.mobileid"; SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/ios/Inji/InjiRelease.entitlements b/ios/Inji/InjiRelease.entitlements new file mode 100644 index 0000000000..eca3db956e --- /dev/null +++ b/ios/Inji/InjiRelease.entitlements @@ -0,0 +1,27 @@ + + + + + aps-environment + development + com.apple.developer.applesignin + + Default + + com.apple.developer.icloud-container-identifiers + + iCloud.io.mosip.inji.wallet.mobileid + + com.apple.developer.icloud-services + + CloudDocuments + CloudKit + + com.apple.developer.ubiquity-container-identifiers + + iCloud.io.mosip.inji.wallet.mobileid + + com.apple.developer.ubiquity-kvstore-identifier + $(TeamIdentifierPrefix)$(CFBundleIdentifier) + + \ No newline at end of file diff --git a/ios/Podfile b/ios/Podfile index 00f4c3b4dc..da9b5e71a6 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -78,6 +78,11 @@ target 'Inji' do end end end + installer.pods_project.targets.each do |target| + target.build_configurations.each do |config| + config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)', '_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION'] + end + end # Workaround `Cycle inside FBReactNativeSpec` error for react-native 0.64 # Reference: https://github.com/software-mansion/react-native-screens/issues/842#issuecomment-812543933 diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 0fb915668e..fd678683fb 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1042,6 +1042,6 @@ SPEC CHECKSUMS: Yoga: 065f0b74dba4832d6e328238de46eb72c5de9556 ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb -PODFILE CHECKSUM: ef6fb41f40316f97c32e0b8b38aa320e6f8acf15 +PODFILE CHECKSUM: 44ee7985ac0203f16a6b823b6972530b17704618 COCOAPODS: 1.15.2 diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index e0bcf1b04e..01fd3191f9 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -1,4 +1,4 @@ -xcode_select '/Applications/Xcode_14.2.app' +xcode_select '/Applications/Xcode_15.0.1.app' default_platform(:ios) APP_STORE_CONNECT_TEAM_ID = ENV["APP_STORE_CONNECT_TEAM_ID"]