diff --git a/3party/icu/icu b/3party/icu/icu index 904cf62457..680f521746 160000 --- a/3party/icu/icu +++ b/3party/icu/icu @@ -1 +1 @@ -Subproject commit 904cf62457de2440e8526deb75c95a3f7296f517 +Subproject commit 680f521746a3bd6a86f25f25ee50a62d88b489cf diff --git a/android/assets/icudt70l.dat b/android/assets/icudt70l.dat deleted file mode 120000 index b311671096..0000000000 --- a/android/assets/icudt70l.dat +++ /dev/null @@ -1 +0,0 @@ -../../data/icudt70l.dat \ No newline at end of file diff --git a/android/assets/icudt73l.dat b/android/assets/icudt73l.dat new file mode 120000 index 0000000000..fd146e695a --- /dev/null +++ b/android/assets/icudt73l.dat @@ -0,0 +1 @@ +../../data/icudt73l.dat \ No newline at end of file diff --git a/android/script/replace_links.bat b/android/script/replace_links.bat index 3316ac1985..bc2e83f07c 100644 --- a/android/script/replace_links.bat +++ b/android/script/replace_links.bat @@ -38,7 +38,7 @@ cp -r ../data/resources-6plus_clear/ assets/ cp -r ../data/sound-strings/ assets/ cp -r ../data/countries-strings/ assets/ -cp -r ../data/icudt70l.dat assets/ +cp -r ../data/icudt73l.dat assets/ rm -rf flavors/mwm-ttf-assets diff --git a/data/icudt70l.dat b/data/icudt73l.dat similarity index 55% rename from data/icudt70l.dat rename to data/icudt73l.dat index a424ec9673..c886aee28f 100644 Binary files a/data/icudt70l.dat and b/data/icudt73l.dat differ diff --git a/indexer/transliteration_loader.cpp b/indexer/transliteration_loader.cpp index 1bef944848..5d971f0913 100644 --- a/indexer/transliteration_loader.cpp +++ b/indexer/transliteration_loader.cpp @@ -16,7 +16,7 @@ void InitTransliterationInstanceWithDefaultDirs() Platform const & pl = GetPlatform(); #if defined(OMIM_OS_ANDROID) - char const kICUDataFile[] = "icudt70l.dat"; + char const kICUDataFile[] = "icudt73l.dat"; if (!pl.IsFileExistsByFullPath(base::JoinPath(pl.WritableDir(), kICUDataFile))) { try diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 904ef4c418..ad8b34b524 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -438,7 +438,7 @@ B33D21AF20DAF9F000BAD749 /* Toast.swift in Sources */ = {isa = PBXBuildFile; fileRef = B33D21AE20DAF9F000BAD749 /* Toast.swift */; }; B3E3B4FD20D463B700DA8C13 /* BMCCategoriesHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = B3E3B4FC20D463B700DA8C13 /* BMCCategoriesHeader.xib */; }; BB25B1A71FB32767007276FA /* transit_colors.txt in Resources */ = {isa = PBXBuildFile; fileRef = BB25B1A51FB32767007276FA /* transit_colors.txt */; }; - BB7626B61E85599C0031D71C /* icudt70l.dat in Resources */ = {isa = PBXBuildFile; fileRef = BB7626B41E8559980031D71C /* icudt70l.dat */; }; + BB7626B61E85599C0031D71C /* icudt73l.dat in Resources */ = {isa = PBXBuildFile; fileRef = BB7626B41E8559980031D71C /* icudt73l.dat */; }; BB8123D62130427E00ADE512 /* MetalContextFactory.mm in Sources */ = {isa = PBXBuildFile; fileRef = BB8123D52130427E00ADE512 /* MetalContextFactory.mm */; }; CD4A1F132305872700F2A6B6 /* PromoBookingPresentationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD4A1F122305872700F2A6B6 /* PromoBookingPresentationController.swift */; }; CD6E8677226774C700D1EDF7 /* CPConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD6E8676226774C700D1EDF7 /* CPConstants.swift */; }; @@ -1285,7 +1285,7 @@ B33D21AE20DAF9F000BAD749 /* Toast.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Toast.swift; sourceTree = ""; }; B3E3B4FC20D463B700DA8C13 /* BMCCategoriesHeader.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BMCCategoriesHeader.xib; sourceTree = ""; }; BB25B1A51FB32767007276FA /* transit_colors.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = transit_colors.txt; path = ../../data/transit_colors.txt; sourceTree = ""; }; - BB7626B41E8559980031D71C /* icudt70l.dat */ = {isa = PBXFileReference; lastKnownFileType = file; name = icudt70l.dat; path = ../../data/icudt70l.dat; sourceTree = ""; }; + BB7626B41E8559980031D71C /* icudt73l.dat */ = {isa = PBXFileReference; lastKnownFileType = file; name = icudt73l.dat; path = ../../data/icudt73l.dat; sourceTree = ""; }; BB8123D42130427E00ADE512 /* MetalContextFactory.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MetalContextFactory.h; sourceTree = ""; }; BB8123D52130427E00ADE512 /* MetalContextFactory.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MetalContextFactory.mm; sourceTree = ""; }; CD4A1F122305872700F2A6B6 /* PromoBookingPresentationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PromoBookingPresentationController.swift; sourceTree = ""; }; @@ -3510,7 +3510,7 @@ 978D4A30199A11E600D72CA7 /* faq.html */, EEFE7C1212F8C9E1006AF8C3 /* fonts_blacklist.txt */, EEFE7C1312F8C9E1006AF8C3 /* fonts_whitelist.txt */, - BB7626B41E8559980031D71C /* icudt70l.dat */, + BB7626B41E8559980031D71C /* icudt73l.dat */, F623DA6A1C9C2731006A3436 /* opening_hours_how_to_edit.html */, FA85F632145DDDC20090E1A0 /* packed_polygons.bin */, 451950391B7A3E070085DA05 /* patterns.txt */, @@ -3809,7 +3809,7 @@ F6E2FF001E097BA00083EBEC /* SearchCategoryCell.xib in Resources */, F6E2FF331E097BA00083EBEC /* MWMSearchCommonCell.xib in Resources */, F6E2FF061E097BA00083EBEC /* SearchHistoryClearCell.xib in Resources */, - BB7626B61E85599C0031D71C /* icudt70l.dat in Resources */, + BB7626B61E85599C0031D71C /* icudt73l.dat in Resources */, 34AB665C1FC5AA330078E451 /* TransportTransitIntermediatePoint.xib in Resources */, F6E2FF151E097BA00083EBEC /* SearchHistoryQueryCell.xib in Resources */, F6E2FEE81E097BA00083EBEC /* MWMSearchNoResults.xib in Resources */, diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt index d9a44d1f6c..5bc9fc6d18 100644 --- a/qt/CMakeLists.txt +++ b/qt/CMakeLists.txt @@ -155,7 +155,7 @@ endif() if (NOT PLATFORM_LINUX) # On Linux, ICU data is loaded from the shared library. - copy_resources(icudt70l.dat) + copy_resources(icudt73l.dat) endif() if (PLATFORM_MAC)