diff --git a/iphone/Chart/Chart.xcodeproj/project.pbxproj b/iphone/Chart/Chart.xcodeproj/project.pbxproj index 1913b52e49..4c164811dc 100644 --- a/iphone/Chart/Chart.xcodeproj/project.pbxproj +++ b/iphone/Chart/Chart.xcodeproj/project.pbxproj @@ -351,6 +351,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.mapswithme.Chart; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; @@ -372,6 +373,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.mapswithme.Chart; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; diff --git a/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj b/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj index 41aa070566..adcfdcd321 100644 --- a/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj +++ b/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj @@ -637,6 +637,7 @@ "@loader_path/Frameworks", ); MACH_O_TYPE = staticlib; + MARKETING_VERSION = 1.0; MODULEMAP_FILE = CoreApi.modulemap; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -660,6 +661,7 @@ "@loader_path/Frameworks", ); MACH_O_TYPE = staticlib; + MARKETING_VERSION = 1.0; MODULEMAP_FILE = CoreApi.modulemap; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj b/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj index cdb8945cdc..ea40d86808 100644 --- a/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj +++ b/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj @@ -251,6 +251,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.mapswithme.DatePicker; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; @@ -271,6 +272,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.mapswithme.DatePicker; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/114.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/114.png deleted file mode 100644 index 5ebfeae16b..0000000000 Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/114.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/120.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/120.png deleted file mode 100644 index bb13d70d10..0000000000 Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/120.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/180.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/180.png deleted file mode 100644 index 9ebe8478a3..0000000000 Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/180.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/29.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/29.png deleted file mode 100644 index 43b70ec1c7..0000000000 Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/29.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/40.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/40.png deleted file mode 100644 index 4cb2619b1d..0000000000 Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/40.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/57.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/57.png deleted file mode 100644 index c9396a6714..0000000000 Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/57.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/58.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/58.png deleted file mode 100644 index 585ec5cfb5..0000000000 Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/58.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/60.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/60.png deleted file mode 100644 index 1a96490d85..0000000000 Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/60.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/80.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/80.png deleted file mode 100644 index 8f34ea1e51..0000000000 Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/80.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/87.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/87.png deleted file mode 100644 index 130aa1da84..0000000000 Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/87.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Contents.json b/iphone/Maps/Images.xcassets/AppIcon.appiconset/Contents.json index 73d3b7f6d1..cff1680b35 100644 --- a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/iphone/Maps/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1 +1,14 @@ -{"images":[{"size":"60x60","expected-size":"180","filename":"180.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"40x40","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"60x60","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"57x57","expected-size":"57","filename":"57.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"87","filename":"87.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"57x57","expected-size":"114","filename":"114.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"60","filename":"60.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"1024x1024","filename":"1024.png","expected-size":"1024","idiom":"ios-marketing","folder":"Assets.xcassets/AppIcon.appiconset/","scale":"1x"}]} \ No newline at end of file +{ + "images" : [ + { + "filename" : "1024.png", + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 86b55f8779..15d97c129e 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -5799,24 +5799,26 @@ CODE_SIGN_ENTITLEMENTS = "OMaps-Debug.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 0; - DEVELOPMENT_TEAM = ZLDHW678M5; + CURRENT_PROJECT_VERSION = 2; + DEVELOPMENT_TEAM = BDJSH66HZT; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - INFOPLIST_KEY_CFBundleDisplayName = "${PRODUCT_NAME}"; + INFOPLIST_KEY_CFBundleDisplayName = Tourism; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.travel"; INFOPLIST_KEY_LSSupportsOpeningDocumentsInPlace = NO; INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "Determining your location is necessary for navigation and for saving your recently travelled track."; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UIMainStoryboardFile = Main; INFOPLIST_KEY_UIStatusBarHidden = NO; - INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2022.11.17; + MARKETING_VERSION = 1.0; OTHER_SWIFT_FLAGS = "$(inherited)"; - PRODUCT_BUNDLE_IDENTIFIER = app.tourism.tj; + PRODUCT_BUNDLE_IDENTIFIER = tj.rebus.tourism; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; }; @@ -5827,28 +5829,30 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = "OMaps-Release.entitlements"; - CODE_SIGN_IDENTITY = "iPhone Developer"; - CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 0; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 2; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = 9Z6432XD7L; + DEVELOPMENT_TEAM = BDJSH66HZT; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - INFOPLIST_KEY_CFBundleDisplayName = "${PRODUCT_NAME}"; + INFOPLIST_KEY_CFBundleDisplayName = Tourism; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.travel"; INFOPLIST_KEY_LSSupportsOpeningDocumentsInPlace = NO; INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "Determining your location is necessary for navigation and for saving your recently travelled track."; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UIMainStoryboardFile = Main; INFOPLIST_KEY_UIStatusBarHidden = NO; - INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2022.11.17; + MARKETING_VERSION = 1.0; OTHER_SWIFT_FLAGS = "$(inherited)"; - PRODUCT_BUNDLE_IDENTIFIER = app.tourism.tj; - PROVISIONING_PROFILE_SPECIFIER = "CarPlay Release"; + PRODUCT_BUNDLE_IDENTIFIER = tj.rebus.tourism; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; }; name = Release; diff --git a/iphone/Maps/OMaps-Debug.entitlements b/iphone/Maps/OMaps-Debug.entitlements index 1c80ed4313..46df05b120 100644 --- a/iphone/Maps/OMaps-Debug.entitlements +++ b/iphone/Maps/OMaps-Debug.entitlements @@ -10,7 +10,7 @@ com.apple.developer.icloud-container-identifiers - iCloud.app.organicmaps.debug + iCloud.app.tourism.debug com.apple.developer.icloud-services @@ -19,7 +19,7 @@ com.apple.developer.ubiquity-container-identifiers - iCloud.app.organicmaps.debug + iCloud.app.tourism.debug com.apple.developer.ubiquity-kvstore-identifier $(TeamIdentifierPrefix)$(CFBundleIdentifier) diff --git a/iphone/Maps/OMaps-Release.entitlements b/iphone/Maps/OMaps-Release.entitlements index 9e52a78a0b..abba4ad5c8 100644 --- a/iphone/Maps/OMaps-Release.entitlements +++ b/iphone/Maps/OMaps-Release.entitlements @@ -8,11 +8,9 @@ applinks:omaps.app - com.apple.developer.carplay-maps - com.apple.developer.icloud-container-identifiers - iCloud.app.organicmaps + iCloud.app.tourism com.apple.developer.icloud-services @@ -21,7 +19,7 @@ com.apple.developer.ubiquity-container-identifiers - iCloud.app.organicmaps + iCloud.app.tourism com.apple.developer.ubiquity-kvstore-identifier $(TeamIdentifierPrefix)$(CFBundleIdentifier) diff --git a/iphone/Maps/OMaps.plist b/iphone/Maps/OMaps.plist index 3ba5426980..828000f79a 100644 --- a/iphone/Maps/OMaps.plist +++ b/iphone/Maps/OMaps.plist @@ -99,6 +99,13 @@ NSThirdPartyExceptionRequiresForwardSecrecy + tourismmap.tj + + NSExceptionAllowsInsecureHTTPLoads + + NSIncludesSubdomains + + NSUbiquitousContainers @@ -107,19 +114,19 @@ NSUbiquitousContainerIsDocumentScopePublic - NSUbiquitousContainerSupportedFolderLevels - ANY NSUbiquitousContainerName OrganicMaps + NSUbiquitousContainerSupportedFolderLevels + ANY iCloud.app.organicmaps.debug NSUbiquitousContainerIsDocumentScopePublic - NSUbiquitousContainerSupportedFolderLevels - ANY NSUbiquitousContainerName OrganicMapsDEBUG + NSUbiquitousContainerSupportedFolderLevels + ANY UIAppFonts diff --git a/xcode/map/map.xcodeproj/project.pbxproj b/xcode/map/map.xcodeproj/project.pbxproj index 97d510969c..8fdc914f36 100644 --- a/xcode/map/map.xcodeproj/project.pbxproj +++ b/xcode/map/map.xcodeproj/project.pbxproj @@ -786,7 +786,10 @@ buildSettings = { EXECUTABLE_PREFIX = lib; PRODUCT_NAME = "$(TARGET_NAME)"; - WARNING_CFLAGS = "-Wno-deprecated-register "; + WARNING_CFLAGS = ( + "-Wno-deprecated-register", + " ", + ); }; name = Debug; }; @@ -795,7 +798,10 @@ buildSettings = { EXECUTABLE_PREFIX = lib; PRODUCT_NAME = "$(TARGET_NAME)"; - WARNING_CFLAGS = "-Wno-deprecated-register "; + WARNING_CFLAGS = ( + "-Wno-deprecated-register", + " ", + ); }; name = Release; }; diff --git a/xcode/minizip/minizip.xcodeproj/project.pbxproj b/xcode/minizip/minizip.xcodeproj/project.pbxproj index eb539e22a9..1977903f12 100644 --- a/xcode/minizip/minizip.xcodeproj/project.pbxproj +++ b/xcode/minizip/minizip.xcodeproj/project.pbxproj @@ -202,6 +202,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + MARKETING_VERSION = 1.0; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.mapswithme.minizip-ios"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; @@ -229,6 +230,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = "com.mapswithme.minizip-ios"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SDKROOT = iphoneos;