From a71868fc8d68fec0b34988d90ef1165c0c87d1db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Tue, 22 Nov 2016 11:44:05 +0100
Subject: [PATCH] [build] move Reachability to platform/darwin

---
 cmake/core-files.cmake                                        | 3 ---
 .../darwin => platform/darwin/mbgl/storage}/reachability.h    | 0
 platform/darwin/{src => mbgl/storage}/reachability.m          | 2 +-
 platform/ios/config.cmake                                     | 4 +++-
 platform/ios/src/MGLMapView.mm                                | 2 +-
 platform/ios/src/MGLMapboxEvents.m                            | 2 +-
 platform/macos/config.cmake                                   | 4 +++-
 platform/macos/src/MGLMapView.mm                              | 2 +-
 8 files changed, 10 insertions(+), 9 deletions(-)
 rename {include/mbgl/platform/darwin => platform/darwin/mbgl/storage}/reachability.h (100%)
 rename platform/darwin/{src => mbgl/storage}/reachability.m (99%)

diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake
index 8f3d5839e..15dc55478 100644
--- a/cmake/core-files.cmake
+++ b/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
diff --git a/include/mbgl/platform/darwin/reachability.h b/platform/darwin/mbgl/storage/reachability.h
similarity index 100%
rename from include/mbgl/platform/darwin/reachability.h
rename to platform/darwin/mbgl/storage/reachability.h
diff --git a/platform/darwin/src/reachability.m b/platform/darwin/mbgl/storage/reachability.m
similarity index 99%
rename from platform/darwin/src/reachability.m
rename to platform/darwin/mbgl/storage/reachability.m
index 8abcf5ae6..aa6746a2a 100644
--- a/platform/darwin/src/reachability.m
+++ b/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>
diff --git a/platform/ios/config.cmake b/platform/ios/config.cmake
index 0813d0338..3a574b281 100644
--- a/platform/ios/config.cmake
+++ b/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
     )
 
diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm
index 466912c21..45ff2f826 100644
--- a/platform/ios/src/MGLMapView.mm
+++ b/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>
diff --git a/platform/ios/src/MGLMapboxEvents.m b/platform/ios/src/MGLMapboxEvents.m
index d86114d01..e26ca51f8 100644
--- a/platform/ios/src/MGLMapboxEvents.m
+++ b/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
diff --git a/platform/macos/config.cmake b/platform/macos/config.cmake
index 74dd5ebf3..b0f26ab2b 100644
--- a/platform/macos/config.cmake
+++ b/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
     )
 
diff --git a/platform/macos/src/MGLMapView.mm b/platform/macos/src/MGLMapView.mm
index 513687f94..288ed68d6 100644
--- a/platform/macos/src/MGLMapView.mm
+++ b/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>