From 07998a05ed9805717bf891ca285b9386a75654d1 Mon Sep 17 00:00:00 2001 From: Nick Bourdakos Date: Wed, 21 Dec 2022 18:04:02 -0800 Subject: [PATCH] Change "ios" package name to "apple" since its usage isn't limited to iOS PiperOrigin-RevId: 497046967 --- Package.swift | 22 ++++---- connections/BUILD | 2 +- connections/clients/ios/BUILD | 2 +- .../clients/ios/Internal/GNCAdvertiser.mm | 2 +- .../clients/ios/Internal/GNCCoreConnection.mm | 7 +-- .../clients/ios/Internal/GNCDiscoverer.mm | 2 +- .../ios/Internal/GNCPayloadListener.mm | 2 +- .../clients/swift/NearbyCoreAdapter/BUILD | 2 +- connections/implementation/proto/BUILD | 2 +- docs/ios_build.md | 2 +- .../implementation/{ios => apple}/BUILD | 6 +-- .../implementation/{ios => apple}/GNCUtils.h | 0 .../implementation/{ios => apple}/GNCUtils.m | 2 +- .../{ios => apple}/Mediums/BUILD | 10 ++-- .../Mediums/Ble/GNCMBleCentral.h | 2 +- .../Mediums/Ble/GNCMBleCentral.m | 12 ++--- .../Mediums/Ble/GNCMBleConnection.h | 2 +- .../Mediums/Ble/GNCMBleConnection.m | 10 ++-- .../Mediums/Ble/GNCMBlePeripheral.h | 2 +- .../Mediums/Ble/GNCMBlePeripheral.m | 14 ++--- .../{ios => apple}/Mediums/Ble/GNCMBleUtils.h | 0 .../Mediums/Ble/GNCMBleUtils.mm | 6 +-- .../{ios => apple}/Mediums/Ble/Sockets/BUILD | 0 .../Central/GNSCentralManager+Private.h | 2 +- .../Source/Central/GNSCentralManager.h | 0 .../Source/Central/GNSCentralManager.m | 8 +-- .../Central/GNSCentralPeerManager+Private.h | 4 +- .../Source/Central/GNSCentralPeerManager.h | 0 .../Source/Central/GNSCentralPeerManager.m | 18 +++---- .../Mediums/Ble/Sockets/Source/GNSCentral.h | 6 +-- .../Ble/Sockets/Source/GNSPeripheral.h | 6 +-- .../Mediums/Ble/Sockets/Source/GNSShared.h | 4 +- .../Peripheral/GNSPeripheralManager+Private.h | 4 +- .../Source/Peripheral/GNSPeripheralManager.h | 2 +- .../Source/Peripheral/GNSPeripheralManager.m | 6 +-- .../GNSPeripheralServiceManager+Private.h | 4 +- .../Peripheral/GNSPeripheralServiceManager.h | 0 .../Peripheral/GNSPeripheralServiceManager.m | 10 ++-- .../Sockets/Source/Shared/GNSSocket+Private.h | 4 +- .../Ble/Sockets/Source/Shared/GNSSocket.h | 2 +- .../Ble/Sockets/Source/Shared/GNSSocket.m | 4 +- .../Sockets/Source/Shared/GNSUtils+Private.h | 2 +- .../Ble/Sockets/Source/Shared/GNSUtils.h | 0 .../Ble/Sockets/Source/Shared/GNSUtils.m | 2 +- .../Sockets/Source/Shared/GNSWeavePacket.h | 0 .../Sockets/Source/Shared/GNSWeavePacket.m | 4 +- .../Tests/Central/GNSCentralManagerTest.m | 4 +- .../Tests/Central/GNSCentralPeerManagerTest.m | 6 +-- .../Peripheral/GNSPeripheralManagerTest.m | 6 +-- .../GNSPeripheralServiceManagerTest.m | 10 ++-- .../Ble/Sockets/Tests/Shared/GNSSocketTest.m | 4 +- .../Sockets/Tests/Shared/GNSWeavePacketTest.m | 4 +- .../{ios => apple}/Mediums/GNCLeaks.h | 0 .../{ios => apple}/Mediums/GNCLeaks.m | 2 +- .../{ios => apple}/Mediums/GNCMConnection.h | 0 .../{ios => apple}/Mediums/GNCMConnection.m | 2 +- .../Mediums/WifiLan/GNCMBonjourBrowser.h | 2 +- .../Mediums/WifiLan/GNCMBonjourBrowser.m | 8 +-- .../Mediums/WifiLan/GNCMBonjourConnection.h | 2 +- .../Mediums/WifiLan/GNCMBonjourConnection.m | 4 +- .../Mediums/WifiLan/GNCMBonjourService.h | 2 +- .../Mediums/WifiLan/GNCMBonjourService.m | 8 +-- .../Mediums/WifiLan/GNCMBonjourUtils.h | 0 .../Mediums/WifiLan/GNCMBonjourUtils.m | 2 +- .../implementation/{ios => apple}/Tests/BUILD | 4 +- .../{ios => apple}/Tests/GNCBleTest.mm | 5 +- .../Tests/GNCBluetoothAdapterTest.mm | 6 +-- .../{ios => apple}/Tests/GNCCryptoTest.mm | 0 .../Tests/GNCMultiThreadExecutorTest.mm | 0 .../Tests/GNCScheduledExecutorTest.mm | 0 .../Tests/GNCSingleThreadExecutorTest.mm | 0 .../{ios => apple}/Tests/GNCUtilsTest.mm | 2 +- .../{ios => apple}/atomic_boolean.h | 10 ++-- .../{ios => apple}/atomic_boolean_test.cc | 6 +-- .../{ios => apple}/atomic_uint32.h | 10 ++-- .../{ios => apple}/atomic_uint32_test.cc | 6 +-- .../implementation/{ios => apple}/ble.h | 15 +++--- .../implementation/{ios => apple}/ble.mm | 15 +++--- .../{ios => apple}/bluetooth_adapter.h | 13 ++--- .../{ios => apple}/bluetooth_adapter.mm | 6 +-- .../{ios => apple}/condition_variable.cc | 8 +-- .../{ios => apple}/condition_variable.h | 14 ++--- .../{ios => apple}/condition_variable_test.cc | 8 +-- .../{ios => apple}/count_down_latch.cc | 6 +-- .../{ios => apple}/count_down_latch.h | 10 ++-- .../{ios => apple}/count_down_latch_test.cc | 6 +-- .../implementation/{ios => apple}/crypto.mm | 4 +- .../{ios => apple}/log_message.h | 10 ++-- .../{ios => apple}/log_message.mm | 8 +-- .../{ios => apple}/multi_thread_executor.h | 12 ++--- .../{ios => apple}/multi_thread_executor.mm | 8 +-- .../implementation/{ios => apple}/mutex.h | 10 ++-- .../{ios => apple}/mutex_test.cc | 6 +-- .../implementation/{ios => apple}/platform.mm | 52 +++++++++---------- .../{ios => apple}/scheduled_executor.h | 10 ++-- .../{ios => apple}/scheduled_executor.mm | 14 ++--- .../{ios => apple}/single_thread_executor.h | 12 ++--- .../{ios => apple}/system_clock.cc | 0 .../implementation/{ios => apple}/utils.h | 0 .../implementation/{ios => apple}/utils.mm | 2 +- .../implementation/{ios => apple}/wifi_lan.h | 12 ++--- .../implementation/{ios => apple}/wifi_lan.mm | 14 ++--- 102 files changed, 300 insertions(+), 293 deletions(-) rename internal/platform/implementation/{ios => apple}/BUILD (95%) rename internal/platform/implementation/{ios => apple}/GNCUtils.h (100%) rename internal/platform/implementation/{ios => apple}/GNCUtils.m (95%) rename internal/platform/implementation/{ios => apple}/Mediums/BUILD (84%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/GNCMBleCentral.h (98%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/GNCMBleCentral.m (97%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/GNCMBleConnection.h (95%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/GNCMBleConnection.m (92%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/GNCMBlePeripheral.h (97%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/GNCMBlePeripheral.m (94%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/GNCMBleUtils.h (100%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/GNCMBleUtils.mm (96%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/Sockets/BUILD (100%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/Sockets/Source/Central/GNSCentralManager+Private.h (91%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/Sockets/Source/Central/GNSCentralManager.h (100%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/Sockets/Source/Central/GNSCentralManager.m (97%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager+Private.h (91%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager.h (100%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager.m (97%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/Sockets/Source/GNSCentral.h (66%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/Sockets/Source/GNSPeripheral.h (65%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/Sockets/Source/GNSShared.h (75%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager+Private.h (91%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager.h (97%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager.m (98%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager+Private.h (95%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager.h (100%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager.m (97%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/Sockets/Source/Shared/GNSSocket+Private.h (95%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/Sockets/Source/Shared/GNSSocket.h (98%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/Sockets/Source/Shared/GNSSocket.m (97%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/Sockets/Source/Shared/GNSUtils+Private.h (93%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/Sockets/Source/Shared/GNSUtils.h (100%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/Sockets/Source/Shared/GNSUtils.m (97%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/Sockets/Source/Shared/GNSWeavePacket.h (100%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/Sockets/Source/Shared/GNSWeavePacket.m (98%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/Sockets/Tests/Central/GNSCentralManagerTest.m (98%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/Sockets/Tests/Central/GNSCentralPeerManagerTest.m (98%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/Sockets/Tests/Peripheral/GNSPeripheralManagerTest.m (99%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/Sockets/Tests/Peripheral/GNSPeripheralServiceManagerTest.m (98%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/Sockets/Tests/Shared/GNSSocketTest.m (98%) rename internal/platform/implementation/{ios => apple}/Mediums/Ble/Sockets/Tests/Shared/GNSWeavePacketTest.m (98%) rename internal/platform/implementation/{ios => apple}/Mediums/GNCLeaks.h (100%) rename internal/platform/implementation/{ios => apple}/Mediums/GNCLeaks.m (94%) rename internal/platform/implementation/{ios => apple}/Mediums/GNCMConnection.h (100%) rename internal/platform/implementation/{ios => apple}/Mediums/GNCMConnection.m (93%) rename internal/platform/implementation/{ios => apple}/Mediums/WifiLan/GNCMBonjourBrowser.h (95%) rename internal/platform/implementation/{ios => apple}/Mediums/WifiLan/GNCMBonjourBrowser.m (95%) rename internal/platform/implementation/{ios => apple}/Mediums/WifiLan/GNCMBonjourConnection.h (94%) rename internal/platform/implementation/{ios => apple}/Mediums/WifiLan/GNCMBonjourConnection.m (97%) rename internal/platform/implementation/{ios => apple}/Mediums/WifiLan/GNCMBonjourService.h (96%) rename internal/platform/implementation/{ios => apple}/Mediums/WifiLan/GNCMBonjourService.m (90%) rename internal/platform/implementation/{ios => apple}/Mediums/WifiLan/GNCMBonjourUtils.h (100%) rename internal/platform/implementation/{ios => apple}/Mediums/WifiLan/GNCMBonjourUtils.m (88%) rename internal/platform/implementation/{ios => apple}/Tests/BUILD (91%) rename internal/platform/implementation/{ios => apple}/Tests/GNCBleTest.mm (95%) rename internal/platform/implementation/{ios => apple}/Tests/GNCBluetoothAdapterTest.mm (93%) rename internal/platform/implementation/{ios => apple}/Tests/GNCCryptoTest.mm (100%) rename internal/platform/implementation/{ios => apple}/Tests/GNCMultiThreadExecutorTest.mm (100%) rename internal/platform/implementation/{ios => apple}/Tests/GNCScheduledExecutorTest.mm (100%) rename internal/platform/implementation/{ios => apple}/Tests/GNCSingleThreadExecutorTest.mm (100%) rename internal/platform/implementation/{ios => apple}/Tests/GNCUtilsTest.mm (96%) rename internal/platform/implementation/{ios => apple}/atomic_boolean.h (87%) rename internal/platform/implementation/{ios => apple}/atomic_boolean_test.cc (94%) rename internal/platform/implementation/{ios => apple}/atomic_uint32.h (87%) rename internal/platform/implementation/{ios => apple}/atomic_uint32_test.cc (94%) rename internal/platform/implementation/{ios => apple}/ble.h (94%) rename internal/platform/implementation/{ios => apple}/ble.mm (98%) rename internal/platform/implementation/{ios => apple}/bluetooth_adapter.h (88%) rename internal/platform/implementation/{ios => apple}/bluetooth_adapter.mm (88%) rename internal/platform/implementation/{ios => apple}/condition_variable.cc (85%) rename internal/platform/implementation/{ios => apple}/condition_variable.h (79%) rename internal/platform/implementation/{ios => apple}/condition_variable_test.cc (91%) rename internal/platform/implementation/{ios => apple}/count_down_latch.cc (91%) rename internal/platform/implementation/{ios => apple}/count_down_latch.h (87%) rename internal/platform/implementation/{ios => apple}/count_down_latch_test.cc (94%) rename internal/platform/implementation/{ios => apple}/crypto.mm (90%) rename internal/platform/implementation/{ios => apple}/log_message.h (87%) rename internal/platform/implementation/{ios => apple}/log_message.mm (93%) rename internal/platform/implementation/{ios => apple}/multi_thread_executor.h (83%) rename internal/platform/implementation/{ios => apple}/multi_thread_executor.mm (86%) rename internal/platform/implementation/{ios => apple}/mutex.h (93%) rename internal/platform/implementation/{ios => apple}/mutex_test.cc (96%) rename internal/platform/implementation/{ios => apple}/platform.mm (76%) rename internal/platform/implementation/{ios => apple}/scheduled_executor.h (90%) rename internal/platform/implementation/{ios => apple}/scheduled_executor.mm (93%) rename internal/platform/implementation/{ios => apple}/single_thread_executor.h (75%) rename internal/platform/implementation/{ios => apple}/system_clock.cc (100%) rename internal/platform/implementation/{ios => apple}/utils.h (100%) rename internal/platform/implementation/{ios => apple}/utils.mm (98%) rename internal/platform/implementation/{ios => apple}/wifi_lan.h (96%) rename internal/platform/implementation/{ios => apple}/wifi_lan.mm (97%) diff --git a/Package.swift b/Package.swift index 30676e7d..534c3547 100644 --- a/Package.swift +++ b/Package.swift @@ -390,8 +390,8 @@ let package = Package( "connections/samples", "docs", "internal/platform/implementation/g3", - "internal/platform/implementation/ios/Tests", - "internal/platform/implementation/ios/Mediums/Ble/Sockets/Tests", + "internal/platform/implementation/apple/Tests", + "internal/platform/implementation/apple/Mediums/Ble/Sockets/Tests", "internal/platform/implementation/windows", "third_party", "CONTRIBUTING.md", @@ -409,10 +409,10 @@ let package = Package( "internal/crypto/BUILD", "internal/crypto/BUILD.gn", "internal/platform/implementation/shared/BUILD", - "internal/platform/implementation/ios/Mediums/BUILD", - "internal/platform/implementation/ios/Mediums/Ble/Sockets/BUILD", - "internal/platform/implementation/ios/Tests/BUILD", - "internal/platform/implementation/ios/BUILD", + "internal/platform/implementation/apple/Mediums/BUILD", + "internal/platform/implementation/apple/Mediums/Ble/Sockets/BUILD", + "internal/platform/implementation/apple/Tests/BUILD", + "internal/platform/implementation/apple/BUILD", "internal/platform/implementation/BUILD", "internal/platform/BUILD", "internal/analytics/BUILD", @@ -505,11 +505,11 @@ let package = Package( "internal/platform/ble_test.cc", "internal/platform/ble_v2_test.cc", "internal/platform/prng_test.cc", - "internal/platform/implementation/ios/count_down_latch_test.cc", - "internal/platform/implementation/ios/condition_variable_test.cc", - "internal/platform/implementation/ios/mutex_test.cc", - "internal/platform/implementation/ios/atomic_boolean_test.cc", - "internal/platform/implementation/ios/atomic_uint32_test.cc", + "internal/platform/implementation/apple/count_down_latch_test.cc", + "internal/platform/implementation/apple/condition_variable_test.cc", + "internal/platform/implementation/apple/mutex_test.cc", + "internal/platform/implementation/apple/atomic_boolean_test.cc", + "internal/platform/implementation/apple/atomic_uint32_test.cc", "internal/platform/implementation/shared/file_test.cc", "internal/platform/atomic_boolean_test.cc", "internal/platform/exception_test.cc", diff --git a/connections/BUILD b/connections/BUILD index a939ae41..688ecfde 100644 --- a/connections/BUILD +++ b/connections/BUILD @@ -71,7 +71,7 @@ cc_library( visibility = [ "//connections:__subpackages__", "//internal/analytics:__subpackages__", - "//internal/platform/implementation/ios:__subpackages__", + "//internal/platform/implementation/apple:__subpackages__", "//location/nearby/testing:__subpackages__", ], deps = [ diff --git a/connections/clients/ios/BUILD b/connections/clients/ios/BUILD index bd5a7732..07148fbb 100644 --- a/connections/clients/ios/BUILD +++ b/connections/clients/ios/BUILD @@ -49,7 +49,7 @@ objc_library( deps = [ "//connections:core", "//connections:core_types", - "//internal/platform/implementation/ios:Platform", + "//internal/platform/implementation/apple", "//third_party/apple_frameworks:Foundation", "//third_party/objective_c/google_toolbox_for_mac:GTM_Logger", "@com_google_absl//absl/functional:bind_front", diff --git a/connections/clients/ios/Internal/GNCAdvertiser.mm b/connections/clients/ios/Internal/GNCAdvertiser.mm index 0a16401d..f5ae21b3 100644 --- a/connections/clients/ios/Internal/GNCAdvertiser.mm +++ b/connections/clients/ios/Internal/GNCAdvertiser.mm @@ -28,7 +28,7 @@ #include "connections/params.h" #include "connections/status.h" #include "internal/platform/byte_array.h" -#import "internal/platform/implementation/ios/utils.h" +#import "internal/platform/implementation/apple/utils.h" #import "GoogleToolboxForMac/GTMLogger.h" NS_ASSUME_NONNULL_BEGIN diff --git a/connections/clients/ios/Internal/GNCCoreConnection.mm b/connections/clients/ios/Internal/GNCCoreConnection.mm index 1e638784..d9f14cb4 100644 --- a/connections/clients/ios/Internal/GNCCoreConnection.mm +++ b/connections/clients/ios/Internal/GNCCoreConnection.mm @@ -16,17 +16,18 @@ #include -#import "connections/clients/ios/Public/NearbyConnections/GNCConnection.h" -#import "connections/clients/ios/Public/NearbyConnections/GNCPayload.h" #include "connections/core.h" #include "connections/payload.h" #include "internal/platform/exception.h" #include "internal/platform/file.h" #include "internal/platform/implementation/input_file.h" -#import "internal/platform/implementation/ios/utils.h" #include "internal/platform/input_stream.h" #include "internal/platform/payload_id.h" +#import "connections/clients/ios/Public/NearbyConnections/GNCConnection.h" +#import "connections/clients/ios/Public/NearbyConnections/GNCPayload.h" +#import "internal/platform/implementation/apple/utils.h" + using ::location::nearby::ByteArrayFromNSData; using ::location::nearby::CppStringFromObjCString; using ::location::nearby::InputFile; diff --git a/connections/clients/ios/Internal/GNCDiscoverer.mm b/connections/clients/ios/Internal/GNCDiscoverer.mm index 1a289553..560de783 100644 --- a/connections/clients/ios/Internal/GNCDiscoverer.mm +++ b/connections/clients/ios/Internal/GNCDiscoverer.mm @@ -29,7 +29,7 @@ #include "connections/listeners.h" #include "connections/status.h" #include "internal/platform/byte_array.h" -#import "internal/platform/implementation/ios/utils.h" +#import "internal/platform/implementation/apple/utils.h" #import "GoogleToolboxForMac/GTMLogger.h" NS_ASSUME_NONNULL_BEGIN diff --git a/connections/clients/ios/Internal/GNCPayloadListener.mm b/connections/clients/ios/Internal/GNCPayloadListener.mm index 128375b4..63583a4b 100644 --- a/connections/clients/ios/Internal/GNCPayloadListener.mm +++ b/connections/clients/ios/Internal/GNCPayloadListener.mm @@ -27,7 +27,7 @@ #include "internal/platform/byte_array.h" #include "internal/platform/exception.h" #include "internal/platform/file.h" -#include "internal/platform/implementation/ios/utils.h" +#include "internal/platform/implementation/apple/utils.h" #include "internal/platform/input_stream.h" NS_ASSUME_NONNULL_BEGIN diff --git a/connections/clients/swift/NearbyCoreAdapter/BUILD b/connections/clients/swift/NearbyCoreAdapter/BUILD index 10b2caf5..4e2203f2 100644 --- a/connections/clients/swift/NearbyCoreAdapter/BUILD +++ b/connections/clients/swift/NearbyCoreAdapter/BUILD @@ -33,7 +33,7 @@ objc_library( "//connections:core", "//connections:core_types", "//internal/platform:base", - "//internal/platform/implementation/ios:Platform", # buildcleaner: keep + "//internal/platform/implementation/apple", # buildcleaner: keep "//third_party/apple_frameworks:Foundation", "//third_party/apple_frameworks:ObjectiveC", ], diff --git a/connections/implementation/proto/BUILD b/connections/implementation/proto/BUILD index 823a9ac0..fb775744 100644 --- a/connections/implementation/proto/BUILD +++ b/connections/implementation/proto/BUILD @@ -20,7 +20,7 @@ proto_library( "offline_wire_formats.proto", ], visibility = [ - "//internal/platform/implementation/ios:__subpackages__", + "//internal/platform/implementation/apple:__subpackages__", ], ) diff --git a/docs/ios_build.md b/docs/ios_build.md index 753335cc..55f99477 100644 --- a/docs/ios_build.md +++ b/docs/ios_build.md @@ -1,3 +1,3 @@ # Building Nearby on IOS -We do not yet support build from source. Instead a prebuilt library is provided. See [this link](https://github.com/google/nearby/blob/master/internal/platform/implementation/ios/Example/NearbyConnectionsExample/README.md) for a sample app using the prebuilt library. +We do not yet support build from source. Instead a prebuilt library is provided. See [this link](https://github.com/google/nearby/blob/master/connections/samples/ios/NearbyConnectionsExample/README.md) for a sample app using the prebuilt library. diff --git a/internal/platform/implementation/ios/BUILD b/internal/platform/implementation/apple/BUILD similarity index 95% rename from internal/platform/implementation/ios/BUILD rename to internal/platform/implementation/apple/BUILD index 56894da8..0712631b 100644 --- a/internal/platform/implementation/ios/BUILD +++ b/internal/platform/implementation/apple/BUILD @@ -16,11 +16,11 @@ licenses(["notice"]) package(default_visibility = [ "//connections/clients/ios:__subpackages__", "//connections/clients/swift:__subpackages__", - "//internal/platform/implementation/ios:__subpackages__", + "//internal/platform/implementation/apple:__subpackages__", ]) objc_library( - name = "Platform", + name = "apple", srcs = [ "ble.mm", "bluetooth_adapter.mm", @@ -48,7 +48,7 @@ objc_library( ":Shared", "//internal/platform/implementation:platform", "//internal/platform/implementation:types", - "//internal/platform/implementation/ios/Mediums", + "//internal/platform/implementation/apple/Mediums", "//internal/platform/implementation/shared:file", "//third_party/apple_frameworks:CoreBluetooth", "//third_party/apple_frameworks:CoreFoundation", diff --git a/internal/platform/implementation/ios/GNCUtils.h b/internal/platform/implementation/apple/GNCUtils.h similarity index 100% rename from internal/platform/implementation/ios/GNCUtils.h rename to internal/platform/implementation/apple/GNCUtils.h diff --git a/internal/platform/implementation/ios/GNCUtils.m b/internal/platform/implementation/apple/GNCUtils.m similarity index 95% rename from internal/platform/implementation/ios/GNCUtils.m rename to internal/platform/implementation/apple/GNCUtils.m index 47d05355..e773db3f 100644 --- a/internal/platform/implementation/ios/GNCUtils.m +++ b/internal/platform/implementation/apple/GNCUtils.m @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/GNCUtils.h" +#import "internal/platform/implementation/apple/GNCUtils.h" #import diff --git a/internal/platform/implementation/ios/Mediums/BUILD b/internal/platform/implementation/apple/Mediums/BUILD similarity index 84% rename from internal/platform/implementation/ios/Mediums/BUILD rename to internal/platform/implementation/apple/Mediums/BUILD index 13e80a0e..4d84ac4d 100644 --- a/internal/platform/implementation/ios/Mediums/BUILD +++ b/internal/platform/implementation/apple/Mediums/BUILD @@ -13,7 +13,7 @@ # limitations under the License. licenses(["notice"]) -package(default_visibility = ["//internal/platform/implementation/ios:__subpackages__"]) +package(default_visibility = ["//internal/platform/implementation/apple:__subpackages__"]) objc_library( name = "Mediums", @@ -42,10 +42,10 @@ objc_library( "WifiLan/GNCMBonjourUtils.h", ], deps = [ - "//internal/platform/implementation/ios:Shared", - "//internal/platform/implementation/ios/Mediums/Ble/Sockets:Central", - "//internal/platform/implementation/ios/Mediums/Ble/Sockets:Peripheral", - "//internal/platform/implementation/ios/Mediums/Ble/Sockets:Shared", + "//internal/platform/implementation/apple:Shared", + "//internal/platform/implementation/apple/Mediums/Ble/Sockets:Central", + "//internal/platform/implementation/apple/Mediums/Ble/Sockets:Peripheral", + "//internal/platform/implementation/apple/Mediums/Ble/Sockets:Shared", "//proto/mediums:ble_frames_cc_proto", "//third_party/apple_frameworks:CoreBluetooth", "//third_party/apple_frameworks:Foundation", diff --git a/internal/platform/implementation/ios/Mediums/Ble/GNCMBleCentral.h b/internal/platform/implementation/apple/Mediums/Ble/GNCMBleCentral.h similarity index 98% rename from internal/platform/implementation/ios/Mediums/Ble/GNCMBleCentral.h rename to internal/platform/implementation/apple/Mediums/Ble/GNCMBleCentral.h index e40b783f..d617113f 100644 --- a/internal/platform/implementation/ios/Mediums/Ble/GNCMBleCentral.h +++ b/internal/platform/implementation/apple/Mediums/Ble/GNCMBleCentral.h @@ -14,7 +14,7 @@ #import -#import "internal/platform/implementation/ios/Mediums/GNCMConnection.h" +#import "internal/platform/implementation/apple/Mediums/GNCMConnection.h" @class CBUUID; diff --git a/internal/platform/implementation/ios/Mediums/Ble/GNCMBleCentral.m b/internal/platform/implementation/apple/Mediums/Ble/GNCMBleCentral.m similarity index 97% rename from internal/platform/implementation/ios/Mediums/Ble/GNCMBleCentral.m rename to internal/platform/implementation/apple/Mediums/Ble/GNCMBleCentral.m index 2148a45f..bc5ea3aa 100644 --- a/internal/platform/implementation/ios/Mediums/Ble/GNCMBleCentral.m +++ b/internal/platform/implementation/apple/Mediums/Ble/GNCMBleCentral.m @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/Mediums/Ble/GNCMBleCentral.h" +#import "internal/platform/implementation/apple/Mediums/Ble/GNCMBleCentral.h" -#import "internal/platform/implementation/ios/Mediums/Ble/GNCMBleConnection.h" -#import "internal/platform/implementation/ios/Mediums/Ble/GNCMBleUtils.h" -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Central/GNSCentralManager.h" -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager.h" -#import "internal/platform/implementation/ios/Mediums/GNCMConnection.h" +#import "internal/platform/implementation/apple/Mediums/Ble/GNCMBleConnection.h" +#import "internal/platform/implementation/apple/Mediums/Ble/GNCMBleUtils.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralManager.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager.h" +#import "internal/platform/implementation/apple/Mediums/GNCMConnection.h" NS_ASSUME_NONNULL_BEGIN diff --git a/internal/platform/implementation/ios/Mediums/Ble/GNCMBleConnection.h b/internal/platform/implementation/apple/Mediums/Ble/GNCMBleConnection.h similarity index 95% rename from internal/platform/implementation/ios/Mediums/Ble/GNCMBleConnection.h rename to internal/platform/implementation/apple/Mediums/Ble/GNCMBleConnection.h index 8897a6d7..dd9114f6 100644 --- a/internal/platform/implementation/ios/Mediums/Ble/GNCMBleConnection.h +++ b/internal/platform/implementation/apple/Mediums/Ble/GNCMBleConnection.h @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/Mediums/GNCMConnection.h" +#import "internal/platform/implementation/apple/Mediums/GNCMConnection.h" NS_ASSUME_NONNULL_BEGIN diff --git a/internal/platform/implementation/ios/Mediums/Ble/GNCMBleConnection.m b/internal/platform/implementation/apple/Mediums/Ble/GNCMBleConnection.m similarity index 92% rename from internal/platform/implementation/ios/Mediums/Ble/GNCMBleConnection.m rename to internal/platform/implementation/apple/Mediums/Ble/GNCMBleConnection.m index acb950ed..1ac7f9f4 100644 --- a/internal/platform/implementation/ios/Mediums/Ble/GNCMBleConnection.m +++ b/internal/platform/implementation/apple/Mediums/Ble/GNCMBleConnection.m @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/Mediums/Ble/GNCMBleConnection.h" +#import "internal/platform/implementation/apple/Mediums/Ble/GNCMBleConnection.h" -#import "internal/platform/implementation/ios/Mediums/Ble/GNCMBleUtils.h" -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSSocket.h" -#import "internal/platform/implementation/ios/Mediums/GNCLeaks.h" -#import "internal/platform/implementation/ios/Mediums/GNCMConnection.h" +#import "internal/platform/implementation/apple/Mediums/Ble/GNCMBleUtils.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSSocket.h" +#import "internal/platform/implementation/apple/Mediums/GNCLeaks.h" +#import "internal/platform/implementation/apple/Mediums/GNCMConnection.h" #import "GoogleToolboxForMac/GTMLogger.h" NS_ASSUME_NONNULL_BEGIN diff --git a/internal/platform/implementation/ios/Mediums/Ble/GNCMBlePeripheral.h b/internal/platform/implementation/apple/Mediums/Ble/GNCMBlePeripheral.h similarity index 97% rename from internal/platform/implementation/ios/Mediums/Ble/GNCMBlePeripheral.h rename to internal/platform/implementation/apple/Mediums/Ble/GNCMBlePeripheral.h index 87361cb5..8511da36 100644 --- a/internal/platform/implementation/ios/Mediums/Ble/GNCMBlePeripheral.h +++ b/internal/platform/implementation/apple/Mediums/Ble/GNCMBlePeripheral.h @@ -14,7 +14,7 @@ #import -#import "internal/platform/implementation/ios/Mediums/GNCMConnection.h" +#import "internal/platform/implementation/apple/Mediums/GNCMConnection.h" @class CBCharacteristic; @class CBUUID; diff --git a/internal/platform/implementation/ios/Mediums/Ble/GNCMBlePeripheral.m b/internal/platform/implementation/apple/Mediums/Ble/GNCMBlePeripheral.m similarity index 94% rename from internal/platform/implementation/ios/Mediums/Ble/GNCMBlePeripheral.m rename to internal/platform/implementation/apple/Mediums/Ble/GNCMBlePeripheral.m index 3961f7fe..d915a3c3 100644 --- a/internal/platform/implementation/ios/Mediums/Ble/GNCMBlePeripheral.m +++ b/internal/platform/implementation/apple/Mediums/Ble/GNCMBlePeripheral.m @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/Mediums/Ble/GNCMBlePeripheral.h" +#import "internal/platform/implementation/apple/Mediums/Ble/GNCMBlePeripheral.h" #import -#import "internal/platform/implementation/ios/GNCUtils.h" -#import "internal/platform/implementation/ios/Mediums/Ble/GNCMBleConnection.h" -#import "internal/platform/implementation/ios/Mediums/Ble/GNCMBleUtils.h" -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager.h" -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager.h" -#import "internal/platform/implementation/ios/Mediums/GNCMConnection.h" +#import "internal/platform/implementation/apple/GNCUtils.h" +#import "internal/platform/implementation/apple/Mediums/Ble/GNCMBleConnection.h" +#import "internal/platform/implementation/apple/Mediums/Ble/GNCMBleUtils.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager.h" +#import "internal/platform/implementation/apple/Mediums/GNCMConnection.h" NS_ASSUME_NONNULL_BEGIN diff --git a/internal/platform/implementation/ios/Mediums/Ble/GNCMBleUtils.h b/internal/platform/implementation/apple/Mediums/Ble/GNCMBleUtils.h similarity index 100% rename from internal/platform/implementation/ios/Mediums/Ble/GNCMBleUtils.h rename to internal/platform/implementation/apple/Mediums/Ble/GNCMBleUtils.h diff --git a/internal/platform/implementation/ios/Mediums/Ble/GNCMBleUtils.mm b/internal/platform/implementation/apple/Mediums/Ble/GNCMBleUtils.mm similarity index 96% rename from internal/platform/implementation/ios/Mediums/Ble/GNCMBleUtils.mm rename to internal/platform/implementation/apple/Mediums/Ble/GNCMBleUtils.mm index c24fa656..34e78407 100644 --- a/internal/platform/implementation/ios/Mediums/Ble/GNCMBleUtils.mm +++ b/internal/platform/implementation/apple/Mediums/Ble/GNCMBleUtils.mm @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/Mediums/Ble/GNCMBleUtils.h" +#import "internal/platform/implementation/apple/Mediums/Ble/GNCMBleUtils.h" #include #include -#import "internal/platform/implementation/ios/GNCUtils.h" -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSSocket.h" +#import "internal/platform/implementation/apple/GNCUtils.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSSocket.h" #include "proto/mediums/ble_frames.pb.h" #import "GoogleToolboxForMac/GTMLogger.h" diff --git a/internal/platform/implementation/ios/Mediums/Ble/Sockets/BUILD b/internal/platform/implementation/apple/Mediums/Ble/Sockets/BUILD similarity index 100% rename from internal/platform/implementation/ios/Mediums/Ble/Sockets/BUILD rename to internal/platform/implementation/apple/Mediums/Ble/Sockets/BUILD diff --git a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Central/GNSCentralManager+Private.h b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralManager+Private.h similarity index 91% rename from internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Central/GNSCentralManager+Private.h rename to internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralManager+Private.h index 7735c4b6..dd492510 100644 --- a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Central/GNSCentralManager+Private.h +++ b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralManager+Private.h @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Central/GNSCentralManager.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralManager.h" #import diff --git a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Central/GNSCentralManager.h b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralManager.h similarity index 100% rename from internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Central/GNSCentralManager.h rename to internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralManager.h diff --git a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Central/GNSCentralManager.m b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralManager.m similarity index 97% rename from internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Central/GNSCentralManager.m rename to internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralManager.m index 67ff7358..52dd9d2d 100644 --- a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Central/GNSCentralManager.m +++ b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralManager.m @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Central/GNSCentralManager.h" -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Central/GNSCentralManager+Private.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralManager.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralManager+Private.h" -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager+Private.h" -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager+Private.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager.h" #import "GoogleToolboxForMac/GTMLogger.h" NS_ASSUME_NONNULL_BEGIN diff --git a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager+Private.h b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager+Private.h similarity index 91% rename from internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager+Private.h rename to internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager+Private.h index b99a572b..b1602780 100644 --- a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager+Private.h +++ b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager+Private.h @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager.h" -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSSocket+Private.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSSocket+Private.h" NS_ASSUME_NONNULL_BEGIN diff --git a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager.h b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager.h similarity index 100% rename from internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager.h rename to internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager.h diff --git a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager.m b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager.m similarity index 97% rename from internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager.m rename to internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager.m index 92cb2a36..e53475b8 100644 --- a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager.m +++ b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager.m @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager.h" -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager+Private.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager+Private.h" -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Central/GNSCentralManager+Private.h" -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Central/GNSCentralManager.h" -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSSocket.h" -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSSocket+Private.h" -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSUtils.h" -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSUtils+Private.h" -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSWeavePacket.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralManager+Private.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralManager.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSSocket.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSSocket+Private.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSUtils.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSUtils+Private.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSWeavePacket.h" #import "GoogleToolboxForMac/GTMLogger.h" static const NSTimeInterval kMaxConnectionConfirmWaitTimeInSeconds = 2; diff --git a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/GNSCentral.h b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/GNSCentral.h similarity index 66% rename from internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/GNSCentral.h rename to internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/GNSCentral.h index 01b0891b..58f633dd 100644 --- a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/GNSCentral.h +++ b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/GNSCentral.h @@ -12,6 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Central/GNSCentralManager.h" -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager.h" -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/GNSShared.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralManager.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/GNSShared.h" diff --git a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/GNSPeripheral.h b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/GNSPeripheral.h similarity index 65% rename from internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/GNSPeripheral.h rename to internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/GNSPeripheral.h index 3be36325..c12b08b6 100644 --- a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/GNSPeripheral.h +++ b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/GNSPeripheral.h @@ -12,6 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/GNSShared.h" -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager.h" -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/GNSShared.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager.h" diff --git a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/GNSShared.h b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/GNSShared.h similarity index 75% rename from internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/GNSShared.h rename to internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/GNSShared.h index 4791bdac..bad04221 100644 --- a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/GNSShared.h +++ b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/GNSShared.h @@ -12,5 +12,5 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSSocket.h" -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSUtils.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSSocket.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSUtils.h" diff --git a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager+Private.h b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager+Private.h similarity index 91% rename from internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager+Private.h rename to internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager+Private.h index 1410b01b..57c5adc8 100644 --- a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager+Private.h +++ b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager+Private.h @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager.h" -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSSocket+Private.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSSocket+Private.h" @class GNSSocket; diff --git a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager.h b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager.h similarity index 97% rename from internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager.h rename to internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager.h index 6a0db786..8c325d73 100644 --- a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager.h +++ b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager.h @@ -15,7 +15,7 @@ #import #import -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSUtils.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSUtils.h" @class GNSPeripheralServiceManager; diff --git a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager.m b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager.m similarity index 98% rename from internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager.m rename to internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager.m index 38d549c7..fb8a68d2 100644 --- a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager.m +++ b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager.m @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager+Private.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager+Private.h" -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager+Private.h" -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSSocket+Private.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager+Private.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSSocket+Private.h" #import "GoogleToolboxForMac/GTMLogger.h" #if TARGET_OS_IPHONE diff --git a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager+Private.h b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager+Private.h similarity index 95% rename from internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager+Private.h rename to internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager+Private.h index 7716786a..0f7ba684 100644 --- a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager+Private.h +++ b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager+Private.h @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager.h" -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSSocket+Private.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSSocket+Private.h" typedef NS_ENUM(NSInteger, GNSBluetoothServiceState) { GNSBluetoothServiceStateNotAdded, diff --git a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager.h b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager.h similarity index 100% rename from internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager.h rename to internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager.h diff --git a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager.m b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager.m similarity index 97% rename from internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager.m rename to internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager.m index aa4a0be2..25fb4fe2 100644 --- a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager.m +++ b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager.m @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager+Private.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager+Private.h" -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager+Private.h" -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSSocket+Private.h" -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSUtils.h" -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSWeavePacket.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager+Private.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSSocket+Private.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSUtils.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSWeavePacket.h" #import "GoogleToolboxForMac/GTMLogger.h" // The Weave BLE protocol has only one valid version. diff --git a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSSocket+Private.h b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSSocket+Private.h similarity index 95% rename from internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSSocket+Private.h rename to internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSSocket+Private.h index 434dbf9e..38678076 100644 --- a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSSocket+Private.h +++ b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSSocket+Private.h @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSSocket.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSSocket.h" -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSUtils+Private.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSUtils+Private.h" @class GNSWeaveDataPacket; diff --git a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSSocket.h b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSSocket.h similarity index 98% rename from internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSSocket.h rename to internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSSocket.h index 3c4daba0..875181a7 100644 --- a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSSocket.h +++ b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSSocket.h @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSUtils.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSUtils.h" @class CBCentral; @class GNSPeripheralServiceManager; diff --git a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSSocket.m b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSSocket.m similarity index 97% rename from internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSSocket.m rename to internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSSocket.m index 2a1c342f..b8f19d1f 100644 --- a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSSocket.m +++ b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSSocket.m @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSSocket+Private.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSSocket+Private.h" -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSWeavePacket.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSWeavePacket.h" #import "GoogleToolboxForMac/GTMLogger.h" typedef void (^GNSIncomingChunkReceivedBlock)(NSData *incomingData); diff --git a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSUtils+Private.h b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSUtils+Private.h similarity index 93% rename from internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSUtils+Private.h rename to internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSUtils+Private.h index cea06b14..fa0987e8 100644 --- a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSUtils+Private.h +++ b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSUtils+Private.h @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSUtils.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSUtils.h" NS_ASSUME_NONNULL_BEGIN diff --git a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSUtils.h b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSUtils.h similarity index 100% rename from internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSUtils.h rename to internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSUtils.h diff --git a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSUtils.m b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSUtils.m similarity index 97% rename from internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSUtils.m rename to internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSUtils.m index 521e1604..d069beeb 100644 --- a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSUtils.m +++ b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSUtils.m @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSUtils+Private.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSUtils+Private.h" #import diff --git a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSWeavePacket.h b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSWeavePacket.h similarity index 100% rename from internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSWeavePacket.h rename to internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSWeavePacket.h diff --git a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSWeavePacket.m b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSWeavePacket.m similarity index 98% rename from internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSWeavePacket.m rename to internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSWeavePacket.m index 5244dc05..64caa782 100644 --- a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSWeavePacket.m +++ b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSWeavePacket.m @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSWeavePacket.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSWeavePacket.h" -#import "internal/platform/implementation/ios/Mediums/Ble/Sockets/Source/Shared/GNSUtils+Private.h" +#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSUtils+Private.h" // Constants defined by the Weave BLE protocol. const UInt8 kGNSMaxPacketCounterValue = 8; diff --git a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Tests/Central/GNSCentralManagerTest.m b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Tests/Central/GNSCentralManagerTest.m similarity index 98% rename from internal/platform/implementation/ios/Mediums/Ble/Sockets/Tests/Central/GNSCentralManagerTest.m rename to internal/platform/implementation/apple/Mediums/Ble/Sockets/Tests/Central/GNSCentralManagerTest.m index 725b5474..73e52d7e 100644 --- a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Tests/Central/GNSCentralManagerTest.m +++ b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Tests/Central/GNSCentralManagerTest.m @@ -14,8 +14,8 @@ #import -#import "internal/platform/implementation/ios/Mediums/ble/Sockets/Source/Central/GNSCentralManager+Private.h" -#import "internal/platform/implementation/ios/Mediums/ble/Sockets/Source/Central/GNSCentralPeerManager+Private.h" +#import "internal/platform/implementation/apple/Mediums/ble/Sockets/Source/Central/GNSCentralManager+Private.h" +#import "internal/platform/implementation/apple/Mediums/ble/Sockets/Source/Central/GNSCentralPeerManager+Private.h" #import "third_party/objective_c/ocmock/v3/Source/OCMock/OCMock.h" @interface TestGNSCentralManager : GNSCentralManager diff --git a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Tests/Central/GNSCentralPeerManagerTest.m b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Tests/Central/GNSCentralPeerManagerTest.m similarity index 98% rename from internal/platform/implementation/ios/Mediums/Ble/Sockets/Tests/Central/GNSCentralPeerManagerTest.m rename to internal/platform/implementation/apple/Mediums/Ble/Sockets/Tests/Central/GNSCentralPeerManagerTest.m index 17ed74a1..f7a989c1 100644 --- a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Tests/Central/GNSCentralPeerManagerTest.m +++ b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Tests/Central/GNSCentralPeerManagerTest.m @@ -14,9 +14,9 @@ #import -#import "internal/platform/implementation/ios/Mediums/ble/Sockets/Source/Central/GNSCentralManager+Private.h" -#import "internal/platform/implementation/ios/Mediums/ble/Sockets/Source/Central/GNSCentralPeerManager+Private.h" -#import "internal/platform/implementation/ios/Mediums/ble/Sockets/Source/Shared/GNSWeavePacket.h" +#import "internal/platform/implementation/apple/Mediums/ble/Sockets/Source/Central/GNSCentralManager+Private.h" +#import "internal/platform/implementation/apple/Mediums/ble/Sockets/Source/Central/GNSCentralPeerManager+Private.h" +#import "internal/platform/implementation/apple/Mediums/ble/Sockets/Source/Shared/GNSWeavePacket.h" #import "third_party/objective_c/ocmock/v3/Source/OCMock/OCMock.h" static SEL gTimerSelector = nil; diff --git a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Tests/Peripheral/GNSPeripheralManagerTest.m b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Tests/Peripheral/GNSPeripheralManagerTest.m similarity index 99% rename from internal/platform/implementation/ios/Mediums/Ble/Sockets/Tests/Peripheral/GNSPeripheralManagerTest.m rename to internal/platform/implementation/apple/Mediums/Ble/Sockets/Tests/Peripheral/GNSPeripheralManagerTest.m index 2ff4769b..0c57ccf9 100644 --- a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Tests/Peripheral/GNSPeripheralManagerTest.m +++ b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Tests/Peripheral/GNSPeripheralManagerTest.m @@ -14,9 +14,9 @@ #import -#import "internal/platform/implementation/ios/Mediums/ble/Sockets/Source/Peripheral/GNSPeripheralManager+Private.h" -#import "internal/platform/implementation/ios/Mediums/ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager+Private.h" -#import "internal/platform/implementation/ios/Mediums/ble/Sockets/Source/Shared/GNSSocket+Private.h" +#import "internal/platform/implementation/apple/Mediums/ble/Sockets/Source/Peripheral/GNSPeripheralManager+Private.h" +#import "internal/platform/implementation/apple/Mediums/ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager+Private.h" +#import "internal/platform/implementation/apple/Mediums/ble/Sockets/Source/Shared/GNSSocket+Private.h" #import "third_party/objective_c/ocmock/v3/Source/OCMock/OCMock.h" @interface TestGNSPeripheralManager : GNSPeripheralManager diff --git a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Tests/Peripheral/GNSPeripheralServiceManagerTest.m b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Tests/Peripheral/GNSPeripheralServiceManagerTest.m similarity index 98% rename from internal/platform/implementation/ios/Mediums/Ble/Sockets/Tests/Peripheral/GNSPeripheralServiceManagerTest.m rename to internal/platform/implementation/apple/Mediums/Ble/Sockets/Tests/Peripheral/GNSPeripheralServiceManagerTest.m index 47aa3269..ba0fdf3d 100644 --- a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Tests/Peripheral/GNSPeripheralServiceManagerTest.m +++ b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Tests/Peripheral/GNSPeripheralServiceManagerTest.m @@ -14,11 +14,11 @@ #import -#import "internal/platform/implementation/ios/Mediums/ble/Sockets/Source/Peripheral/GNSPeripheralManager+Private.h" -#import "internal/platform/implementation/ios/Mediums/ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager+Private.h" -#import "internal/platform/implementation/ios/Mediums/ble/Sockets/Source/Shared/GNSSocket+Private.h" -#import "internal/platform/implementation/ios/Mediums/ble/Sockets/Source/Shared/GNSUtils.h" -#import "internal/platform/implementation/ios/Mediums/ble/Sockets/Source/Shared/GNSWeavePacket.h" +#import "internal/platform/implementation/apple/Mediums/ble/Sockets/Source/Peripheral/GNSPeripheralManager+Private.h" +#import "internal/platform/implementation/apple/Mediums/ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager+Private.h" +#import "internal/platform/implementation/apple/Mediums/ble/Sockets/Source/Shared/GNSSocket+Private.h" +#import "internal/platform/implementation/apple/Mediums/ble/Sockets/Source/Shared/GNSUtils.h" +#import "internal/platform/implementation/apple/Mediums/ble/Sockets/Source/Shared/GNSWeavePacket.h" #import "third_party/objective_c/ocmock/v3/Source/OCMock/OCMock.h" @interface GNSPeripheralServiceManagerTest : XCTestCase { diff --git a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Tests/Shared/GNSSocketTest.m b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Tests/Shared/GNSSocketTest.m similarity index 98% rename from internal/platform/implementation/ios/Mediums/Ble/Sockets/Tests/Shared/GNSSocketTest.m rename to internal/platform/implementation/apple/Mediums/Ble/Sockets/Tests/Shared/GNSSocketTest.m index 5a8f0dda..1b54dffc 100644 --- a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Tests/Shared/GNSSocketTest.m +++ b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Tests/Shared/GNSSocketTest.m @@ -14,8 +14,8 @@ #import -#import "internal/platform/implementation/ios/Mediums/ble/Sockets/Source/Shared/GNSSocket+Private.h" -#import "internal/platform/implementation/ios/Mediums/ble/Sockets/Source/Shared/GNSWeavePacket.h" +#import "internal/platform/implementation/apple/Mediums/ble/Sockets/Source/Shared/GNSSocket+Private.h" +#import "internal/platform/implementation/apple/Mediums/ble/Sockets/Source/Shared/GNSWeavePacket.h" #import "third_party/objective_c/ocmock/v3/Source/OCMock/OCMock.h" @interface GNSSocketTest : XCTestCase { diff --git a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Tests/Shared/GNSWeavePacketTest.m b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Tests/Shared/GNSWeavePacketTest.m similarity index 98% rename from internal/platform/implementation/ios/Mediums/Ble/Sockets/Tests/Shared/GNSWeavePacketTest.m rename to internal/platform/implementation/apple/Mediums/Ble/Sockets/Tests/Shared/GNSWeavePacketTest.m index 49534e93..d86c56d2 100644 --- a/internal/platform/implementation/ios/Mediums/Ble/Sockets/Tests/Shared/GNSWeavePacketTest.m +++ b/internal/platform/implementation/apple/Mediums/Ble/Sockets/Tests/Shared/GNSWeavePacketTest.m @@ -14,9 +14,9 @@ #import -#import "internal/platform/implementation/ios/Mediums/ble/Sockets/Source/Shared/GNSWeavePacket.h" +#import "internal/platform/implementation/apple/Mediums/ble/Sockets/Source/Shared/GNSWeavePacket.h" -#import "internal/platform/implementation/ios/Mediums/ble/Sockets/Source/Shared/GNSUtils.h" +#import "internal/platform/implementation/apple/Mediums/ble/Sockets/Source/Shared/GNSUtils.h" @interface GNSWeavePacketTest : XCTestCase { NSData *_largeNonEmptyData; diff --git a/internal/platform/implementation/ios/Mediums/GNCLeaks.h b/internal/platform/implementation/apple/Mediums/GNCLeaks.h similarity index 100% rename from internal/platform/implementation/ios/Mediums/GNCLeaks.h rename to internal/platform/implementation/apple/Mediums/GNCLeaks.h diff --git a/internal/platform/implementation/ios/Mediums/GNCLeaks.m b/internal/platform/implementation/apple/Mediums/GNCLeaks.m similarity index 94% rename from internal/platform/implementation/ios/Mediums/GNCLeaks.m rename to internal/platform/implementation/apple/Mediums/GNCLeaks.m index 70510afd..e06f753b 100644 --- a/internal/platform/implementation/ios/Mediums/GNCLeaks.m +++ b/internal/platform/implementation/apple/Mediums/GNCLeaks.m @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/Mediums/GNCLeaks.h" +#import "internal/platform/implementation/apple/Mediums/GNCLeaks.h" void GNCVerifyDealloc(id object, NSTimeInterval timeInterval) { #if DEBUG diff --git a/internal/platform/implementation/ios/Mediums/GNCMConnection.h b/internal/platform/implementation/apple/Mediums/GNCMConnection.h similarity index 100% rename from internal/platform/implementation/ios/Mediums/GNCMConnection.h rename to internal/platform/implementation/apple/Mediums/GNCMConnection.h diff --git a/internal/platform/implementation/ios/Mediums/GNCMConnection.m b/internal/platform/implementation/apple/Mediums/GNCMConnection.m similarity index 93% rename from internal/platform/implementation/ios/Mediums/GNCMConnection.m rename to internal/platform/implementation/apple/Mediums/GNCMConnection.m index 2401218b..7534ba5f 100644 --- a/internal/platform/implementation/ios/Mediums/GNCMConnection.m +++ b/internal/platform/implementation/apple/Mediums/GNCMConnection.m @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/Mediums/GNCMConnection.h" +#import "internal/platform/implementation/apple/Mediums/GNCMConnection.h" NS_ASSUME_NONNULL_BEGIN diff --git a/internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourBrowser.h b/internal/platform/implementation/apple/Mediums/WifiLan/GNCMBonjourBrowser.h similarity index 95% rename from internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourBrowser.h rename to internal/platform/implementation/apple/Mediums/WifiLan/GNCMBonjourBrowser.h index aa2513ea..093afb5c 100644 --- a/internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourBrowser.h +++ b/internal/platform/implementation/apple/Mediums/WifiLan/GNCMBonjourBrowser.h @@ -14,7 +14,7 @@ #import -#import "internal/platform/implementation/ios/Mediums/GNCMConnection.h" +#import "internal/platform/implementation/apple/Mediums/GNCMConnection.h" NS_ASSUME_NONNULL_BEGIN diff --git a/internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourBrowser.m b/internal/platform/implementation/apple/Mediums/WifiLan/GNCMBonjourBrowser.m similarity index 95% rename from internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourBrowser.m rename to internal/platform/implementation/apple/Mediums/WifiLan/GNCMBonjourBrowser.m index 1fdf7dce..e86cc64a 100644 --- a/internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourBrowser.m +++ b/internal/platform/implementation/apple/Mediums/WifiLan/GNCMBonjourBrowser.m @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourBrowser.h" +#import "internal/platform/implementation/apple/Mediums/WifiLan/GNCMBonjourBrowser.h" -#import "internal/platform/implementation/ios/Mediums/GNCMConnection.h" -#import "internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourConnection.h" -#import "internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourUtils.h" +#import "internal/platform/implementation/apple/Mediums/GNCMConnection.h" +#import "internal/platform/implementation/apple/Mediums/WifiLan/GNCMBonjourConnection.h" +#import "internal/platform/implementation/apple/Mediums/WifiLan/GNCMBonjourUtils.h" #import "GoogleToolboxForMac/GTMLogger.h" typedef NSString *GNCEndpointId; diff --git a/internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourConnection.h b/internal/platform/implementation/apple/Mediums/WifiLan/GNCMBonjourConnection.h similarity index 94% rename from internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourConnection.h rename to internal/platform/implementation/apple/Mediums/WifiLan/GNCMBonjourConnection.h index 1c65f953..b15b7b37 100644 --- a/internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourConnection.h +++ b/internal/platform/implementation/apple/Mediums/WifiLan/GNCMBonjourConnection.h @@ -14,7 +14,7 @@ #import -#import "internal/platform/implementation/ios/Mediums/GNCMConnection.h" +#import "internal/platform/implementation/apple/Mediums/GNCMConnection.h" NS_ASSUME_NONNULL_BEGIN diff --git a/internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourConnection.m b/internal/platform/implementation/apple/Mediums/WifiLan/GNCMBonjourConnection.m similarity index 97% rename from internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourConnection.m rename to internal/platform/implementation/apple/Mediums/WifiLan/GNCMBonjourConnection.m index 62aaf56d..59357604 100644 --- a/internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourConnection.m +++ b/internal/platform/implementation/apple/Mediums/WifiLan/GNCMBonjourConnection.m @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourConnection.h" +#import "internal/platform/implementation/apple/Mediums/WifiLan/GNCMBonjourConnection.h" -#import "internal/platform/implementation/ios/Mediums/GNCMConnection.h" +#import "internal/platform/implementation/apple/Mediums/GNCMConnection.h" #import "GoogleToolboxForMac/GTMLogger.h" enum { kMaxPacketSize = 32 * 1024 }; diff --git a/internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourService.h b/internal/platform/implementation/apple/Mediums/WifiLan/GNCMBonjourService.h similarity index 96% rename from internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourService.h rename to internal/platform/implementation/apple/Mediums/WifiLan/GNCMBonjourService.h index 243a6c38..db0649c8 100644 --- a/internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourService.h +++ b/internal/platform/implementation/apple/Mediums/WifiLan/GNCMBonjourService.h @@ -14,7 +14,7 @@ #import -#import "internal/platform/implementation/ios/Mediums/GNCMConnection.h" +#import "internal/platform/implementation/apple/Mediums/GNCMConnection.h" NS_ASSUME_NONNULL_BEGIN diff --git a/internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourService.m b/internal/platform/implementation/apple/Mediums/WifiLan/GNCMBonjourService.m similarity index 90% rename from internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourService.m rename to internal/platform/implementation/apple/Mediums/WifiLan/GNCMBonjourService.m index fa154068..048e7ab3 100644 --- a/internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourService.m +++ b/internal/platform/implementation/apple/Mediums/WifiLan/GNCMBonjourService.m @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourService.h" +#import "internal/platform/implementation/apple/Mediums/WifiLan/GNCMBonjourService.h" -#import "internal/platform/implementation/ios/Mediums/GNCMConnection.h" -#import "internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourConnection.h" -#import "internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourUtils.h" +#import "internal/platform/implementation/apple/Mediums/GNCMConnection.h" +#import "internal/platform/implementation/apple/Mediums/WifiLan/GNCMBonjourConnection.h" +#import "internal/platform/implementation/apple/Mediums/WifiLan/GNCMBonjourUtils.h" #import "GoogleToolboxForMac/GTMLogger.h" @interface GNCMBonjourService () diff --git a/internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourUtils.h b/internal/platform/implementation/apple/Mediums/WifiLan/GNCMBonjourUtils.h similarity index 100% rename from internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourUtils.h rename to internal/platform/implementation/apple/Mediums/WifiLan/GNCMBonjourUtils.h diff --git a/internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourUtils.m b/internal/platform/implementation/apple/Mediums/WifiLan/GNCMBonjourUtils.m similarity index 88% rename from internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourUtils.m rename to internal/platform/implementation/apple/Mediums/WifiLan/GNCMBonjourUtils.m index 2fdcb2a8..6883687f 100644 --- a/internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourUtils.m +++ b/internal/platform/implementation/apple/Mediums/WifiLan/GNCMBonjourUtils.m @@ -12,6 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourUtils.h" +#import "internal/platform/implementation/apple/Mediums/WifiLan/GNCMBonjourUtils.h" NSString *const GNCMBonjourDomain = @"local"; diff --git a/internal/platform/implementation/ios/Tests/BUILD b/internal/platform/implementation/apple/Tests/BUILD similarity index 91% rename from internal/platform/implementation/ios/Tests/BUILD rename to internal/platform/implementation/apple/Tests/BUILD index 458ec0e8..e1045630 100644 --- a/internal/platform/implementation/ios/Tests/BUILD +++ b/internal/platform/implementation/apple/Tests/BUILD @@ -31,8 +31,8 @@ objc_library( ], features = ["-layering_check"], deps = [ - "//internal/platform/implementation/ios:Platform", - "//internal/platform/implementation/ios:Shared", + "//internal/platform/implementation/apple", + "//internal/platform/implementation/apple:Shared", ], ) diff --git a/internal/platform/implementation/ios/Tests/GNCBleTest.mm b/internal/platform/implementation/apple/Tests/GNCBleTest.mm similarity index 95% rename from internal/platform/implementation/ios/Tests/GNCBleTest.mm rename to internal/platform/implementation/apple/Tests/GNCBleTest.mm index 78b466ce..3fec192c 100644 --- a/internal/platform/implementation/ios/Tests/GNCBleTest.mm +++ b/internal/platform/implementation/apple/Tests/GNCBleTest.mm @@ -13,8 +13,9 @@ // limitations under the License. #import -#include "internal/platform/implementation/ios/bluetooth_adapter.h" +#include "internal/platform/implementation/apple/bluetooth_adapter.h" +#include #include #include @@ -31,7 +32,7 @@ using ::location::nearby::api::ble_v2::BleAdvertisementData; using ::location::nearby::api::ble_v2::BleMedium; using ::location::nearby::api::ble_v2::GattCharacteristic; using ::location::nearby::api::ble_v2::TxPowerLevel; -using IOSBluetoothAdapter = ::location::nearby::ios::BluetoothAdapter; +using IOSBluetoothAdapter = ::location::nearby::apple::BluetoothAdapter; static const char *const kAdvertisementString = "\x0a\x0b\x0c\x0d"; static const TxPowerLevel kTxPowerLevel = TxPowerLevel::kHigh; diff --git a/internal/platform/implementation/ios/Tests/GNCBluetoothAdapterTest.mm b/internal/platform/implementation/apple/Tests/GNCBluetoothAdapterTest.mm similarity index 93% rename from internal/platform/implementation/ios/Tests/GNCBluetoothAdapterTest.mm rename to internal/platform/implementation/apple/Tests/GNCBluetoothAdapterTest.mm index 664a382a..b05306b4 100644 --- a/internal/platform/implementation/ios/Tests/GNCBluetoothAdapterTest.mm +++ b/internal/platform/implementation/apple/Tests/GNCBluetoothAdapterTest.mm @@ -16,12 +16,12 @@ #include +#include "internal/platform/implementation/apple/bluetooth_adapter.h" #include "internal/platform/implementation/ble_v2.h" #include "internal/platform/implementation/bluetooth_adapter.h" -#include "internal/platform/implementation/ios/bluetooth_adapter.h" -using ::location::nearby::ios::BlePeripheral; -using ::location::nearby::ios::BluetoothAdapter; +using ::location::nearby::apple::BlePeripheral; +using ::location::nearby::apple::BluetoothAdapter; using ScanMode = ::location::nearby::api::BluetoothAdapter::ScanMode; using Status = ::location::nearby::api::BluetoothAdapter::Status; diff --git a/internal/platform/implementation/ios/Tests/GNCCryptoTest.mm b/internal/platform/implementation/apple/Tests/GNCCryptoTest.mm similarity index 100% rename from internal/platform/implementation/ios/Tests/GNCCryptoTest.mm rename to internal/platform/implementation/apple/Tests/GNCCryptoTest.mm diff --git a/internal/platform/implementation/ios/Tests/GNCMultiThreadExecutorTest.mm b/internal/platform/implementation/apple/Tests/GNCMultiThreadExecutorTest.mm similarity index 100% rename from internal/platform/implementation/ios/Tests/GNCMultiThreadExecutorTest.mm rename to internal/platform/implementation/apple/Tests/GNCMultiThreadExecutorTest.mm diff --git a/internal/platform/implementation/ios/Tests/GNCScheduledExecutorTest.mm b/internal/platform/implementation/apple/Tests/GNCScheduledExecutorTest.mm similarity index 100% rename from internal/platform/implementation/ios/Tests/GNCScheduledExecutorTest.mm rename to internal/platform/implementation/apple/Tests/GNCScheduledExecutorTest.mm diff --git a/internal/platform/implementation/ios/Tests/GNCSingleThreadExecutorTest.mm b/internal/platform/implementation/apple/Tests/GNCSingleThreadExecutorTest.mm similarity index 100% rename from internal/platform/implementation/ios/Tests/GNCSingleThreadExecutorTest.mm rename to internal/platform/implementation/apple/Tests/GNCSingleThreadExecutorTest.mm diff --git a/internal/platform/implementation/ios/Tests/GNCUtilsTest.mm b/internal/platform/implementation/apple/Tests/GNCUtilsTest.mm similarity index 96% rename from internal/platform/implementation/ios/Tests/GNCUtilsTest.mm rename to internal/platform/implementation/apple/Tests/GNCUtilsTest.mm index b9791def..70688352 100644 --- a/internal/platform/implementation/ios/Tests/GNCUtilsTest.mm +++ b/internal/platform/implementation/apple/Tests/GNCUtilsTest.mm @@ -15,7 +15,7 @@ #import #include "internal/platform/byte_array.h" -#include "internal/platform/implementation/ios/utils.h" +#include "internal/platform/implementation/apple/utils.h" using ::location::nearby::ByteArray; using ::location::nearby::ByteArrayFromNSData; diff --git a/internal/platform/implementation/ios/atomic_boolean.h b/internal/platform/implementation/apple/atomic_boolean.h similarity index 87% rename from internal/platform/implementation/ios/atomic_boolean.h rename to internal/platform/implementation/apple/atomic_boolean.h index ed3bbeeb..3e8c22e2 100644 --- a/internal/platform/implementation/ios/atomic_boolean.h +++ b/internal/platform/implementation/apple/atomic_boolean.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef PLATFORM_IMPL_IOS_ATOMIC_BOOLEAN_H_ -#define PLATFORM_IMPL_IOS_ATOMIC_BOOLEAN_H_ +#ifndef PLATFORM_IMPL_APPLE_ATOMIC_BOOLEAN_H_ +#define PLATFORM_IMPL_APPLE_ATOMIC_BOOLEAN_H_ #include @@ -21,7 +21,7 @@ namespace location { namespace nearby { -namespace ios { +namespace apple { // Concrete AtomicBoolean implementation. class AtomicBoolean : public api::AtomicBoolean { @@ -39,8 +39,8 @@ class AtomicBoolean : public api::AtomicBoolean { std::atomic_bool value_; }; -} // namespace ios +} // namespace apple } // namespace nearby } // namespace location -#endif // PLATFORM_IMPL_IOS_ATOMIC_BOOLEAN_H_ +#endif // PLATFORM_IMPL_APPLE_ATOMIC_BOOLEAN_H_ diff --git a/internal/platform/implementation/ios/atomic_boolean_test.cc b/internal/platform/implementation/apple/atomic_boolean_test.cc similarity index 94% rename from internal/platform/implementation/ios/atomic_boolean_test.cc rename to internal/platform/implementation/apple/atomic_boolean_test.cc index 540ea5a0..1fa24ece 100644 --- a/internal/platform/implementation/ios/atomic_boolean_test.cc +++ b/internal/platform/implementation/apple/atomic_boolean_test.cc @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "internal/platform/implementation/ios/atomic_boolean.h" +#include "internal/platform/implementation/apple/atomic_boolean.h" #include "gtest/gtest.h" #include "thread/fiber/fiber.h" namespace location { namespace nearby { -namespace ios { +namespace apple { namespace { TEST(AtomicBooleanTest, SetOnSameThread) { @@ -73,6 +73,6 @@ TEST(AtomicBooleanTest, GetOnNewThread) { } } // namespace -} // namespace ios +} // namespace apple } // namespace nearby } // namespace location diff --git a/internal/platform/implementation/ios/atomic_uint32.h b/internal/platform/implementation/apple/atomic_uint32.h similarity index 87% rename from internal/platform/implementation/ios/atomic_uint32.h rename to internal/platform/implementation/apple/atomic_uint32.h index d9eb3acd..266d3ee0 100644 --- a/internal/platform/implementation/ios/atomic_uint32.h +++ b/internal/platform/implementation/apple/atomic_uint32.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef PLATFORM_IMPL_IOS_ATOMIC_UINT32_H_ -#define PLATFORM_IMPL_IOS_ATOMIC_UINT32_H_ +#ifndef PLATFORM_IMPL_APPLE_ATOMIC_UINT32_H_ +#define PLATFORM_IMPL_APPLE_ATOMIC_UINT32_H_ #include #include @@ -22,7 +22,7 @@ namespace location { namespace nearby { -namespace ios { +namespace apple { // Concrete AtomicUint32 implementation. class AtomicUint32 : public api::AtomicUint32 { @@ -40,8 +40,8 @@ class AtomicUint32 : public api::AtomicUint32 { std::atomic value_; }; -} // namespace ios +} // namespace apple } // namespace nearby } // namespace location -#endif // PLATFORM_IMPL_IOS_ATOMIC_UINT32_H_ +#endif // PLATFORM_IMPL_APPLE_ATOMIC_UINT32_H_ diff --git a/internal/platform/implementation/ios/atomic_uint32_test.cc b/internal/platform/implementation/apple/atomic_uint32_test.cc similarity index 94% rename from internal/platform/implementation/ios/atomic_uint32_test.cc rename to internal/platform/implementation/apple/atomic_uint32_test.cc index 13b8bdc5..3e573c2a 100644 --- a/internal/platform/implementation/ios/atomic_uint32_test.cc +++ b/internal/platform/implementation/apple/atomic_uint32_test.cc @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "internal/platform/implementation/ios/atomic_uint32.h" +#include "internal/platform/implementation/apple/atomic_uint32.h" #include "gtest/gtest.h" #include "thread/fiber/fiber.h" namespace location { namespace nearby { -namespace ios { +namespace apple { namespace { TEST(AtomicUint32Test, GetOnSameThread) { @@ -59,6 +59,6 @@ TEST(AtomicUint32Test, GetOnNewThread) { } } // namespace -} // namespace ios +} // namespace apple } // namespace nearby } // namespace location diff --git a/internal/platform/implementation/ios/ble.h b/internal/platform/implementation/apple/ble.h similarity index 94% rename from internal/platform/implementation/ios/ble.h rename to internal/platform/implementation/apple/ble.h index d5495825..bb8f59bd 100644 --- a/internal/platform/implementation/ios/ble.h +++ b/internal/platform/implementation/apple/ble.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_NEARBY_INTERNAL_PLATFORM_IMPLEMENTATION_IOS_BLE_H_ -#define THIRD_PARTY_NEARBY_INTERNAL_PLATFORM_IMPLEMENTATION_IOS_BLE_H_ +#ifndef THIRD_PARTY_NEARBY_INTERNAL_PLATFORM_IMPLEMENTATION_APPLE_BLE_H_ +#define THIRD_PARTY_NEARBY_INTERNAL_PLATFORM_IMPLEMENTATION_APPLE_BLE_H_ #ifdef __cplusplus #import @@ -23,16 +23,17 @@ #include "absl/types/optional.h" #include "internal/platform/cancellation_flag.h" +#include "internal/platform/implementation/apple/bluetooth_adapter.h" #include "internal/platform/implementation/ble_v2.h" #include "internal/platform/implementation/bluetooth_adapter.h" -#import "internal/platform/implementation/ios/Mediums/GNCMConnection.h" -#include "internal/platform/implementation/ios/bluetooth_adapter.h" + +#import "internal/platform/implementation/apple/Mediums/GNCMConnection.h" @class GNCMBlePeripheral, GNCMBleCentral; namespace location { namespace nearby { -namespace ios { +namespace apple { /** InputStream that reads from GNCMConnection. */ class BleInputStream : public InputStream { @@ -201,9 +202,9 @@ class BleMedium : public api::ble_v2::BleMedium { dispatch_queue_t callback_queue_; }; -} // namespace ios +} // namespace apple } // namespace nearby } // namespace location #endif -#endif // THIRD_PARTY_NEARBY_INTERNAL_PLATFORM_IMPLEMENTATION_IOS_BLE_H_ +#endif // THIRD_PARTY_NEARBY_INTERNAL_PLATFORM_IMPLEMENTATION_APPLE_BLE_H_ diff --git a/internal/platform/implementation/ios/ble.mm b/internal/platform/implementation/apple/ble.mm similarity index 98% rename from internal/platform/implementation/ios/ble.mm rename to internal/platform/implementation/apple/ble.mm index 778351b1..c1354308 100644 --- a/internal/platform/implementation/ios/ble.mm +++ b/internal/platform/implementation/apple/ble.mm @@ -12,22 +12,23 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/ble.h" +#import "internal/platform/implementation/apple/ble.h" #include #include #include #include +#include "internal/platform/implementation/apple/bluetooth_adapter.h" +#include "internal/platform/implementation/apple/utils.h" #include "internal/platform/implementation/ble_v2.h" -#import "internal/platform/implementation/ios/Mediums/Ble/GNCMBleCentral.h" -#import "internal/platform/implementation/ios/Mediums/Ble/GNCMBlePeripheral.h" -#include "internal/platform/implementation/ios/bluetooth_adapter.h" -#include "internal/platform/implementation/ios/utils.h" + +#import "internal/platform/implementation/apple/Mediums/Ble/GNCMBleCentral.h" +#import "internal/platform/implementation/apple/Mediums/Ble/GNCMBlePeripheral.h" namespace location { namespace nearby { -namespace ios { +namespace apple { namespace { @@ -590,6 +591,6 @@ void BleMedium::GattClient::Disconnect() { [central_ disconnectGattServiceWithPeripheralID:ObjCStringFromCppString(peripheral_id_)]; } -} // namespace ios +} // namespace apple } // namespace nearby } // namespace location diff --git a/internal/platform/implementation/ios/bluetooth_adapter.h b/internal/platform/implementation/apple/bluetooth_adapter.h similarity index 88% rename from internal/platform/implementation/ios/bluetooth_adapter.h rename to internal/platform/implementation/apple/bluetooth_adapter.h index c8f75d95..55a17ae2 100644 --- a/internal/platform/implementation/ios/bluetooth_adapter.h +++ b/internal/platform/implementation/apple/bluetooth_adapter.h @@ -12,19 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_NEARBY_INTERNAL_PLATFORM_IMPLEMENTATION_IOS_BLUETOOTH_ADAPTER_H_ -#define THIRD_PARTY_NEARBY_INTERNAL_PLATFORM_IMPLEMENTATION_IOS_BLUETOOTH_ADAPTER_H_ +#ifndef THIRD_PARTY_NEARBY_INTERNAL_PLATFORM_IMPLEMENTATION_APPLE_BLUETOOTH_ADAPTER_H_ +#define THIRD_PARTY_NEARBY_INTERNAL_PLATFORM_IMPLEMENTATION_APPLE_BLUETOOTH_ADAPTER_H_ #ifdef __cplusplus #include #include "internal/platform/implementation/ble_v2.h" #include "internal/platform/implementation/bluetooth_adapter.h" -#import "internal/platform/implementation/ios/Mediums/Ble/GNCMBleCentral.h" + +#import "internal/platform/implementation/apple/Mediums/Ble/GNCMBleCentral.h" namespace location { namespace nearby { -namespace ios { +namespace apple { class BluetoothAdapter; @@ -96,9 +97,9 @@ class BluetoothAdapter : public api::BluetoothAdapter { bool enabled_ = true; }; -} // namespace ios +} // namespace apple } // namespace nearby } // namespace location #endif -#endif // THIRD_PARTY_NEARBY_INTERNAL_PLATFORM_IMPLEMENTATION_IOS_BLUETOOTH_ADAPTER_H_ +#endif // THIRD_PARTY_NEARBY_INTERNAL_PLATFORM_IMPLEMENTATION_APPLE_BLUETOOTH_ADAPTER_H_ diff --git a/internal/platform/implementation/ios/bluetooth_adapter.mm b/internal/platform/implementation/apple/bluetooth_adapter.mm similarity index 88% rename from internal/platform/implementation/ios/bluetooth_adapter.mm rename to internal/platform/implementation/apple/bluetooth_adapter.mm index ee5fe93d..a7a5beeb 100644 --- a/internal/platform/implementation/ios/bluetooth_adapter.mm +++ b/internal/platform/implementation/apple/bluetooth_adapter.mm @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "internal/platform/implementation/ios/bluetooth_adapter.h" +#include "internal/platform/implementation/apple/bluetooth_adapter.h" #include @@ -21,10 +21,10 @@ namespace location { namespace nearby { -namespace ios { +namespace apple { std::string BlePeripheral::GetAddress() const { return adapter_.GetMacAddress(); } -} // namespace ios +} // namespace apple } // namespace nearby } // namespace location diff --git a/internal/platform/implementation/ios/condition_variable.cc b/internal/platform/implementation/apple/condition_variable.cc similarity index 85% rename from internal/platform/implementation/ios/condition_variable.cc rename to internal/platform/implementation/apple/condition_variable.cc index 4cbec76a..621443d3 100644 --- a/internal/platform/implementation/ios/condition_variable.cc +++ b/internal/platform/implementation/apple/condition_variable.cc @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "internal/platform/implementation/ios/condition_variable.h" +#include "internal/platform/implementation/apple/condition_variable.h" -#include "internal/platform/implementation/ios/mutex.h" +#include "internal/platform/implementation/apple/mutex.h" namespace location { namespace nearby { -namespace ios { +namespace apple { Exception ConditionVariable::Wait() { condition_variable_.Wait(mutex_); @@ -32,6 +32,6 @@ Exception ConditionVariable::Wait(absl::Duration timeout) { void ConditionVariable::Notify() { condition_variable_.SignalAll(); } -} // namespace ios +} // namespace apple } // namespace nearby } // namespace location diff --git a/internal/platform/implementation/ios/condition_variable.h b/internal/platform/implementation/apple/condition_variable.h similarity index 79% rename from internal/platform/implementation/ios/condition_variable.h rename to internal/platform/implementation/apple/condition_variable.h index a1a8243d..bc174ada 100644 --- a/internal/platform/implementation/ios/condition_variable.h +++ b/internal/platform/implementation/apple/condition_variable.h @@ -12,21 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef PLATFORM_IMPL_IOS_CONDITION_VARIABLE_H_ -#define PLATFORM_IMPL_IOS_CONDITION_VARIABLE_H_ +#ifndef PLATFORM_IMPL_APPLE_CONDITION_VARIABLE_H_ +#define PLATFORM_IMPL_APPLE_CONDITION_VARIABLE_H_ #include "absl/synchronization/mutex.h" #include "internal/platform/implementation/condition_variable.h" -#include "internal/platform/implementation/ios/mutex.h" +#include "internal/platform/implementation/apple/mutex.h" namespace location { namespace nearby { -namespace ios { +namespace apple { // Concrete ConditionVariable implementation. class ConditionVariable : public api::ConditionVariable { public: - explicit ConditionVariable(ios::Mutex* mutex) : mutex_(&mutex->mutex_) {} + explicit ConditionVariable(apple::Mutex* mutex) : mutex_(&mutex->mutex_) {} ~ConditionVariable() override = default; ConditionVariable(const ConditionVariable&) = delete; @@ -41,8 +41,8 @@ class ConditionVariable : public api::ConditionVariable { absl::CondVar condition_variable_; }; -} // namespace ios +} // namespace apple } // namespace nearby } // namespace location -#endif // PLATFORM_IMPL_IOS_CONDITION_VARIABLE_H_ +#endif // PLATFORM_IMPL_APPLE_CONDITION_VARIABLE_H_ diff --git a/internal/platform/implementation/ios/condition_variable_test.cc b/internal/platform/implementation/apple/condition_variable_test.cc similarity index 91% rename from internal/platform/implementation/ios/condition_variable_test.cc rename to internal/platform/implementation/apple/condition_variable_test.cc index 0b206964..67ce47a9 100644 --- a/internal/platform/implementation/ios/condition_variable_test.cc +++ b/internal/platform/implementation/apple/condition_variable_test.cc @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "internal/platform/implementation/ios/condition_variable.h" +#include "internal/platform/implementation/apple/condition_variable.h" #include "gtest/gtest.h" #include "absl/time/clock.h" -#include "internal/platform/implementation/ios/mutex.h" +#include "internal/platform/implementation/apple/mutex.h" #include "thread/fiber/fiber.h" namespace location { namespace nearby { -namespace ios { +namespace apple { namespace { TEST(ConditionVariableTest, CanCreate) { @@ -79,6 +79,6 @@ TEST(ConditionVariableTest, WaitTerminatesOnTimeoutWithoutNotify) { } } // namespace -} // namespace ios +} // namespace apple } // namespace nearby } // namespace location diff --git a/internal/platform/implementation/ios/count_down_latch.cc b/internal/platform/implementation/apple/count_down_latch.cc similarity index 91% rename from internal/platform/implementation/ios/count_down_latch.cc rename to internal/platform/implementation/apple/count_down_latch.cc index de8773c2..3763a5e2 100644 --- a/internal/platform/implementation/ios/count_down_latch.cc +++ b/internal/platform/implementation/apple/count_down_latch.cc @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "internal/platform/implementation/ios/count_down_latch.h" +#include "internal/platform/implementation/apple/count_down_latch.h" namespace location { namespace nearby { -namespace ios { +namespace apple { Exception CountDownLatch::Await() { absl::MutexLock lock(&mutex_, absl::Condition(IsZeroOrNegative, &count_)); @@ -35,6 +35,6 @@ void CountDownLatch::CountDown() { count_--; } -} // namespace ios +} // namespace apple } // namespace nearby } // namespace location diff --git a/internal/platform/implementation/ios/count_down_latch.h b/internal/platform/implementation/apple/count_down_latch.h similarity index 87% rename from internal/platform/implementation/ios/count_down_latch.h rename to internal/platform/implementation/apple/count_down_latch.h index e5fcd6be..d508ea1c 100644 --- a/internal/platform/implementation/ios/count_down_latch.h +++ b/internal/platform/implementation/apple/count_down_latch.h @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef PLATFORM_IMPL_IOS_COUNT_DOWN_LATCH_H_ -#define PLATFORM_IMPL_IOS_COUNT_DOWN_LATCH_H_ +#ifndef PLATFORM_IMPL_APPLE_COUNT_DOWN_LATCH_H_ +#define PLATFORM_IMPL_APPLE_COUNT_DOWN_LATCH_H_ #include "absl/synchronization/mutex.h" #include "internal/platform/implementation/count_down_latch.h" namespace location { namespace nearby { -namespace ios { +namespace apple { // Concrete CountDownLatch implementation. class CountDownLatch : public api::CountDownLatch { @@ -42,8 +42,8 @@ class CountDownLatch : public api::CountDownLatch { int count_ ABSL_GUARDED_BY(mutex_); }; -} // namespace ios +} // namespace apple } // namespace nearby } // namespace location -#endif // PLATFORM_IMPL_IOS_COUNT_DOWN_LATCH_H_ +#endif // PLATFORM_IMPL_APPLE_COUNT_DOWN_LATCH_H_ diff --git a/internal/platform/implementation/ios/count_down_latch_test.cc b/internal/platform/implementation/apple/count_down_latch_test.cc similarity index 94% rename from internal/platform/implementation/ios/count_down_latch_test.cc rename to internal/platform/implementation/apple/count_down_latch_test.cc index 4bf01dec..47d74c69 100644 --- a/internal/platform/implementation/ios/count_down_latch_test.cc +++ b/internal/platform/implementation/apple/count_down_latch_test.cc @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "internal/platform/implementation/ios/count_down_latch.h" +#include "internal/platform/implementation/apple/count_down_latch.h" #include "gtest/gtest.h" #include "thread/fiber/fiber.h" namespace location { namespace nearby { -namespace ios { +namespace apple { namespace { TEST(CountDownLatchTest, LatchAwaitCanWait) { @@ -78,6 +78,6 @@ TEST(CountDownLatchTest, InitialCountNegative_AwaitDoesNotBlock) { } } // namespace -} // namespace ios +} // namespace apple } // namespace nearby } // namespace location diff --git a/internal/platform/implementation/ios/crypto.mm b/internal/platform/implementation/apple/crypto.mm similarity index 90% rename from internal/platform/implementation/ios/crypto.mm rename to internal/platform/implementation/apple/crypto.mm index fbd1544d..b2c4c03e 100644 --- a/internal/platform/implementation/ios/crypto.mm +++ b/internal/platform/implementation/apple/crypto.mm @@ -15,8 +15,8 @@ #include "internal/platform/implementation/crypto.h" #import "absl/strings/string_view.h" -#import "internal/platform/implementation/ios/GNCUtils.h" -#import "internal/platform/implementation/ios/utils.h" +#import "internal/platform/implementation/apple/GNCUtils.h" +#import "internal/platform/implementation/apple/utils.h" namespace location { namespace nearby { diff --git a/internal/platform/implementation/ios/log_message.h b/internal/platform/implementation/apple/log_message.h similarity index 87% rename from internal/platform/implementation/ios/log_message.h rename to internal/platform/implementation/apple/log_message.h index e83b45da..6166f79b 100644 --- a/internal/platform/implementation/ios/log_message.h +++ b/internal/platform/implementation/apple/log_message.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef PLATFORM_IMPL_IOS_LOG_MESSAGE_H_ -#define PLATFORM_IMPL_IOS_LOG_MESSAGE_H_ +#ifndef PLATFORM_IMPL_APPLE_LOG_MESSAGE_H_ +#define PLATFORM_IMPL_APPLE_LOG_MESSAGE_H_ #ifdef __cplusplus #ifdef NEARBY_SWIFTPM @@ -25,7 +25,7 @@ namespace location { namespace nearby { -namespace ios { +namespace apple { // Concrete LogMessage implementation class LogMessage : public api::LogMessage { @@ -49,9 +49,9 @@ class LogMessage : public api::LogMessage { api::LogMessage::Severity severity_; }; -} // namespace ios +} // namespace apple } // namespace nearby } // namespace location #endif -#endif // IPHONE_SHARED_NEARBY_CONNECTIONS_SOURCE_PLATFORM_LOG_MESSAGE_H_ +#endif // PLATFORM_IMPL_APPLE_LOG_MESSAGE_H_ diff --git a/internal/platform/implementation/ios/log_message.mm b/internal/platform/implementation/apple/log_message.mm similarity index 93% rename from internal/platform/implementation/ios/log_message.mm rename to internal/platform/implementation/apple/log_message.mm index 8247f353..181add5d 100644 --- a/internal/platform/implementation/ios/log_message.mm +++ b/internal/platform/implementation/apple/log_message.mm @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "internal/platform/implementation/ios/log_message.h" +#include "internal/platform/implementation/apple/log_message.h" #ifndef NEARBY_SWIFTPM #include "glog/logging.h" @@ -22,7 +22,7 @@ namespace location { namespace nearby { -namespace ios { +namespace apple { api::LogMessage::Severity gMinLogSeverity = api::LogMessage::Severity::kInfo; @@ -78,12 +78,12 @@ std::ostream& LogMessage::Stream() { return log_streamer_; } std::ostream& LogMessage::Stream() { return log_streamer_.stream(); } #endif -} // namespace ios +} // namespace apple namespace api { // static -void LogMessage::SetMinLogSeverity(Severity severity) { ios::gMinLogSeverity = severity; } +void LogMessage::SetMinLogSeverity(Severity severity) { apple::gMinLogSeverity = severity; } // static bool LogMessage::ShouldCreateLogMessage(Severity severity) { diff --git a/internal/platform/implementation/ios/multi_thread_executor.h b/internal/platform/implementation/apple/multi_thread_executor.h similarity index 83% rename from internal/platform/implementation/ios/multi_thread_executor.h rename to internal/platform/implementation/apple/multi_thread_executor.h index 485b77ad..06c135d4 100644 --- a/internal/platform/implementation/ios/multi_thread_executor.h +++ b/internal/platform/implementation/apple/multi_thread_executor.h @@ -12,17 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef PLATFORM_IMPL_IOS_MULTI_THREAD_EXECUTOR_H_ -#define PLATFORM_IMPL_IOS_MULTI_THREAD_EXECUTOR_H_ +#ifndef PLATFORM_IMPL_APPLE_MULTI_THREAD_EXECUTOR_H_ +#define PLATFORM_IMPL_APPLE_MULTI_THREAD_EXECUTOR_H_ #ifdef __cplusplus -#import "internal/platform/implementation/ios/scheduled_executor.h" +#import "internal/platform/implementation/apple/scheduled_executor.h" #include "internal/platform/implementation/submittable_executor.h" #import "internal/platform/runnable.h" namespace location { namespace nearby { -namespace ios { +namespace apple { class MultiThreadExecutor : public api::SubmittableExecutor { public: @@ -41,9 +41,9 @@ class MultiThreadExecutor : public api::SubmittableExecutor { std::unique_ptr scheduled_executor_; }; -} // namespace ios +} // namespace apple } // namespace nearby } // namespace location #endif -#endif // PLATFORM_IMPL_IOS_MULTI_THREAD_EXECUTOR_H_ +#endif // PLATFORM_IMPL_APPLE_MULTI_THREAD_EXECUTOR_H_ diff --git a/internal/platform/implementation/ios/multi_thread_executor.mm b/internal/platform/implementation/apple/multi_thread_executor.mm similarity index 86% rename from internal/platform/implementation/ios/multi_thread_executor.mm rename to internal/platform/implementation/apple/multi_thread_executor.mm index 3e9e02b4..1783713c 100644 --- a/internal/platform/implementation/ios/multi_thread_executor.mm +++ b/internal/platform/implementation/apple/multi_thread_executor.mm @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/multi_thread_executor.h" +#import "internal/platform/implementation/apple/multi_thread_executor.h" -#import "internal/platform/implementation/ios/scheduled_executor.h" +#import "internal/platform/implementation/apple/scheduled_executor.h" #include "internal/platform/runnable.h" namespace location { namespace nearby { -namespace ios { +namespace apple { MultiThreadExecutor::MultiThreadExecutor(int max_concurrency) { scheduled_executor_ = std::make_unique(max_concurrency); @@ -35,6 +35,6 @@ bool MultiThreadExecutor::DoSubmit(Runnable&& runnable) { return scheduled_executor_->DoSubmit(std::move(runnable)); } -} // namespace ios +} // namespace apple } // namespace nearby } // namespace location diff --git a/internal/platform/implementation/ios/mutex.h b/internal/platform/implementation/apple/mutex.h similarity index 93% rename from internal/platform/implementation/ios/mutex.h rename to internal/platform/implementation/apple/mutex.h index b60484d4..36f90f69 100644 --- a/internal/platform/implementation/ios/mutex.h +++ b/internal/platform/implementation/apple/mutex.h @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef PLATFORM_IMPL_IOS_MUTEX_H_ -#define PLATFORM_IMPL_IOS_MUTEX_H_ +#ifndef PLATFORM_IMPL_APPLE_MUTEX_H_ +#define PLATFORM_IMPL_APPLE_MUTEX_H_ #include "absl/synchronization/mutex.h" #include "internal/platform/implementation/mutex.h" namespace location { namespace nearby { -namespace ios { +namespace apple { // Concrete Mutex implementation. class ABSL_LOCKABLE Mutex : public api::Mutex { @@ -77,8 +77,8 @@ class ABSL_LOCKABLE RecursiveMutex : public api::Mutex { absl::Mutex mutex_; }; -} // namespace ios +} // namespace apple } // namespace nearby } // namespace location -#endif // PLATFORM_IMPL_IOS_MUTEX_H_ +#endif // PLATFORM_IMPL_APPLE_MUTEX_H_ diff --git a/internal/platform/implementation/ios/mutex_test.cc b/internal/platform/implementation/apple/mutex_test.cc similarity index 96% rename from internal/platform/implementation/ios/mutex_test.cc rename to internal/platform/implementation/apple/mutex_test.cc index 494cd411..a49c921b 100644 --- a/internal/platform/implementation/ios/mutex_test.cc +++ b/internal/platform/implementation/apple/mutex_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "internal/platform/implementation/ios/mutex.h" +#include "internal/platform/implementation/apple/mutex.h" #include "gtest/gtest.h" #include "absl/synchronization/mutex.h" @@ -23,7 +23,7 @@ namespace location { namespace nearby { -namespace ios { +namespace apple { namespace { static const absl::Duration kTimeToWait = absl::Milliseconds(500); @@ -87,6 +87,6 @@ TEST(MutexTest, RecursiveLockingForNestedWorks) { } } // namespace -} // namespace ios +} // namespace apple } // namespace nearby } // namespace location diff --git a/internal/platform/implementation/ios/platform.mm b/internal/platform/implementation/apple/platform.mm similarity index 76% rename from internal/platform/implementation/ios/platform.mm rename to internal/platform/implementation/apple/platform.mm index 0c063387..8ba6e227 100644 --- a/internal/platform/implementation/ios/platform.mm +++ b/internal/platform/implementation/apple/platform.mm @@ -16,18 +16,18 @@ #include -#include "internal/platform/implementation/ios/atomic_boolean.h" -#include "internal/platform/implementation/ios/atomic_uint32.h" -#include "internal/platform/implementation/ios/ble.h" -#include "internal/platform/implementation/ios/condition_variable.h" -#include "internal/platform/implementation/ios/count_down_latch.h" -#import "internal/platform/implementation/ios/log_message.h" -#import "internal/platform/implementation/ios/multi_thread_executor.h" -#include "internal/platform/implementation/ios/mutex.h" -#import "internal/platform/implementation/ios/scheduled_executor.h" -#import "internal/platform/implementation/ios/single_thread_executor.h" -#import "internal/platform/implementation/ios/utils.h" -#include "internal/platform/implementation/ios/wifi_lan.h" +#include "internal/platform/implementation/apple/atomic_boolean.h" +#include "internal/platform/implementation/apple/atomic_uint32.h" +#include "internal/platform/implementation/apple/ble.h" +#include "internal/platform/implementation/apple/condition_variable.h" +#include "internal/platform/implementation/apple/count_down_latch.h" +#import "internal/platform/implementation/apple/log_message.h" +#import "internal/platform/implementation/apple/multi_thread_executor.h" +#include "internal/platform/implementation/apple/mutex.h" +#import "internal/platform/implementation/apple/scheduled_executor.h" +#import "internal/platform/implementation/apple/single_thread_executor.h" +#import "internal/platform/implementation/apple/utils.h" +#include "internal/platform/implementation/apple/wifi_lan.h" #include "internal/platform/implementation/mutex.h" #include "internal/platform/implementation/shared/file.h" #include "internal/platform/payload_id.h" @@ -64,30 +64,30 @@ OSName ImplementationPlatform::GetCurrentOS() { return OSName::kiOS; } // Atomics: std::unique_ptr ImplementationPlatform::CreateAtomicBoolean(bool initial_value) { - return std::make_unique(initial_value); + return std::make_unique(initial_value); } std::unique_ptr ImplementationPlatform::CreateAtomicUint32( std::uint32_t initial_value) { - return std::make_unique(initial_value); + return std::make_unique(initial_value); } std::unique_ptr ImplementationPlatform::CreateCountDownLatch(std::int32_t count) { - return std::make_unique(count); + return std::make_unique(count); } std::unique_ptr ImplementationPlatform::CreateMutex(Mutex::Mode mode) { // iOS does not support unchecked Mutex in debug mode, therefore - // ios::Mutex is used for both kRegular and kRegularNoCheck. + // apple::Mutex is used for both kRegular and kRegularNoCheck. if (mode == Mutex::Mode::kRecursive) { - return std::make_unique(); + return std::make_unique(); } else { - return std::make_unique(); + return std::make_unique(); } } std::unique_ptr ImplementationPlatform::CreateConditionVariable(Mutex* mutex) { - return std::make_unique(static_cast(mutex)); + return std::make_unique(static_cast(mutex)); } ABSL_DEPRECATED("This interface will be deleted in the near future.") @@ -112,26 +112,26 @@ std::unique_ptr ImplementationPlatform::CreateOutputFile(const std:: std::unique_ptr ImplementationPlatform::CreateLogMessage( const char* file, int line, LogMessage::Severity severity) { - return std::make_unique(file, line, severity); + return std::make_unique(file, line, severity); } // Java-like Executors std::unique_ptr ImplementationPlatform::CreateSingleThreadExecutor() { - return std::make_unique(); + return std::make_unique(); } std::unique_ptr ImplementationPlatform::CreateMultiThreadExecutor( int max_concurrency) { - return std::make_unique(max_concurrency); + return std::make_unique(max_concurrency); } std::unique_ptr ImplementationPlatform::CreateScheduledExecutor() { - return std::make_unique(); + return std::make_unique(); } // Mediums std::unique_ptr ImplementationPlatform::CreateBluetoothAdapter() { - return std::make_unique(); + return std::make_unique(); } std::unique_ptr ImplementationPlatform::CreateBluetoothClassicMedium( @@ -145,7 +145,7 @@ std::unique_ptr ImplementationPlatform::CreateBleMedium(api::Bluetoot std::unique_ptr ImplementationPlatform::CreateBleV2Medium( api::BluetoothAdapter& adapter) { - return std::make_unique(adapter); + return std::make_unique(adapter); } std::unique_ptr ImplementationPlatform::CreateServerSyncMedium() { @@ -155,7 +155,7 @@ std::unique_ptr ImplementationPlatform::CreateServerSyncMedium std::unique_ptr ImplementationPlatform::CreateWifiMedium() { return nullptr; } std::unique_ptr ImplementationPlatform::CreateWifiLanMedium() { - return std::make_unique(); + return std::make_unique(); } std::unique_ptr ImplementationPlatform::CreateWifiHotspotMedium() { diff --git a/internal/platform/implementation/ios/scheduled_executor.h b/internal/platform/implementation/apple/scheduled_executor.h similarity index 90% rename from internal/platform/implementation/ios/scheduled_executor.h rename to internal/platform/implementation/apple/scheduled_executor.h index 104c0504..2cfcd321 100644 --- a/internal/platform/implementation/ios/scheduled_executor.h +++ b/internal/platform/implementation/apple/scheduled_executor.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef PLATFORM_IMPL_IOS_SCHEDULED_EXECUTOR_H_ -#define PLATFORM_IMPL_IOS_SCHEDULED_EXECUTOR_H_ +#ifndef PLATFORM_IMPL_APPLE_SCHEDULED_EXECUTOR_H_ +#define PLATFORM_IMPL_APPLE_SCHEDULED_EXECUTOR_H_ #ifdef __cplusplus #import @@ -36,7 +36,7 @@ namespace location { namespace nearby { -namespace ios { +namespace apple { // Concrete ScheduledExecutor implementation. class ScheduledExecutor : public api::ScheduledExecutor { @@ -62,9 +62,9 @@ class ScheduledExecutor : public api::ScheduledExecutor { GNCOperationQueueImpl* impl_; }; -} // namespace ios +} // namespace apple } // namespace nearby } // namespace location #endif -#endif // PLATFORM_IMPL_IOS_SCHEDULED_EXECUTOR_H_ +#endif // PLATFORM_IMPL_APPLE_SCHEDULED_EXECUTOR_H_ diff --git a/internal/platform/implementation/ios/scheduled_executor.mm b/internal/platform/implementation/apple/scheduled_executor.mm similarity index 93% rename from internal/platform/implementation/ios/scheduled_executor.mm rename to internal/platform/implementation/apple/scheduled_executor.mm index 96bd5405..1c7495cb 100644 --- a/internal/platform/implementation/ios/scheduled_executor.mm +++ b/internal/platform/implementation/apple/scheduled_executor.mm @@ -12,12 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/scheduled_executor.h" +#import "internal/platform/implementation/apple/scheduled_executor.h" #import +#include + #include "absl/time/time.h" -#import "internal/platform/implementation/ios/atomic_boolean.h" +#import "internal/platform/implementation/apple/atomic_boolean.h" #include "internal/platform/runnable.h" // This wraps the C++ Runnable in an Obj-C object for memory management. It is retained by the @@ -25,7 +27,7 @@ @interface GNCRunnableWrapper : NSObject { @public location::nearby::Runnable _runnable; - std::unique_ptr _canceled; + std::unique_ptr _canceled; } @end @@ -34,7 +36,7 @@ + (instancetype)wrapperWithRunnable:(location::nearby::Runnable)runnable { GNCRunnableWrapper *wrapper = [[GNCRunnableWrapper alloc] init]; wrapper->_runnable = runnable; - wrapper->_canceled = std::make_unique(false); + wrapper->_canceled = std::make_unique(false); return wrapper; } @@ -53,7 +55,7 @@ namespace location { namespace nearby { -namespace ios { +namespace apple { static const std::int64_t kExecutorShutdownDefaultTimeout = 500; // 0.5 seconds @@ -139,6 +141,6 @@ void ScheduledExecutor::Shutdown(std::int64_t timeout_millis) { dispatch_group_wait(group, dispatch_time(DISPATCH_TIME_NOW, timeout_millis * NSEC_PER_MSEC)); } -} // namespace ios +} // namespace apple } // namespace nearby } // namespace location diff --git a/internal/platform/implementation/ios/single_thread_executor.h b/internal/platform/implementation/apple/single_thread_executor.h similarity index 75% rename from internal/platform/implementation/ios/single_thread_executor.h rename to internal/platform/implementation/apple/single_thread_executor.h index 3029c8bb..35bd8aef 100644 --- a/internal/platform/implementation/ios/single_thread_executor.h +++ b/internal/platform/implementation/apple/single_thread_executor.h @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef PLATFORM_IMPL_IOS_SINGLE_THREAD_EXECUTOR_H_ -#define PLATFORM_IMPL_IOS_SINGLE_THREAD_EXECUTOR_H_ +#ifndef PLATFORM_IMPL_APPLE_SINGLE_THREAD_EXECUTOR_H_ +#define PLATFORM_IMPL_APPLE_SINGLE_THREAD_EXECUTOR_H_ #ifdef __cplusplus -#import "internal/platform/implementation/ios/multi_thread_executor.h" +#import "internal/platform/implementation/apple/multi_thread_executor.h" namespace location { namespace nearby { -namespace ios { +namespace apple { class SingleThreadExecutor : public MultiThreadExecutor { public: @@ -28,9 +28,9 @@ class SingleThreadExecutor : public MultiThreadExecutor { ~SingleThreadExecutor() override = default; }; -} // namespace ios +} // namespace apple } // namespace nearby } // namespace location #endif -#endif // PLATFORM_IMPL_IOS_SINGLE_THREAD_EXECUTOR_H_ +#endif // PLATFORM_IMPL_APPLE_SINGLE_THREAD_EXECUTOR_H_ diff --git a/internal/platform/implementation/ios/system_clock.cc b/internal/platform/implementation/apple/system_clock.cc similarity index 100% rename from internal/platform/implementation/ios/system_clock.cc rename to internal/platform/implementation/apple/system_clock.cc diff --git a/internal/platform/implementation/ios/utils.h b/internal/platform/implementation/apple/utils.h similarity index 100% rename from internal/platform/implementation/ios/utils.h rename to internal/platform/implementation/apple/utils.h diff --git a/internal/platform/implementation/ios/utils.mm b/internal/platform/implementation/apple/utils.mm similarity index 98% rename from internal/platform/implementation/ios/utils.mm rename to internal/platform/implementation/apple/utils.mm index 58385de6..f2c1749f 100644 --- a/internal/platform/implementation/ios/utils.mm +++ b/internal/platform/implementation/apple/utils.mm @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/utils.h" +#import "internal/platform/implementation/apple/utils.h" #import "absl/container/flat_hash_map.h" #include "absl/strings/string_view.h" diff --git a/internal/platform/implementation/ios/wifi_lan.h b/internal/platform/implementation/apple/wifi_lan.h similarity index 96% rename from internal/platform/implementation/ios/wifi_lan.h rename to internal/platform/implementation/apple/wifi_lan.h index 914dfc1b..7d32db4a 100644 --- a/internal/platform/implementation/ios/wifi_lan.h +++ b/internal/platform/implementation/apple/wifi_lan.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef PLATFORM_IMPL_IOS_WIFI_LAN_H_ -#define PLATFORM_IMPL_IOS_WIFI_LAN_H_ +#ifndef PLATFORM_IMPL_APPLE_WIFI_LAN_H_ +#define PLATFORM_IMPL_APPLE_WIFI_LAN_H_ #ifdef __cplusplus #import @@ -21,7 +21,7 @@ #include "absl/base/thread_annotations.h" #include "absl/container/flat_hash_map.h" -#import "internal/platform/implementation/ios/Mediums/GNCMConnection.h" // IWYU pragma: export +#import "internal/platform/implementation/apple/Mediums/GNCMConnection.h" // IWYU pragma: export #include "internal/platform/implementation/wifi_lan.h" #include "internal/platform/nsd_service_info.h" @@ -30,7 +30,7 @@ namespace location { namespace nearby { -namespace ios { +namespace apple { /** InputStream that reads from GNCMConnection. */ class WifiLanInputStream : public InputStream { @@ -199,9 +199,9 @@ class WifiLanMedium : public api::WifiLanMedium { ABSL_GUARDED_BY(mutex_); }; -} // namespace ios +} // namespace apple } // namespace nearby } // namespace location #endif -#endif // PLATFORM_IMPL_IOS_WIFI_LAN_H_ +#endif // PLATFORM_IMPL_APPLE_WIFI_LAN_H_ diff --git a/internal/platform/implementation/ios/wifi_lan.mm b/internal/platform/implementation/apple/wifi_lan.mm similarity index 97% rename from internal/platform/implementation/ios/wifi_lan.mm rename to internal/platform/implementation/apple/wifi_lan.mm index 24795467..94948796 100644 --- a/internal/platform/implementation/ios/wifi_lan.mm +++ b/internal/platform/implementation/apple/wifi_lan.mm @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/wifi_lan.h" +#import "internal/platform/implementation/apple/wifi_lan.h" #include #include @@ -26,10 +26,10 @@ #include "absl/synchronization/mutex.h" #include "internal/platform/cancellation_flag.h" #include "internal/platform/exception.h" -#import "internal/platform/implementation/ios/Mediums/GNCMConnection.h" -#import "internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourBrowser.h" -#import "internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourService.h" -#include "internal/platform/implementation/ios/utils.h" +#import "internal/platform/implementation/apple/Mediums/GNCMConnection.h" +#import "internal/platform/implementation/apple/Mediums/WifiLan/GNCMBonjourBrowser.h" +#import "internal/platform/implementation/apple/Mediums/WifiLan/GNCMBonjourService.h" +#include "internal/platform/implementation/apple/utils.h" #include "internal/platform/implementation/wifi_lan.h" #include "internal/platform/nsd_service_info.h" #include "internal/platform/prng.h" @@ -37,7 +37,7 @@ namespace location { namespace nearby { -namespace ios { +namespace apple { /** WifiLanInputStream implementation. */ WifiLanInputStream::WifiLanInputStream() @@ -492,6 +492,6 @@ int WifiLanMedium::GetFakePort() const { return port; } -} // namespace ios +} // namespace apple } // namespace nearby } // namespace location