[core][android][darwin] Move platform specific Collator impls from expression

Platform specific Collator implementations should not be part of an expression APIs.

2 files changed, 26 insertions, 4 deletions

diff --git a/include/mbgl/i18n/collator.hpp b/include/mbgl/i18n/collator.hpp
new file mode 100644
index 0000000000..9db1f804aa
--- /dev/null
+++ b/include/mbgl/i18n/collator.hpp
@@ -0,0 +1,24 @@
+#pragma once
+
+#include <mbgl/util/optional.hpp>
+
+#include <memory>
+#include <string>
+
+namespace mbgl {
+namespace platform {
+
+class Collator {
+public:
+    explicit Collator(bool caseSensitive, bool diacriticSensitive, optional<std::string> locale = nullopt);
+    int compare(const std::string& lhs, const std::string& rhs) const;
+    std::string resolvedLocale() const;
+    bool operator==(const Collator& other) const;
+
+private:
+    class Impl;
+    std::shared_ptr<Impl> impl;
+};
+
+} // namespace platform
+} // namespace mbgl
diff --git a/include/mbgl/style/expression/collator.hpp b/include/mbgl/style/expression/collator.hpp
index 2a79e55556..51ba426fad 100644
--- a/include/mbgl/style/expression/collator.hpp
+++ b/include/mbgl/style/expression/collator.hpp
@@ -1,10 +1,9 @@
 #pragma once
 
-#include <mbgl/util/feature.hpp>
+#include <mbgl/i18n/collator.hpp>
 #include <mbgl/util/optional.hpp>
 
 #include <string>
-#include <memory>
 
 namespace mbgl {
 namespace style {
@@ -20,8 +19,7 @@ public:
 
     std::string resolvedLocale() const;
 private:
-    class Impl;
-    std::shared_ptr<Impl> impl;
+    platform::Collator collator;
 };
 
 } // namespace expression