From 2d9c602ef0169167174e8fd91722790fbbec107f Mon Sep 17 00:00:00 2001 From: Roman Tsisyk Date: Fri, 14 May 2021 10:13:49 +0300 Subject: [PATCH] [ios] Update Apple credentials Signed-off-by: Roman Tsisyk --- README.md | 2 +- iphone/Chart/Chart.xcodeproj/project.pbxproj | 2 +- .../CoreApi/CoreApi.xcodeproj/project.pbxproj | 14 +++++++------- .../DatePicker.xcodeproj/project.pbxproj | 2 +- iphone/Maps/.gitignore | 6 +++--- iphone/Maps/Maps.xcodeproj/project.pbxproj | 19 ++++++++++--------- iphone/Maps/OMaps.plist | 2 ++ xcode/base/base.xcodeproj/project.pbxproj | 1 - xcode/common.xcconfig | 2 +- xcode/qtMapsMe/Info.plist | 12 ++++++------ .../qtMapsMe.xcodeproj/project.pbxproj | 11 ++++------- 11 files changed, 36 insertions(+), 37 deletions(-) diff --git a/README.md b/README.md index d5c4595354..6afaf725d7 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ and [data/copyright.html](http://htmlpreview.github.io/?https://github.com/organ [firebase-appdistribution-url]: https://appdistribution.firebase.google.com/pub/i/4fa64e2439ca20ff [github-releases-url]: https://github.com/organicmaps/organicmaps/releases [apple-appstore-badge]: https://img.shields.io/badge/Apple-AppStore-white.svg?style=flat -[apple-appstore-url]: https://testflight.apple.com/join/62l4Qh2K +[apple-appstore-url]: https://testflight.apple.com/join/lrKCl08I [slack-badge]: https://img.shields.io/badge/Slack-Community-yellow.svg?style=flat [slack-url]: https://slack.omaps.app/ [telegram-channel-badge]: https://img.shields.io/badge/Telegram-Channel-blue.svg?style=flat diff --git a/iphone/Chart/Chart.xcodeproj/project.pbxproj b/iphone/Chart/Chart.xcodeproj/project.pbxproj index 1f1ef136be..2a4866bc01 100644 --- a/iphone/Chart/Chart.xcodeproj/project.pbxproj +++ b/iphone/Chart/Chart.xcodeproj/project.pbxproj @@ -185,7 +185,7 @@ attributes = { DefaultBuildSystemTypeForWorkspace = Latest; LastUpgradeCheck = 1240; - ORGANIZATIONNAME = maps.me; + ORGANIZATIONNAME = "Organic Maps"; TargetAttributes = { 47375D952420D4DB00FFCC49 = { CreatedOnToolsVersion = 11.3; diff --git a/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj b/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj index 0d3dba5df5..24fa92aa76 100644 --- a/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj +++ b/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj @@ -524,7 +524,7 @@ isa = PBXProject; attributes = { LastUpgradeCheck = 1250; - ORGANIZATIONNAME = maps.me; + ORGANIZATIONNAME = "Organic Maps"; TargetAttributes = { 470015EE2342509C00EBF03D = { CreatedOnToolsVersion = 10.2; @@ -665,10 +665,10 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_WARN_COMMA = NO; - CODE_SIGN_IDENTITY = ""; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = N9X2A789QT; + DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -687,8 +687,8 @@ ); MACH_O_TYPE = staticlib; MODULEMAP_FILE = CoreApi.modulemap; - PRODUCT_BUNDLE_IDENTIFIER = com.mapswithme.CoreApi; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -698,11 +698,11 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_WARN_COMMA = NO; - CODE_SIGN_IDENTITY = ""; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = N9X2A789QT; + DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -721,8 +721,8 @@ ); MACH_O_TYPE = staticlib; MODULEMAP_FILE = CoreApi.modulemap; - PRODUCT_BUNDLE_IDENTIFIER = com.mapswithme.CoreApi; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; }; diff --git a/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj b/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj index 2575ab3b37..b24798b0ed 100644 --- a/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj +++ b/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj @@ -149,7 +149,7 @@ isa = PBXProject; attributes = { LastUpgradeCheck = 1250; - ORGANIZATIONNAME = maps.me; + ORGANIZATIONNAME = "Organic Maps"; TargetAttributes = { 47A13C6424B4A86000027D4F = { CreatedOnToolsVersion = 11.3; diff --git a/iphone/Maps/.gitignore b/iphone/Maps/.gitignore index 8cbf83403c..cf7c1556eb 100644 --- a/iphone/Maps/.gitignore +++ b/iphone/Maps/.gitignore @@ -1,4 +1,4 @@ Pods -app.omaps.debug -app.omaps.release -app.omaps.production +app.organicmaps.debug +app.organicmaps.beta +app.organicmaps diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 82795281a5..74b6c88925 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -1178,7 +1178,7 @@ 5605022E1B6211E100169CAD /* sound-strings */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "sound-strings"; path = "../../data/sound-strings"; sourceTree = ""; }; 56EE14D21FE804550036F20C /* libtransit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libtransit.a; sourceTree = BUILT_PRODUCTS_DIR; }; 671E78D21E6A423300B2859B /* librouting_common.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = librouting_common.a; path = "../../../omim-build/xcode/Debug-iphonesimulator/librouting_common.a"; sourceTree = ""; }; - 6741AA5D1BF340DE002C974C /* OMaps Debug.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "OMaps Debug.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 6741AA5D1BF340DE002C974C /* Organic Maps (Debug).app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Organic Maps (Debug).app"; sourceTree = BUILT_PRODUCTS_DIR; }; 6741AAA21BF356B9002C974C /* libagg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libagg.a; path = "../../../omim-xcode-build/Debug/libagg.a"; sourceTree = ""; }; 6741AAA61BF356B9002C974C /* libbase.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbase.a; path = "../../../omim-xcode-build/Debug/libbase.a"; sourceTree = ""; }; 6741AAA71BF356B9002C974C /* libcoding.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcoding.a; path = "../../../omim-xcode-build/Debug/libcoding.a"; sourceTree = ""; }; @@ -1754,7 +1754,7 @@ 19C28FACFE9D520D11CA2CBB /* Products */ = { isa = PBXGroup; children = ( - 6741AA5D1BF340DE002C974C /* OMaps Debug.app */, + 6741AA5D1BF340DE002C974C /* Organic Maps (Debug).app */, ); name = Products; sourceTree = ""; @@ -3729,7 +3729,7 @@ ); name = OMaps; productName = Maps; - productReference = 6741AA5D1BF340DE002C974C /* OMaps Debug.app */; + productReference = 6741AA5D1BF340DE002C974C /* Organic Maps (Debug).app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -3739,10 +3739,9 @@ isa = PBXProject; attributes = { LastUpgradeCheck = 1250; - ORGANIZATIONNAME = OMaps.app; + ORGANIZATIONNAME = "Organic Maps"; TargetAttributes = { 6741A93D1BF340DE002C974C = { - DevelopmentTeam = W55CJ2SCF7; LastSwiftMigration = 1110; ProvisioningStyle = Automatic; SystemCapabilities = { @@ -4560,7 +4559,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; DEBUG_INFORMATION_FORMAT = dwarf; - DEVELOPMENT_TEAM = W55CJ2SCF7; + DEVELOPMENT_TEAM = 9Z6432XD7L; "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*]" = MetalContextFactory.mm; "EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*]" = MetalContextFactory.mm; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; @@ -4569,6 +4568,7 @@ "@executable_path/Frameworks", ); OTHER_SWIFT_FLAGS = "$(inherited)"; + PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.debug; }; name = Debug; }; @@ -4579,7 +4579,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = W55CJ2SCF7; + DEVELOPMENT_TEAM = 9Z6432XD7L; "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*]" = MetalContextFactory.mm; "EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*]" = MetalContextFactory.mm; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; @@ -4588,6 +4588,7 @@ "@executable_path/Frameworks", ); OTHER_SWIFT_FLAGS = "$(inherited)"; + PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps; }; name = Release; }; @@ -4597,7 +4598,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; - BUNDLE_IDENTIFIER = app.omaps.debug; + BUNDLE_IDENTIFIER = app.organicmaps.debug; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; GCC_PREFIX_HEADER = Maps_Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; @@ -4642,7 +4643,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; - BUNDLE_IDENTIFIER = app.omaps.release; + BUNDLE_IDENTIFIER = app.organicmaps; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; GCC_PREFIX_HEADER = Maps_Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; diff --git a/iphone/Maps/OMaps.plist b/iphone/Maps/OMaps.plist index 1bdb546da0..aa1d13677a 100644 --- a/iphone/Maps/OMaps.plist +++ b/iphone/Maps/OMaps.plist @@ -2,6 +2,8 @@ + ITSAppUsesNonExemptEncryption + CFBundleDevelopmentRegion en CFBundleDisplayName diff --git a/xcode/base/base.xcodeproj/project.pbxproj b/xcode/base/base.xcodeproj/project.pbxproj index fb67a49d90..e57f884865 100644 --- a/xcode/base/base.xcodeproj/project.pbxproj +++ b/xcode/base/base.xcodeproj/project.pbxproj @@ -652,7 +652,6 @@ TargetAttributes = { 39FD27061CC65A7100AFF551 = { CreatedOnToolsVersion = 7.2.1; - DevelopmentTeam = H8S4LL7H84; }; 675341761A3F57BF00A0A8C3 = { CreatedOnToolsVersion = 6.1; diff --git a/xcode/common.xcconfig b/xcode/common.xcconfig index 098f5f7d33..2336d55be7 100644 --- a/xcode/common.xcconfig +++ b/xcode/common.xcconfig @@ -1,4 +1,4 @@ -CURRENT_PROJECT_VERSION = 2021.05.08 +CURRENT_PROJECT_VERSION = 2021.05.13 // Paths OMIM_ROOT = $(PROJECT_DIR)/../.. diff --git a/xcode/qtMapsMe/Info.plist b/xcode/qtMapsMe/Info.plist index 13bb9c229d..f90bb77a94 100644 --- a/xcode/qtMapsMe/Info.plist +++ b/xcode/qtMapsMe/Info.plist @@ -24,12 +24,6 @@ 1 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) - NSHumanReadableCopyright - https://github.com/organicmaps/organicmaps. - NSMainNibFile - MainMenu - NSPrincipalClass - NSApplication NSAppTransportSecurity NSAllowsArbitraryLoads @@ -45,5 +39,11 @@ + NSHumanReadableCopyright + https://github.com/organicmaps/organicmaps + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication diff --git a/xcode/qtMapsMe/qtMapsMe.xcodeproj/project.pbxproj b/xcode/qtMapsMe/qtMapsMe.xcodeproj/project.pbxproj index 6fe12f1e6e..672c116f86 100644 --- a/xcode/qtMapsMe/qtMapsMe.xcodeproj/project.pbxproj +++ b/xcode/qtMapsMe/qtMapsMe.xcodeproj/project.pbxproj @@ -697,7 +697,6 @@ TargetAttributes = { 675345481A404C6100A0A8C3 = { CreatedOnToolsVersion = 6.1; - DevelopmentTeam = 3T6FSDE8C7; ProvisioningStyle = Automatic; }; }; @@ -888,9 +887,9 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "Mac Developer"; + CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = 3T6FSDE8C7; + DEVELOPMENT_TEAM = ""; ENABLE_HARDENED_RUNTIME = YES; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; INFOPLIST_FILE = Info.plist; @@ -898,7 +897,6 @@ "$(inherited)", "@executable_path/../Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = "mail.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; }; @@ -908,9 +906,9 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "Mac Developer"; + CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = 3T6FSDE8C7; + DEVELOPMENT_TEAM = ""; ENABLE_HARDENED_RUNTIME = YES; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -924,7 +922,6 @@ "$(inherited)", "@executable_path/../Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = "mail.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; };