[build] move Reachability to platform/darwin

cmake/core-files.cmake

@@ -137,9 +137,6 @@ set(MBGL_CORE_FILES
     src/mbgl/platform/event.cpp
     src/mbgl/platform/log.cpp
 
-    # platform/darwin
-    include/mbgl/platform/darwin/reachability.h
-
     # platform/default
     include/mbgl/platform/default/glfw_view.hpp
     include/mbgl/platform/default/headless_backend.hpp

platform/darwin/mbgl/storage/reachability.m

@@ -25,7 +25,7 @@
  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <mbgl/platform/darwin/reachability.h>
+#import <mbgl/storage/reachability.h>
 
 #import <sys/socket.h>
 #import <netinet/in.h>

platform/ios/config.cmake

@@ -28,9 +28,10 @@ macro(mbgl_platform_core)
         PRIVATE platform/default/sqlite3.hpp
 
         # Misc
+        PRIVATE platform/darwin/mbgl/storage/reachability.h
+        PRIVATE platform/darwin/mbgl/storage/reachability.m
         PRIVATE platform/darwin/src/log_nslog.mm
         PRIVATE platform/darwin/src/nsthread.mm
-        PRIVATE platform/darwin/src/reachability.m
         PRIVATE platform/darwin/src/string_nsstring.mm
 
         # Image handling
@@ -60,6 +61,7 @@ macro(mbgl_platform_core)
     )
 
     target_include_directories(mbgl-core
+        PUBLIC platform/darwin
         PRIVATE platform/default
     )
 

platform/ios/src/MGLMapView.mm

@@ -13,7 +13,7 @@
 #include <mbgl/map/camera.hpp>
 #include <mbgl/map/mode.hpp>
 #include <mbgl/platform/platform.hpp>
-#include <mbgl/platform/darwin/reachability.h>
+#include <mbgl/storage/reachability.h>
 #include <mbgl/platform/default/thread_pool.hpp>
 #include <mbgl/storage/default_file_source.hpp>
 #include <mbgl/storage/network_status.hpp>

platform/ios/src/MGLMapboxEvents.m

@@ -7,7 +7,7 @@
 #import "MGLAPIClient.h"
 #import "MGLLocationManager.h"
 
-#include <mbgl/platform/darwin/reachability.h>
+#include <mbgl/storage/reachability.h>
 #include <sys/sysctl.h>
 
 // Event types

platform/macos/config.cmake

@@ -28,9 +28,10 @@ macro(mbgl_platform_core)
         PRIVATE platform/default/sqlite3.hpp
 
         # Misc
+        PRIVATE platform/darwin/mbgl/storage/reachability.h
+        PRIVATE platform/darwin/mbgl/storage/reachability.m
         PRIVATE platform/darwin/src/log_nslog.mm
         PRIVATE platform/darwin/src/nsthread.mm
-        PRIVATE platform/darwin/src/reachability.m
         PRIVATE platform/darwin/src/string_nsstring.mm
 
         # Image handling
@@ -53,6 +54,7 @@ macro(mbgl_platform_core)
     )
 
     target_include_directories(mbgl-core
+        PUBLIC platform/darwin
         PRIVATE platform/default
     )
 

platform/macos/src/MGLMapView.mm

@@ -21,7 +21,7 @@
 #import <mbgl/mbgl.hpp>
 #import <mbgl/annotation/annotation.hpp>
 #import <mbgl/map/camera.hpp>
-#import <mbgl/platform/darwin/reachability.h>
+#import <mbgl/storage/reachability.h>
 #import <mbgl/platform/default/thread_pool.hpp>
 #import <mbgl/gl/extension.hpp>
 #import <mbgl/gl/context.hpp>