Compare commits

...
Sign in to create a new pull request.

1 commit

Author SHA1 Message Date
692412fe67 [ios] Automatically manage signing for AppStore
Signed-off-by: Roman Tsisyk <roman@tsisyk.com>
2024-12-28 22:12:34 +00:00
5 changed files with 49 additions and 30 deletions

View file

@ -359,7 +359,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.mapswithme.Chart;
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.chart;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
};
@ -380,7 +380,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.mapswithme.Chart;
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.chart;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
};

View file

@ -768,6 +768,7 @@
);
MACH_O_TYPE = staticlib;
MODULEMAP_FILE = CoreApi.modulemap;
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.coreapi;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES;

View file

@ -251,7 +251,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.mapswithme.DatePicker;
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.datepicker;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
};
@ -271,7 +271,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.mapswithme.DatePicker;
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.datepicker;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
};

View file

@ -5127,8 +5127,8 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = "OMaps-Release.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 0;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 9Z6432XD7L;
@ -5140,7 +5140,7 @@
MARKETING_VERSION = 2022.11.17;
OTHER_SWIFT_FLAGS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps;
PROVISIONING_PROFILE_SPECIFIER = "CarPlay Release";
PROVISIONING_PROFILE_SPECIFIER = "";
};
name = Release;
};
@ -5149,11 +5149,11 @@
baseConfigurationReference = 347526FA1DC0B00F00918CF5 /* common-debug.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 9Z6432XD7L;
"DEVELOPMENT_TEAM[sdk=macosx*]" = 9Z6432XD7L;
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.debug.tests;
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = 9Z6432XD7L;
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.tests;
PROVISIONING_PROFILE_SPECIFIER = "";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Organic Maps (Debug).app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Organic Maps (Debug)";
};
@ -5164,10 +5164,11 @@
baseConfigurationReference = 347526FB1DC0B00F00918CF5 /* common-release.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Manual;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 9Z6432XD7L;
"DEVELOPMENT_TEAM[sdk=macosx*]" = 9Z6432XD7L;
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.release.tests;
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = 9Z6432XD7L;
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.tests;
PROVISIONING_PROFILE_SPECIFIER = "";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Organic Maps (Debug).app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Organic Maps (Debug)";
};
@ -5208,11 +5209,11 @@
ED46DDE42D098A0C007CACD6 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Manual;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 9Z6432XD7L;
DEVELOPMENT_TEAM = 9Z6432XD7L;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = OMapsWidgetExtension/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = OMapsWidgetExtension;
@ -5227,7 +5228,6 @@
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.widgetextension;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "WidgetExtension Release";
SKIP_INSTALL = YES;
SWIFT_OBJC_BRIDGING_HEADER = "";
SWIFT_OBJC_INTERFACE_HEADER_NAME = "";

View file

@ -61,42 +61,42 @@ platform :ios do
get_provisioning_profile(
api_key_path: 'keys/appstore.json',
app_identifier: 'app.organicmaps',
provisioning_name: 'CarPlay Release',
provisioning_name: 'App Development (Fastlane)',
ignore_profiles_with_different_name: true,
readonly: true,
development: true,
skip_install: false,
filename: 'keys/CarPlay_Release.mobileprovision'
filename: 'keys/App_Development.mobileprovision'
)
get_provisioning_profile(
api_key_path: 'keys/appstore.json',
app_identifier: 'app.organicmaps',
provisioning_name: 'CarPlay AppStore',
provisioning_name: 'App Distribution (Fastlane)',
ignore_profiles_with_different_name: true,
adhoc: false,
readonly: true,
skip_install: false,
filename: 'keys/CarPlay_AppStore.mobileprovision'
filename: 'keys/App_Distribution.mobileprovision'
)
get_provisioning_profile(
api_key_path: 'keys/appstore.json',
app_identifier: 'app.organicmaps.widgetextension',
provisioning_name: 'WidgetExtension Release',
provisioning_name: 'WidgetExtension Development (Fastlane)',
ignore_profiles_with_different_name: true,
readonly: true,
development: true,
skip_install: false,
filename: 'keys/WidgetExtension_Release.mobileprovision'
filename: 'keys/WidgetExtension_Development.mobileprovision'
)
get_provisioning_profile(
api_key_path: 'keys/appstore.json',
app_identifier: 'app.organicmaps.widgetextension',
provisioning_name: 'WidgetExtension AppStore',
provisioning_name: 'WidgetExtension Distribution (Fastlane)',
ignore_profiles_with_different_name: true,
adhoc: false,
readonly: true,
skip_install: false,
filename: 'keys/WidgetExtension_AppStore.mobileprovision'
filename: 'keys/WidgetExtension_Distribution.mobileprovision'
)
end
end
@ -115,6 +115,24 @@ platform :ios do
prepare
generate_version
generate_testflight_changelog
update_code_signing_settings(
path: "../iphone/Maps/Maps.xcodeproj",
targets: ["OMaps"],
build_configurations: "Release",
use_automatic_signing: false,
code_sign_identity: "Apple Distribution",
team_id: "9Z6432XD7L",
profile_name: "App Distribution (Fastlane)",
)
update_code_signing_settings(
path: "../iphone/Maps/Maps.xcodeproj",
targets: ["OMapsWidgetExtensionExtension"],
build_configurations: "Release",
use_automatic_signing: false,
code_sign_identity: "Apple Distribution",
team_id: "9Z6432XD7L",
profile_name: "WidgetExtension Distribution (Fastlane)",
)
build_ios_app(
workspace: 'omim.xcworkspace',
scheme: 'OMaps',
@ -126,8 +144,8 @@ platform :ios do
export_method: 'app-store',
export_options: {
provisioningProfiles: {
'app.organicmaps' => 'CarPlay AppStore',
'app.organicmaps.widgetextension' => 'WidgetExtension AppStore',
'app.organicmaps' => 'App Distribution (Fastlane)',
'app.organicmaps.widgetextension' => 'WidgetExtension Distribution (Fastlane)',
}
},
skip_profile_detection: false,