Bump mapbox-base to 1.2.0

19 files changed, 30 insertions, 53 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 603615b37a..4357493cef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -960,15 +960,13 @@ target_link_libraries(
         mbgl-vendor-vector-tile
         mbgl-vendor-wagyu
     PUBLIC
+        Mapbox::Base
         Mapbox::Base::Extras::expected-lite
         Mapbox::Base::Extras::rapidjson
         Mapbox::Base::geojson.hpp
         Mapbox::Base::geometry.hpp
         Mapbox::Base::optional
-        Mapbox::Base::typewrapper
-        Mapbox::Base::value
         Mapbox::Base::variant
-        Mapbox::Base::weak
 )
 
 set_target_properties(
diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
index 8f265ecb91..d6ac17ae1c 100644
--- a/bin/CMakeLists.txt
+++ b/bin/CMakeLists.txt
@@ -6,8 +6,8 @@ add_executable(
 target_link_libraries(
     mbgl-cache
     PRIVATE
+        Mapbox::Base
         Mapbox::Base::Extras::args
-        Mapbox::Base::io
         mbgl-compiler-options
         mbgl-core
 )
diff --git a/bin/cache.cpp b/bin/cache.cpp
index 69d96c1d42..179cd9dc8c 100644
--- a/bin/cache.cpp
+++ b/bin/cache.cpp
@@ -5,7 +5,7 @@
 #include <mbgl/util/run_loop.hpp>
 
 #include <args.hxx>
-#include <mapbox/io.hpp>
+#include <mapbox/io/io.hpp>
 
 #include <fstream>
 #include <iostream>
diff --git a/expression-test/CMakeLists.txt b/expression-test/CMakeLists.txt
index e9e5847d41..f9120ac7c2 100644
--- a/expression-test/CMakeLists.txt
+++ b/expression-test/CMakeLists.txt
@@ -25,9 +25,9 @@ target_include_directories(
 target_link_libraries(
     mbgl-expression-test
     PRIVATE
+        Mapbox::Base
         Mapbox::Base::Extras::args
         Mapbox::Base::Extras::filesystem
-        Mapbox::Base::io
         mbgl-core
 )
 
diff --git a/include/mbgl/actor/mailbox.hpp b/include/mbgl/actor/mailbox.hpp
index 86ea0100fc..39b33275a6 100644
--- a/include/mbgl/actor/mailbox.hpp
+++ b/include/mbgl/actor/mailbox.hpp
@@ -7,7 +7,7 @@
 #include <mutex>
 #include <queue>
 
-#include <mapbox/weak.hpp>
+#include <mapbox/std/weak.hpp>
 
 namespace mbgl {
 
diff --git a/include/mbgl/actor/scheduler.hpp b/include/mbgl/actor/scheduler.hpp
index dca6b132f4..cdaf185c8b 100644
--- a/include/mbgl/actor/scheduler.hpp
+++ b/include/mbgl/actor/scheduler.hpp
@@ -2,7 +2,7 @@
 
 #include <mbgl/util/pass_types.hpp>
 
-#include <mapbox/weak.hpp>
+#include <mapbox/std/weak.hpp>
 
 #include <functional>
 #include <memory>
diff --git a/include/mbgl/platform/settings.hpp b/include/mbgl/platform/settings.hpp
index 722d0d2b3b..af5dcce212 100644
--- a/include/mbgl/platform/settings.hpp
+++ b/include/mbgl/platform/settings.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <mapbox/value.hpp>
+#include <mapbox/compatibility/value.hpp>
 
 #include <memory>
 
diff --git a/include/mbgl/storage/file_source.hpp b/include/mbgl/storage/file_source.hpp
index 43143c640f..3306d8d76a 100644
--- a/include/mbgl/storage/file_source.hpp
+++ b/include/mbgl/storage/file_source.hpp
@@ -3,7 +3,7 @@
 #include <mbgl/storage/resource_transform.hpp>
 #include <mbgl/storage/response.hpp>
 
-#include <mapbox/value.hpp>
+#include <mapbox/compatibility/value.hpp>
 
 #include <functional>
 #include <memory>
diff --git a/include/mbgl/style/conversion_impl.hpp b/include/mbgl/style/conversion_impl.hpp
index 9606c7b58d..79e9301842 100644
--- a/include/mbgl/style/conversion_impl.hpp
+++ b/include/mbgl/style/conversion_impl.hpp
@@ -11,7 +11,7 @@
 #include <mbgl/util/optional.hpp>
 #include <mbgl/util/traits.hpp>
 
-#include <mapbox/value.hpp>
+#include <mapbox/compatibility/value.hpp>
 
 #include <array>
 #include <chrono>
diff --git a/include/mbgl/style/layer.hpp b/include/mbgl/style/layer.hpp
index 840ef9ce88..204cb9c697 100644
--- a/include/mbgl/style/layer.hpp
+++ b/include/mbgl/style/layer.hpp
@@ -6,8 +6,8 @@
 #include <mbgl/util/immutable.hpp>
 #include <mbgl/util/optional.hpp>
 
-#include <mapbox/weak.hpp>
-#include <mapbox/type_wrapper.hpp>
+#include <mapbox/std/weak.hpp>
+#include <mapbox/util/type_wrapper.hpp>
 
 #include <cassert>
 #include <memory>
diff --git a/include/mbgl/style/source.hpp b/include/mbgl/style/source.hpp
index 59afd6916e..622c2e42ff 100644
--- a/include/mbgl/style/source.hpp
+++ b/include/mbgl/style/source.hpp
@@ -5,8 +5,8 @@
 #include <mbgl/util/immutable.hpp>
 #include <mbgl/style/types.hpp>
 
-#include <mapbox/weak.hpp>
-#include <mapbox/type_wrapper.hpp>
+#include <mapbox/std/weak.hpp>
+#include <mapbox/util/type_wrapper.hpp>
 
 #include <memory>
 #include <string>
diff --git a/include/mbgl/style/transition_options.hpp b/include/mbgl/style/transition_options.hpp
index 69479afaad..8ead79eb21 100644
--- a/include/mbgl/style/transition_options.hpp
+++ b/include/mbgl/style/transition_options.hpp
@@ -3,7 +3,7 @@
 #include <mbgl/util/chrono.hpp>
 #include <mbgl/util/optional.hpp>
 
-#include <mapbox/value.hpp>
+#include <mapbox/compatibility/value.hpp>
 
 namespace mbgl {
 namespace style {
diff --git a/include/mbgl/util/feature.hpp b/include/mbgl/util/feature.hpp
index 5d8fe89e36..92d7ebf9da 100644
--- a/include/mbgl/util/feature.hpp
+++ b/include/mbgl/util/feature.hpp
@@ -3,7 +3,7 @@
 #include <mbgl/util/optional.hpp>
 #include <mbgl/util/string.hpp>
 
-#include <mapbox/value.hpp>
+#include <mapbox/compatibility/value.hpp>
 
 namespace mbgl {
 
diff --git a/platform/android/android.cmake b/platform/android/android.cmake
index 167f29c005..89f3860dfb 100644
--- a/platform/android/android.cmake
+++ b/platform/android/android.cmake
@@ -309,10 +309,8 @@ target_link_libraries(
     example-custom-layer
     PRIVATE
         GLESv2
+        Mapbox::Base
         Mapbox::Base::optional
-        Mapbox::Base::typewrapper
-        Mapbox::Base::value
-        Mapbox::Base::weak
         log
         mbgl-compiler-options
 )
diff --git a/src/mbgl/annotation/annotation_manager.hpp b/src/mbgl/annotation/annotation_manager.hpp
index a9389d8ca9..57f27c6352 100644
--- a/src/mbgl/annotation/annotation_manager.hpp
+++ b/src/mbgl/annotation/annotation_manager.hpp
@@ -11,7 +11,7 @@
 #include <unordered_set>
 #include <unordered_map>
 
-#include <mapbox/weak.hpp>
+#include <mapbox/std/weak.hpp>
 
 namespace mbgl {
 
diff --git a/src/mbgl/renderer/tile_parameters.hpp b/src/mbgl/renderer/tile_parameters.hpp
index 147e19f146..e76d8d0f83 100644
--- a/src/mbgl/renderer/tile_parameters.hpp
+++ b/src/mbgl/renderer/tile_parameters.hpp
@@ -4,7 +4,7 @@
 
 #include <memory>
 
-#include <mapbox/weak.hpp>
+#include <mapbox/std/weak.hpp>
 
 namespace mbgl {
 
diff --git a/src/mbgl/renderer/update_parameters.hpp b/src/mbgl/renderer/update_parameters.hpp
index 4336fa0972..47192b9940 100644
--- a/src/mbgl/renderer/update_parameters.hpp
+++ b/src/mbgl/renderer/update_parameters.hpp
@@ -11,7 +11,7 @@
 
 #include <vector>
 
-#include <mapbox/weak.hpp>
+#include <mapbox/std/weak.hpp>
 
 namespace mbgl {
 
diff --git a/vendor/mapbox-base b/vendor/mapbox-base
-Subproject 119576a63bf9de51a1af7d227f4a634a4e276fc
+Subproject 6ac3cfd53dd87c7f9bfe44d4d78cefb6f833fce
diff --git a/vendor/mapbox-base.cmake b/vendor/mapbox-base.cmake
index a9e8fc1787..70e13ce2fa 100644
--- a/vendor/mapbox-base.cmake
+++ b/vendor/mapbox-base.cmake
@@ -1,8 +1,7 @@
 # License helper for mapbox-base, should be upstreamed.
 
 if(NOT TARGET mapbox-base)
-    add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/mapbox-base/mapbox)
-    add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/mapbox-base/extras)
+    add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/mapbox-base)
 endif()
 
 set_target_properties(
@@ -29,7 +28,7 @@ set_target_properties(
         INTERFACE_MAPBOX_NAME "supercluster.hpp"
         INTERFACE_MAPBOX_URL "https://github.com/mapbox/supercluster.hpp"
         INTERFACE_MAPBOX_AUTHOR "Mapbox"
-        INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/mapbox/supercluster.hpp/LICENSE
+        INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/deps/supercluster.hpp/LICENSE
 )
 
 set_target_properties(
@@ -38,7 +37,7 @@ set_target_properties(
         INTERFACE_MAPBOX_NAME "shelf-pack-cpp"
         INTERFACE_MAPBOX_URL "https://github.com/mapbox/shelf-pack-cpp"
         INTERFACE_MAPBOX_AUTHOR "Mapbox"
-        INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/mapbox/shelf-pack-cpp/LICENSE.md
+        INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/deps/shelf-pack-cpp/LICENSE.md
 )
 
 set_target_properties(
@@ -47,7 +46,7 @@ set_target_properties(
         INTERFACE_MAPBOX_NAME "geojson-vt-cpp"
         INTERFACE_MAPBOX_URL "https://github.com/mapbox/geojson-vt-cpp"
         INTERFACE_MAPBOX_AUTHOR "Mapbox"
-        INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/mapbox/geojson-vt-cpp/LICENSE
+        INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/deps/geojson-vt-cpp/LICENSE
 )
 
 set_target_properties(
@@ -65,7 +64,7 @@ set_target_properties(
         INTERFACE_MAPBOX_NAME "geojson.hpp"
         INTERFACE_MAPBOX_URL "https://github.com/mapbox/geojson-cpp"
         INTERFACE_MAPBOX_AUTHOR "Mapbox"
-        INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/mapbox/geojson.hpp/LICENSE
+        INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/deps/geojson.hpp/LICENSE
 )
 
 set_target_properties(
@@ -74,7 +73,7 @@ set_target_properties(
         INTERFACE_MAPBOX_NAME "geometry.hpp"
         INTERFACE_MAPBOX_URL "https://github.com/mapbox/geometry.hpp"
         INTERFACE_MAPBOX_AUTHOR "Mapbox"
-        INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/mapbox/geometry.hpp/LICENSE
+        INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/deps/geometry.hpp/LICENSE
 )
 
 set_target_properties(
@@ -83,25 +82,16 @@ set_target_properties(
         INTERFACE_MAPBOX_NAME "Optional"
         INTERFACE_MAPBOX_URL "https://github.com/akrzemi1/Optional"
         INTERFACE_MAPBOX_AUTHOR "Andrzej Krzemienski"
-        INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/mapbox/optional/LICENSE
+        INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/deps/optional/LICENSE
 )
 
 set_target_properties(
-    mapbox-base-typewrapper
+    mapbox-base
     PROPERTIES
-        INTERFACE_MAPBOX_NAME "typewrapper"
+        INTERFACE_MAPBOX_NAME "mapbox-base"
         INTERFACE_MAPBOX_URL "https://github.com/mapbox/mapbox-base"
         INTERFACE_MAPBOX_AUTHOR "Mapbox"
-        INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/mapbox/typewrapper/LICENSE
-)
-
-set_target_properties(
-    mapbox-base-value
-    PROPERTIES
-        INTERFACE_MAPBOX_NAME "value"
-        INTERFACE_MAPBOX_URL "https://github.com/mapbox/mapbox-base"
-        INTERFACE_MAPBOX_AUTHOR "Mapbox"
-        INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/mapbox/value/LICENSE
+        INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/LICENSE
 )
 
 set_target_properties(
@@ -110,14 +100,5 @@ set_target_properties(
         INTERFACE_MAPBOX_NAME "variant"
         INTERFACE_MAPBOX_URL "https://github.com/mapbox/variant"
         INTERFACE_MAPBOX_AUTHOR "Mapbox"
-        INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/mapbox/variant/LICENSE
-)
-
-set_target_properties(
-    mapbox-base-weak
-    PROPERTIES
-        INTERFACE_MAPBOX_NAME "weak"
-        INTERFACE_MAPBOX_URL "https://github.com/mapbox/mapbox-base"
-        INTERFACE_MAPBOX_AUTHOR "Mapbox"
-        INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/mapbox/weak/LICENSE
+        INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/deps/variant/LICENSE
 )