diff --git a/Package.swift b/Package.swift index d8a83f24..87290f41 100644 --- a/Package.swift +++ b/Package.swift @@ -395,11 +395,12 @@ let package = Package( "connections/swift/NearbyCoreAdapter/Tests", "internal/platform/implementation/g3", "internal/platform/implementation/android", - "internal/platform/implementation/apple/Tests", "internal/platform/implementation/apple/Flags/Tests", "internal/platform/implementation/apple/Log/Tests", - "internal/platform/implementation/apple/Mediums/Ble/Sockets/Tests", + "internal/platform/implementation/apple/Mediums/BLE/Tests", + "internal/platform/implementation/apple/Mediums/BLE/Sockets/Tests", "internal/platform/implementation/apple/Mediums/WiFiCommon/Tests", + "internal/platform/implementation/apple/Tests", "internal/platform/implementation/windows", "third_party", "CONTRIBUTING.md", @@ -426,13 +427,13 @@ let package = Package( "internal/weave/sockets/BUILD", "internal/platform/flags/BUILD", "internal/platform/implementation/shared/BUILD", + "internal/platform/implementation/apple/BUILD", "internal/platform/implementation/apple/Flags/BUILD", "internal/platform/implementation/apple/Log/BUILD", "internal/platform/implementation/apple/Mediums/BUILD", - "internal/platform/implementation/apple/Mediums/Ble/Sockets/BUILD", + "internal/platform/implementation/apple/Mediums/BLE/BUILD", + "internal/platform/implementation/apple/Mediums/BLE/Sockets/BUILD", "internal/platform/implementation/apple/Mediums/WiFiCommon/BUILD", - "internal/platform/implementation/apple/Tests/BUILD", - "internal/platform/implementation/apple/BUILD", "internal/platform/implementation/BUILD", "internal/platform/BUILD", "internal/analytics/BUILD", diff --git a/internal/platform/implementation/apple/BUILD b/internal/platform/implementation/apple/BUILD index 832b3a71..42a56f8d 100644 --- a/internal/platform/implementation/apple/BUILD +++ b/internal/platform/implementation/apple/BUILD @@ -117,30 +117,30 @@ objc_library( objc_library( name = "ble_v2", srcs = [ - "ble_gatt_client.h", "ble_gatt_client.mm", - "ble_gatt_server.h", "ble_gatt_server.mm", - "ble_l2cap_server_socket.h", "ble_l2cap_server_socket.mm", - "ble_l2cap_socket.h", "ble_l2cap_socket.mm", - "ble_medium.h", "ble_medium.mm", - "ble_peripheral.h", "ble_peripheral.mm", - "ble_server_socket.h", "ble_server_socket.mm", - "ble_socket.h", "ble_socket.mm", "ble_utils.mm", - "bluetooth_adapter_v2.h", "bluetooth_adapter_v2.mm", "utils.mm", ], hdrs = [ "ble.h", + "ble_gatt_client.h", + "ble_gatt_server.h", + "ble_l2cap_server_socket.h", + "ble_l2cap_socket.h", + "ble_medium.h", + "ble_peripheral.h", + "ble_server_socket.h", + "ble_socket.h", "ble_utils.h", + "bluetooth_adapter_v2.h", "utils.h", ], # Prevent Objective-C++ headers from being pulled into swift. @@ -152,12 +152,11 @@ objc_library( "//internal/platform:mac_address", "//internal/platform:uuid", "//internal/platform/implementation:comm", - "//internal/platform/implementation:types", "//internal/platform/implementation/apple/Flags", "//internal/platform/implementation/apple/Log:GNCLogger", - "//internal/platform/implementation/apple/Mediums", - "//internal/platform/implementation/apple/Mediums/Ble/Sockets:Central", - "//internal/platform/implementation/apple/Mediums/Ble/Sockets:Peripheral", + "//internal/platform/implementation/apple/Mediums/BLE", + "//internal/platform/implementation/apple/Mediums/BLE/Sockets:Central", + "//internal/platform/implementation/apple/Mediums/BLE/Sockets:Peripheral", "//third_party/apple_frameworks:CoreBluetooth", "//third_party/apple_frameworks:Foundation", "@com_google_absl//absl/container:flat_hash_map", diff --git a/internal/platform/implementation/apple/Mediums/BLE/BUILD b/internal/platform/implementation/apple/Mediums/BLE/BUILD new file mode 100644 index 00000000..2a7a19f8 --- /dev/null +++ b/internal/platform/implementation/apple/Mediums/BLE/BUILD @@ -0,0 +1,76 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +load("@rules_cc//cc:objc_library.bzl", "objc_library") + +licenses(["notice"]) + +package(default_visibility = [ + "//internal/platform/implementation/apple:__subpackages__", +]) + +objc_library( + name = "BLE", + srcs = [ + "GNCBLEError.m", + "GNCBLEGATTCharacteristic.m", + "GNCBLEGATTClient.m", + "GNCBLEGATTServer.m", + "GNCBLEL2CAPClient.m", + "GNCBLEL2CAPConnection.m", + "GNCBLEL2CAPServer.m", + "GNCBLEL2CAPStream.m", + "GNCBLEMedium.m", + "GNCCentralManager.m", + "GNCLeaks.m", + "GNCMBleConnection.m", + "GNCMBleUtils.mm", + "GNCMConnection.m", + "GNCPeripheral.m", + "GNCPeripheralManager.m", + "NSData+GNCBase85.mm", + "NSData+GNCWebSafeBase64.m", + ], + hdrs = [ + "GNCBLEError.h", + "GNCBLEGATTCharacteristic.h", + "GNCBLEGATTClient.h", + "GNCBLEGATTServer.h", + "GNCBLEL2CAPClient.h", + "GNCBLEL2CAPConnection.h", + "GNCBLEL2CAPServer.h", + "GNCBLEL2CAPStream.h", + "GNCBLEMedium.h", + "GNCCentralManager.h", + "GNCLeaks.h", + "GNCMBleConnection.h", + "GNCMBleUtils.h", + "GNCMConnection.h", + "GNCPeripheral.h", + "GNCPeripheralManager.h", + "NSData+GNCBase85.h", + "NSData+GNCWebSafeBase64.h", + ], + deps = [ + "//internal/encoding:base85", + "//internal/platform/implementation/apple:Shared", + "//internal/platform/implementation/apple/Flags", + "//internal/platform/implementation/apple/Log:GNCLogger", + "//internal/platform/implementation/apple/Mediums/BLE/Sockets:Shared", + "//proto/mediums:ble_frames_cc_proto", + "//third_party/apple_frameworks:CoreBluetooth", + "//third_party/apple_frameworks:Foundation", + "//third_party/apple_frameworks:ObjectiveC", + ], +) diff --git a/internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEError.h b/internal/platform/implementation/apple/Mediums/BLE/GNCBLEError.h similarity index 100% rename from internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEError.h rename to internal/platform/implementation/apple/Mediums/BLE/GNCBLEError.h diff --git a/internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEError.m b/internal/platform/implementation/apple/Mediums/BLE/GNCBLEError.m similarity index 90% rename from internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEError.m rename to internal/platform/implementation/apple/Mediums/BLE/GNCBLEError.m index 53d2b15a..7614f13e 100644 --- a/internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEError.m +++ b/internal/platform/implementation/apple/Mediums/BLE/GNCBLEError.m @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEError.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEError.h" #import diff --git a/internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTCharacteristic.h b/internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTCharacteristic.h similarity index 100% rename from internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTCharacteristic.h rename to internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTCharacteristic.h diff --git a/internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTCharacteristic.m b/internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTCharacteristic.m similarity index 94% rename from internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTCharacteristic.m rename to internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTCharacteristic.m index 6759b417..0e0cae0a 100644 --- a/internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTCharacteristic.m +++ b/internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTCharacteristic.m @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTCharacteristic.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTCharacteristic.h" #import #import diff --git a/internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTClient.h b/internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTClient.h similarity index 100% rename from internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTClient.h rename to internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTClient.h diff --git a/internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTClient.m b/internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTClient.m similarity index 98% rename from internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTClient.m rename to internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTClient.m index 81cdd7ab..cc13f086 100644 --- a/internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTClient.m +++ b/internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTClient.m @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTClient.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTClient.h" #import #import #import "internal/platform/implementation/apple/Log/GNCLogger.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEError.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTCharacteristic.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCPeripheral.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEError.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTCharacteristic.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCPeripheral.h" NS_ASSUME_NONNULL_BEGIN diff --git a/internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTServer.h b/internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTServer.h similarity index 100% rename from internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTServer.h rename to internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTServer.h diff --git a/internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTServer.m b/internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTServer.m similarity index 96% rename from internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTServer.m rename to internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTServer.m index bdcb2403..9ff2f484 100644 --- a/internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTServer.m +++ b/internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTServer.m @@ -12,18 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTServer.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTServer.h" #import #import #import "internal/platform/implementation/apple/Flags/GNCFeatureFlags.h" #import "internal/platform/implementation/apple/Log/GNCLogger.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEError.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTCharacteristic.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCPeripheralManager.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/NSData+GNCBase85.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/NSData+GNCWebSafeBase64.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEError.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTCharacteristic.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCPeripheralManager.h" +#import "internal/platform/implementation/apple/Mediums/BLE/NSData+GNCBase85.h" +#import "internal/platform/implementation/apple/Mediums/BLE/NSData+GNCWebSafeBase64.h" NS_ASSUME_NONNULL_BEGIN diff --git a/internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPClient.h b/internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPClient.h similarity index 96% rename from internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPClient.h rename to internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPClient.h index 3ca5607b..838955bb 100644 --- a/internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPClient.h +++ b/internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPClient.h @@ -14,7 +14,7 @@ #import -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPStream.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPStream.h" @protocol GNCPeripheral; diff --git a/internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPClient.m b/internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPClient.m similarity index 93% rename from internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPClient.m rename to internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPClient.m index 1b247a20..1413a518 100644 --- a/internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPClient.m +++ b/internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPClient.m @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPClient.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPClient.h" #import #import #import "internal/platform/implementation/apple/Log/GNCLogger.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEError.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPStream.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCPeripheral.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEError.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPStream.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCPeripheral.h" static char *const kGNCBLEL2CAPClientQueueLabel = "com.google.nearby.GNCBLEL2CAPClient"; diff --git a/internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPConnection.h b/internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPConnection.h similarity index 96% rename from internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPConnection.h rename to internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPConnection.h index cf5d5b55..4ba16897 100644 --- a/internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPConnection.h +++ b/internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPConnection.h @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/Mediums/GNCMConnection.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCMConnection.h" NS_ASSUME_NONNULL_BEGIN diff --git a/internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPConnection.m b/internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPConnection.m similarity index 97% rename from internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPConnection.m rename to internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPConnection.m index 6664f0a4..41951f41 100644 --- a/internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPConnection.m +++ b/internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPConnection.m @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPConnection.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPConnection.h" #import #import "internal/platform/implementation/apple/Log/GNCLogger.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPStream.h" -#import "internal/platform/implementation/apple/Mediums/Ble/GNCMBleUtils.h" -#import "internal/platform/implementation/apple/Mediums/GNCLeaks.h" -#import "internal/platform/implementation/apple/Mediums/GNCMConnection.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPStream.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCLeaks.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCMBleUtils.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCMConnection.h" enum { kL2CAPPacketLength = 4 }; static const CGFloat kRequestDataConnectionDelayInSeconds = 0.0; diff --git a/internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPServer.h b/internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPServer.h similarity index 100% rename from internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPServer.h rename to internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPServer.h diff --git a/internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPServer.m b/internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPServer.m similarity index 96% rename from internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPServer.m rename to internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPServer.m index ae814890..e33f458a 100644 --- a/internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPServer.m +++ b/internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPServer.m @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPServer.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPServer.h" #import #import #import "internal/platform/implementation/apple/Log/GNCLogger.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEError.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPStream.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCPeripheralManager.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEError.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPStream.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCPeripheralManager.h" NS_ASSUME_NONNULL_BEGIN diff --git a/internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPStream.h b/internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPStream.h similarity index 100% rename from internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPStream.h rename to internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPStream.h diff --git a/internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPStream.m b/internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPStream.m similarity index 99% rename from internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPStream.m rename to internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPStream.m index 81fb7c7e..24f0f518 100644 --- a/internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPStream.m +++ b/internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPStream.m @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPStream.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPStream.h" #import "internal/platform/implementation/apple/Log/GNCLogger.h" diff --git a/internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEMedium.h b/internal/platform/implementation/apple/Mediums/BLE/GNCBLEMedium.h similarity index 97% rename from internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEMedium.h rename to internal/platform/implementation/apple/Mediums/BLE/GNCBLEMedium.h index 65a8e633..9efacabc 100644 --- a/internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEMedium.h +++ b/internal/platform/implementation/apple/Mediums/BLE/GNCBLEMedium.h @@ -15,9 +15,9 @@ #import #import -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPClient.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPServer.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCCentralManager.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPClient.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPServer.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCCentralManager.h" @class GNCBLEGATTServer; @class GNCBLEGATTClient; diff --git a/internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEMedium.m b/internal/platform/implementation/apple/Mediums/BLE/GNCBLEMedium.m similarity index 96% rename from internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEMedium.m rename to internal/platform/implementation/apple/Mediums/BLE/GNCBLEMedium.m index 0e14d94b..d0ddacd6 100644 --- a/internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEMedium.m +++ b/internal/platform/implementation/apple/Mediums/BLE/GNCBLEMedium.m @@ -12,22 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEMedium.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEMedium.h" #import #import #import "internal/platform/implementation/apple/Flags/GNCFeatureFlags.h" #import "internal/platform/implementation/apple/Log/GNCLogger.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEError.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTClient.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTServer.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPClient.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPServer.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCCentralManager.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCPeripheral.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/NSData+GNCBase85.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/NSData+GNCWebSafeBase64.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEError.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTClient.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTServer.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPClient.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPServer.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCCentralManager.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCPeripheral.h" +#import "internal/platform/implementation/apple/Mediums/BLE/NSData+GNCBase85.h" +#import "internal/platform/implementation/apple/Mediums/BLE/NSData+GNCWebSafeBase64.h" NS_ASSUME_NONNULL_BEGIN @@ -443,6 +443,9 @@ static GNCBLEL2CAPServer *_Nonnull CreateL2CapServer( #pragma mark - GNCCentralManagerDelegate - (void)gnc_centralManagerDidUpdateState:(id)central { + if (!_queue) { + return; + } dispatch_assert_queue(_queue); [self internalStartScanningIfPoweredOn]; } diff --git a/internal/platform/implementation/apple/Mediums/BLEv2/GNCCentralManager.h b/internal/platform/implementation/apple/Mediums/BLE/GNCCentralManager.h similarity index 100% rename from internal/platform/implementation/apple/Mediums/BLEv2/GNCCentralManager.h rename to internal/platform/implementation/apple/Mediums/BLE/GNCCentralManager.h diff --git a/internal/platform/implementation/apple/Mediums/BLEv2/GNCCentralManager.m b/internal/platform/implementation/apple/Mediums/BLE/GNCCentralManager.m similarity index 93% rename from internal/platform/implementation/apple/Mediums/BLEv2/GNCCentralManager.m rename to internal/platform/implementation/apple/Mediums/BLE/GNCCentralManager.m index 921e8d92..a86bfee6 100644 --- a/internal/platform/implementation/apple/Mediums/BLEv2/GNCCentralManager.m +++ b/internal/platform/implementation/apple/Mediums/BLE/GNCCentralManager.m @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCCentralManager.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCCentralManager.h" #import #import diff --git a/internal/platform/implementation/apple/Mediums/GNCLeaks.h b/internal/platform/implementation/apple/Mediums/BLE/GNCLeaks.h similarity index 100% rename from internal/platform/implementation/apple/Mediums/GNCLeaks.h rename to internal/platform/implementation/apple/Mediums/BLE/GNCLeaks.h diff --git a/internal/platform/implementation/apple/Mediums/GNCLeaks.m b/internal/platform/implementation/apple/Mediums/BLE/GNCLeaks.m similarity index 94% rename from internal/platform/implementation/apple/Mediums/GNCLeaks.m rename to internal/platform/implementation/apple/Mediums/BLE/GNCLeaks.m index 9f53086d..161ac2e8 100644 --- a/internal/platform/implementation/apple/Mediums/GNCLeaks.m +++ b/internal/platform/implementation/apple/Mediums/BLE/GNCLeaks.m @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/Mediums/GNCLeaks.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCLeaks.h" #import "internal/platform/implementation/apple/Log/GNCLogger.h" void GNCVerifyDealloc(id object, NSTimeInterval timeInterval) { diff --git a/internal/platform/implementation/apple/Mediums/Ble/GNCMBleConnection.h b/internal/platform/implementation/apple/Mediums/BLE/GNCMBleConnection.h similarity index 94% rename from internal/platform/implementation/apple/Mediums/Ble/GNCMBleConnection.h rename to internal/platform/implementation/apple/Mediums/BLE/GNCMBleConnection.h index dd9114f6..a50cd779 100644 --- a/internal/platform/implementation/apple/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/apple/Mediums/GNCMConnection.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCMConnection.h" NS_ASSUME_NONNULL_BEGIN diff --git a/internal/platform/implementation/apple/Mediums/Ble/GNCMBleConnection.m b/internal/platform/implementation/apple/Mediums/BLE/GNCMBleConnection.m similarity index 93% rename from internal/platform/implementation/apple/Mediums/Ble/GNCMBleConnection.m rename to internal/platform/implementation/apple/Mediums/BLE/GNCMBleConnection.m index 66dc9a40..0a8237cd 100644 --- a/internal/platform/implementation/apple/Mediums/Ble/GNCMBleConnection.m +++ b/internal/platform/implementation/apple/Mediums/BLE/GNCMBleConnection.m @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/Mediums/Ble/GNCMBleConnection.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCMBleConnection.h" #import "internal/platform/implementation/apple/Log/GNCLogger.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 "internal/platform/implementation/apple/Mediums/BLE/GNCLeaks.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCMBleUtils.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCMConnection.h" +#import "internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Shared/GNSSocket.h" NS_ASSUME_NONNULL_BEGIN diff --git a/internal/platform/implementation/apple/Mediums/Ble/GNCMBleUtils.h b/internal/platform/implementation/apple/Mediums/BLE/GNCMBleUtils.h similarity index 100% rename from internal/platform/implementation/apple/Mediums/Ble/GNCMBleUtils.h rename to internal/platform/implementation/apple/Mediums/BLE/GNCMBleUtils.h diff --git a/internal/platform/implementation/apple/Mediums/Ble/GNCMBleUtils.mm b/internal/platform/implementation/apple/Mediums/BLE/GNCMBleUtils.mm similarity index 98% rename from internal/platform/implementation/apple/Mediums/Ble/GNCMBleUtils.mm rename to internal/platform/implementation/apple/Mediums/BLE/GNCMBleUtils.mm index edbfd5be..f7028b8a 100644 --- a/internal/platform/implementation/apple/Mediums/Ble/GNCMBleUtils.mm +++ b/internal/platform/implementation/apple/Mediums/BLE/GNCMBleUtils.mm @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/Mediums/Ble/GNCMBleUtils.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCMBleUtils.h" #include #include @@ -20,7 +20,7 @@ #import "internal/platform/implementation/apple/GNCUtils.h" #import "internal/platform/implementation/apple/Log/GNCLogger.h" -#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSSocket.h" +#import "internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Shared/GNSSocket.h" #include "proto/mediums/ble_frames.pb.h" NS_ASSUME_NONNULL_BEGIN diff --git a/internal/platform/implementation/apple/Mediums/GNCMConnection.h b/internal/platform/implementation/apple/Mediums/BLE/GNCMConnection.h similarity index 100% rename from internal/platform/implementation/apple/Mediums/GNCMConnection.h rename to internal/platform/implementation/apple/Mediums/BLE/GNCMConnection.h diff --git a/internal/platform/implementation/apple/Mediums/GNCMConnection.m b/internal/platform/implementation/apple/Mediums/BLE/GNCMConnection.m similarity index 92% rename from internal/platform/implementation/apple/Mediums/GNCMConnection.m rename to internal/platform/implementation/apple/Mediums/BLE/GNCMConnection.m index 7534ba5f..d1eaff53 100644 --- a/internal/platform/implementation/apple/Mediums/GNCMConnection.m +++ b/internal/platform/implementation/apple/Mediums/BLE/GNCMConnection.m @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/Mediums/GNCMConnection.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCMConnection.h" NS_ASSUME_NONNULL_BEGIN diff --git a/internal/platform/implementation/apple/Mediums/BLEv2/GNCPeripheral.h b/internal/platform/implementation/apple/Mediums/BLE/GNCPeripheral.h similarity index 100% rename from internal/platform/implementation/apple/Mediums/BLEv2/GNCPeripheral.h rename to internal/platform/implementation/apple/Mediums/BLE/GNCPeripheral.h diff --git a/internal/platform/implementation/apple/Mediums/BLEv2/GNCPeripheral.m b/internal/platform/implementation/apple/Mediums/BLE/GNCPeripheral.m similarity index 92% rename from internal/platform/implementation/apple/Mediums/BLEv2/GNCPeripheral.m rename to internal/platform/implementation/apple/Mediums/BLE/GNCPeripheral.m index 69923133..c334ef3b 100644 --- a/internal/platform/implementation/apple/Mediums/BLEv2/GNCPeripheral.m +++ b/internal/platform/implementation/apple/Mediums/BLE/GNCPeripheral.m @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCPeripheral.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCPeripheral.h" #import #import diff --git a/internal/platform/implementation/apple/Mediums/BLEv2/GNCPeripheralManager.h b/internal/platform/implementation/apple/Mediums/BLE/GNCPeripheralManager.h similarity index 100% rename from internal/platform/implementation/apple/Mediums/BLEv2/GNCPeripheralManager.h rename to internal/platform/implementation/apple/Mediums/BLE/GNCPeripheralManager.h diff --git a/internal/platform/implementation/apple/Mediums/BLEv2/GNCPeripheralManager.m b/internal/platform/implementation/apple/Mediums/BLE/GNCPeripheralManager.m similarity index 92% rename from internal/platform/implementation/apple/Mediums/BLEv2/GNCPeripheralManager.m rename to internal/platform/implementation/apple/Mediums/BLE/GNCPeripheralManager.m index 784b6b76..5d8e71c5 100644 --- a/internal/platform/implementation/apple/Mediums/BLEv2/GNCPeripheralManager.m +++ b/internal/platform/implementation/apple/Mediums/BLE/GNCPeripheralManager.m @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCPeripheralManager.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCPeripheralManager.h" #import #import diff --git a/internal/platform/implementation/apple/Mediums/BLEv2/NSData+GNCBase85.h b/internal/platform/implementation/apple/Mediums/BLE/NSData+GNCBase85.h similarity index 100% rename from internal/platform/implementation/apple/Mediums/BLEv2/NSData+GNCBase85.h rename to internal/platform/implementation/apple/Mediums/BLE/NSData+GNCBase85.h diff --git a/internal/platform/implementation/apple/Mediums/BLEv2/NSData+GNCBase85.mm b/internal/platform/implementation/apple/Mediums/BLE/NSData+GNCBase85.mm similarity index 94% rename from internal/platform/implementation/apple/Mediums/BLEv2/NSData+GNCBase85.mm rename to internal/platform/implementation/apple/Mediums/BLE/NSData+GNCBase85.mm index 92e83c53..fe1beeaf 100644 --- a/internal/platform/implementation/apple/Mediums/BLEv2/NSData+GNCBase85.mm +++ b/internal/platform/implementation/apple/Mediums/BLE/NSData+GNCBase85.mm @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/Mediums/BLEv2/NSData+GNCBase85.h" +#import "internal/platform/implementation/apple/Mediums/BLE/NSData+GNCBase85.h" #import diff --git a/internal/platform/implementation/apple/Mediums/BLEv2/NSData+GNCWebSafeBase64.h b/internal/platform/implementation/apple/Mediums/BLE/NSData+GNCWebSafeBase64.h similarity index 100% rename from internal/platform/implementation/apple/Mediums/BLEv2/NSData+GNCWebSafeBase64.h rename to internal/platform/implementation/apple/Mediums/BLE/NSData+GNCWebSafeBase64.h diff --git a/internal/platform/implementation/apple/Mediums/BLEv2/NSData+GNCWebSafeBase64.m b/internal/platform/implementation/apple/Mediums/BLE/NSData+GNCWebSafeBase64.m similarity index 95% rename from internal/platform/implementation/apple/Mediums/BLEv2/NSData+GNCWebSafeBase64.m rename to internal/platform/implementation/apple/Mediums/BLE/NSData+GNCWebSafeBase64.m index e2dd69cb..d8cfec40 100644 --- a/internal/platform/implementation/apple/Mediums/BLEv2/NSData+GNCWebSafeBase64.m +++ b/internal/platform/implementation/apple/Mediums/BLE/NSData+GNCWebSafeBase64.m @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/Mediums/BLEv2/NSData+GNCWebSafeBase64.h" +#import "internal/platform/implementation/apple/Mediums/BLE/NSData+GNCWebSafeBase64.h" #import diff --git a/internal/platform/implementation/apple/Mediums/Ble/Sockets/BUILD b/internal/platform/implementation/apple/Mediums/BLE/Sockets/BUILD similarity index 67% rename from internal/platform/implementation/apple/Mediums/Ble/Sockets/BUILD rename to internal/platform/implementation/apple/Mediums/BLE/Sockets/BUILD index 8d1aed1a..97954b96 100644 --- a/internal/platform/implementation/apple/Mediums/Ble/Sockets/BUILD +++ b/internal/platform/implementation/apple/Mediums/BLE/Sockets/BUILD @@ -12,14 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@rules_apple//apple:ios.bzl", "ios_unit_test") load("@rules_cc//cc:objc_library.bzl", "objc_library") load("//third_party/nearby:minimum_os.bzl", "IOS_MINIMUM_OS") load("//tools/build_defs/swift:swift_explicit_module_build_test.bzl", "swift_explicit_module_build_test") licenses(["notice"]) -package(default_visibility = ["//visibility:public"]) +package(default_visibility = ["//internal/platform/implementation/apple:__subpackages__"]) objc_library( name = "Central", @@ -82,57 +81,12 @@ objc_library( ], deps = [ "//internal/platform/implementation/apple/Log:GNCLogger", + "//third_party/apple_frameworks:CommonCrypto", "//third_party/apple_frameworks:CoreBluetooth", - "//third_party/apple_frameworks:CoreFoundation", "//third_party/apple_frameworks:Foundation", - "//third_party/apple_frameworks:QuartzCore", ], ) -objc_library( - name = "CentralTestsLib", - testonly = 1, - srcs = [ - "Tests/Central/GNSCentralManagerTest.m", - ], - deps = [ - ":Central", - ":Shared", - "//internal/platform/implementation/apple/Log:GNCLogger", - "//third_party/objective_c/ocmock/v3:OCMock", - ], -) - -ios_unit_test( - name = "CentralTests", - google_create_srl_bindings_module = False, - minimum_os_version = IOS_MINIMUM_OS, - runner = "//testing/utp/ios:IOS_LATEST", - deps = [":CentralTestsLib"], -) - -objc_library( - name = "SharedTestsLib", - testonly = 1, - srcs = [ - "Tests/Shared/GNSSocketTest.m", - "Tests/Shared/GNSWeavePacketTest.m", - ], - deps = [ - ":Shared", - "//internal/platform/implementation/apple/Log:GNCLogger", - "//third_party/objective_c/ocmock/v3:OCMock", - ], -) - -ios_unit_test( - name = "SharedTests", - google_create_srl_bindings_module = False, - minimum_os_version = IOS_MINIMUM_OS, - runner = "//testing/utp/ios:IOS_LATEST", - deps = [":SharedTestsLib"], -) - swift_explicit_module_build_test( name = "swift_explicit_module_build_test", ignore_headerless_targets = True, diff --git a/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralManager+Private.h b/internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Central/GNSCentralManager+Private.h similarity index 94% rename from internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralManager+Private.h rename to internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Central/GNSCentralManager+Private.h index dd492510..ace2b295 100644 --- a/internal/platform/implementation/apple/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/apple/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/apple/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/apple/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/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralManager.m b/internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Central/GNSCentralManager.m similarity index 98% rename from internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralManager.m rename to internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Central/GNSCentralManager.m index 3fd6eeb6..dca2dbf6 100644 --- a/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralManager.m +++ b/internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Central/GNSCentralManager.m @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#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/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/apple/Log/GNCLogger.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 "internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Central/GNSCentralPeerManager+Private.h" +#import "internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Central/GNSCentralPeerManager.h" NS_ASSUME_NONNULL_BEGIN diff --git a/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager+Private.h b/internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Central/GNSCentralPeerManager+Private.h similarity index 94% rename from internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager+Private.h rename to internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Central/GNSCentralPeerManager+Private.h index 0ef45f3c..4140b313 100644 --- a/internal/platform/implementation/apple/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/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager.h" +#import "internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Central/GNSCentralPeerManager.h" -#import "internal/platform/implementation/apple/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/apple/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/apple/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/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager.m b/internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Central/GNSCentralPeerManager.m similarity index 98% rename from internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager.m rename to internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Central/GNSCentralPeerManager.m index e93a9f80..0e2ad7cc 100644 --- a/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Central/GNSCentralPeerManager.m +++ b/internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Central/GNSCentralPeerManager.m @@ -12,17 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -#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/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/apple/Log/GNCLogger.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+Private.h" -#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSSocket.h" -#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSUtils+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 "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+Private.h" +#import "internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Shared/GNSSocket.h" +#import "internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Shared/GNSUtils+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" static const NSTimeInterval kMaxConnectionConfirmWaitTimeInSeconds = 2; static const NSTimeInterval kPeripheralFailedToConnectTimeout = 10.0; diff --git a/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/GNSCentral.h b/internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/GNSCentral.h similarity index 78% rename from internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/GNSCentral.h rename to internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/GNSCentral.h index 58f633dd..ed023ad5 100644 --- a/internal/platform/implementation/apple/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/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" +#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/apple/Mediums/Ble/Sockets/Source/GNSPeripheral.h b/internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/GNSPeripheral.h similarity index 78% rename from internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/GNSPeripheral.h rename to internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/GNSPeripheral.h index c12b08b6..aaa6bc26 100644 --- a/internal/platform/implementation/apple/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/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" +#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/apple/Mediums/Ble/Sockets/Source/GNSShared.h b/internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/GNSShared.h similarity index 83% rename from internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/GNSShared.h rename to internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/GNSShared.h index bad04221..b88db0bf 100644 --- a/internal/platform/implementation/apple/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/apple/Mediums/Ble/Sockets/Source/Shared/GNSSocket.h" -#import "internal/platform/implementation/apple/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/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager+Private.h b/internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Peripheral/GNSPeripheralManager+Private.h similarity index 95% rename from internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager+Private.h rename to internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Peripheral/GNSPeripheralManager+Private.h index 57c5adc8..c1e726bf 100644 --- a/internal/platform/implementation/apple/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/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager.h" +#import "internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Peripheral/GNSPeripheralManager.h" -#import "internal/platform/implementation/apple/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/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager.h b/internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Peripheral/GNSPeripheralManager.h similarity index 98% rename from internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager.h rename to internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Peripheral/GNSPeripheralManager.h index 8c325d73..b267fb29 100644 --- a/internal/platform/implementation/apple/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/apple/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/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager.m b/internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Peripheral/GNSPeripheralManager.m similarity index 99% rename from internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager.m rename to internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Peripheral/GNSPeripheralManager.m index 4ba828d2..423a1896 100644 --- a/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralManager.m +++ b/internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Peripheral/GNSPeripheralManager.m @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/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/apple/Log/GNCLogger.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/Peripheral/GNSPeripheralServiceManager+Private.h" +#import "internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Shared/GNSSocket+Private.h" #if TARGET_OS_IPHONE #import diff --git a/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager+Private.h b/internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Peripheral/GNSPeripheralServiceManager+Private.h similarity index 97% rename from internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager+Private.h rename to internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Peripheral/GNSPeripheralServiceManager+Private.h index 0f7ba684..a1da8bed 100644 --- a/internal/platform/implementation/apple/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/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager.h" +#import "internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Peripheral/GNSPeripheralServiceManager.h" -#import "internal/platform/implementation/apple/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/apple/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/apple/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/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager.m b/internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Peripheral/GNSPeripheralServiceManager.m similarity index 98% rename from internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager.m rename to internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Peripheral/GNSPeripheralServiceManager.m index ac14c864..1be7128f 100644 --- a/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager.m +++ b/internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Peripheral/GNSPeripheralServiceManager.m @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/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/apple/Log/GNCLogger.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 "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" // The Weave BLE protocol has only one valid version. static const UInt16 kWeaveVersionSupported = 1; diff --git a/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSSocket+Private.h b/internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Shared/GNSSocket+Private.h similarity index 97% rename from internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSSocket+Private.h rename to internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Shared/GNSSocket+Private.h index 38678076..5d44f50f 100644 --- a/internal/platform/implementation/apple/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/apple/Mediums/Ble/Sockets/Source/Shared/GNSSocket.h" +#import "internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Shared/GNSSocket.h" -#import "internal/platform/implementation/apple/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/apple/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/apple/Mediums/Ble/Sockets/Source/Shared/GNSSocket.h rename to internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Shared/GNSSocket.h index ecce03c0..08103d19 100644 --- a/internal/platform/implementation/apple/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/apple/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/apple/Mediums/Ble/Sockets/Source/Shared/GNSSocket.m b/internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Shared/GNSSocket.m similarity index 98% rename from internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSSocket.m rename to internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Shared/GNSSocket.m index 6d4d33a2..2f77fc5a 100644 --- a/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSSocket.m +++ b/internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Shared/GNSSocket.m @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/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/apple/Log/GNCLogger.h" -#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSWeavePacket.h" +#import "internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Shared/GNSWeavePacket.h" typedef void (^GNSIncomingChunkReceivedBlock)(NSData *incomingData); diff --git a/internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSUtils+Private.h b/internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Shared/GNSUtils+Private.h similarity index 95% rename from internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSUtils+Private.h rename to internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Shared/GNSUtils+Private.h index fa0987e8..1e1674f4 100644 --- a/internal/platform/implementation/apple/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/apple/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/apple/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/apple/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/apple/Mediums/Ble/Sockets/Source/Shared/GNSUtils.m b/internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Shared/GNSUtils.m similarity index 98% rename from internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSUtils.m rename to internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Shared/GNSUtils.m index d069beeb..cd295e76 100644 --- a/internal/platform/implementation/apple/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/apple/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/apple/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/apple/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/apple/Mediums/Ble/Sockets/Source/Shared/GNSWeavePacket.m b/internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Shared/GNSWeavePacket.m similarity index 99% rename from internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSWeavePacket.m rename to internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Shared/GNSWeavePacket.m index 64caa782..549d82b9 100644 --- a/internal/platform/implementation/apple/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/apple/Mediums/Ble/Sockets/Source/Shared/GNSWeavePacket.h" +#import "internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Shared/GNSWeavePacket.h" -#import "internal/platform/implementation/apple/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/apple/Mediums/BLE/Sockets/Tests/BUILD b/internal/platform/implementation/apple/Mediums/BLE/Sockets/Tests/BUILD new file mode 100644 index 00000000..2f4a3001 --- /dev/null +++ b/internal/platform/implementation/apple/Mediums/BLE/Sockets/Tests/BUILD @@ -0,0 +1,64 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +load("@rules_apple//apple:ios.bzl", "ios_unit_test") +load("@rules_cc//cc:objc_library.bzl", "objc_library") +load("//third_party/nearby:minimum_os.bzl", "IOS_MINIMUM_OS") + +licenses(["notice"]) + +package(default_visibility = ["//internal/platform/implementation/apple:__subpackages__"]) + +objc_library( + name = "CentralTestsLib", + testonly = 1, + srcs = [ + "Central/GNSCentralManagerTest.m", + ], + deps = [ + "//internal/platform/implementation/apple/Mediums/BLE/Sockets:Central", + "//third_party/apple_frameworks:XCTest", + "//third_party/objective_c/ocmock/v3:OCMock", + ], +) + +ios_unit_test( + name = "CentralTests", + google_create_srl_bindings_module = False, + minimum_os_version = IOS_MINIMUM_OS, + runner = "//testing/utp/ios:IOS_LATEST", + deps = [":CentralTestsLib"], +) + +objc_library( + name = "SharedTestsLib", + testonly = 1, + srcs = [ + "Shared/GNSSocketTest.m", + "Shared/GNSWeavePacketTest.m", + ], + deps = [ + "//internal/platform/implementation/apple/Mediums/BLE/Sockets:Shared", + "//third_party/apple_frameworks:XCTest", + "//third_party/objective_c/ocmock/v3:OCMock", + ], +) + +ios_unit_test( + name = "SharedTests", + google_create_srl_bindings_module = False, + minimum_os_version = IOS_MINIMUM_OS, + runner = "//testing/utp/ios:IOS_LATEST", + deps = [":SharedTestsLib"], +) diff --git a/internal/platform/implementation/apple/Mediums/Ble/Sockets/Tests/Central/GNSCentralManagerTest.m b/internal/platform/implementation/apple/Mediums/BLE/Sockets/Tests/Central/GNSCentralManagerTest.m similarity index 99% rename from internal/platform/implementation/apple/Mediums/Ble/Sockets/Tests/Central/GNSCentralManagerTest.m rename to internal/platform/implementation/apple/Mediums/BLE/Sockets/Tests/Central/GNSCentralManagerTest.m index 48571d8e..adae9492 100644 --- a/internal/platform/implementation/apple/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/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/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/apple/Mediums/Ble/Sockets/Tests/Central/GNSCentralPeerManagerTest.m b/internal/platform/implementation/apple/Mediums/BLE/Sockets/Tests/Central/GNSCentralPeerManagerTest.m similarity index 99% rename from internal/platform/implementation/apple/Mediums/Ble/Sockets/Tests/Central/GNSCentralPeerManagerTest.m rename to internal/platform/implementation/apple/Mediums/BLE/Sockets/Tests/Central/GNSCentralPeerManagerTest.m index e581136f..1441eae3 100644 --- a/internal/platform/implementation/apple/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/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 "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/apple/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/apple/Mediums/Ble/Sockets/Tests/Peripheral/GNSPeripheralManagerTest.m rename to internal/platform/implementation/apple/Mediums/BLE/Sockets/Tests/Peripheral/GNSPeripheralManagerTest.m index 0c57ccf9..3ff16fca 100644 --- a/internal/platform/implementation/apple/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/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/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/apple/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/apple/Mediums/Ble/Sockets/Tests/Peripheral/GNSPeripheralServiceManagerTest.m rename to internal/platform/implementation/apple/Mediums/BLE/Sockets/Tests/Peripheral/GNSPeripheralServiceManagerTest.m index 7bf6f490..c367f4f1 100644 --- a/internal/platform/implementation/apple/Mediums/Ble/Sockets/Tests/Peripheral/GNSPeripheralServiceManagerTest.m +++ b/internal/platform/implementation/apple/Mediums/BLE/Sockets/Tests/Peripheral/GNSPeripheralServiceManagerTest.m @@ -15,11 +15,11 @@ #import #import "internal/platform/implementation/apple/Log/GNCLogger.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 "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/apple/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/apple/Mediums/Ble/Sockets/Tests/Shared/GNSSocketTest.m rename to internal/platform/implementation/apple/Mediums/BLE/Sockets/Tests/Shared/GNSSocketTest.m index 7cd1ee50..b03c0f9b 100644 --- a/internal/platform/implementation/apple/Mediums/Ble/Sockets/Tests/Shared/GNSSocketTest.m +++ b/internal/platform/implementation/apple/Mediums/BLE/Sockets/Tests/Shared/GNSSocketTest.m @@ -14,9 +14,9 @@ #import -#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSSocket+Private.h" -#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Shared/GNSSocket.h" -#import "internal/platform/implementation/apple/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/GNSSocket.h" +#import "internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Shared/GNSWeavePacket.h" #import "third_party/objective_c/ocmock/v3/Source/OCMock/OCMock.h" @protocol GNSSocketTestDelegate diff --git a/internal/platform/implementation/apple/Mediums/Ble/Sockets/Tests/Shared/GNSWeavePacketTest.m b/internal/platform/implementation/apple/Mediums/BLE/Sockets/Tests/Shared/GNSWeavePacketTest.m similarity index 99% rename from internal/platform/implementation/apple/Mediums/Ble/Sockets/Tests/Shared/GNSWeavePacketTest.m rename to internal/platform/implementation/apple/Mediums/BLE/Sockets/Tests/Shared/GNSWeavePacketTest.m index 30c76cc9..a1dd64b7 100644 --- a/internal/platform/implementation/apple/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/apple/Mediums/Ble/Sockets/Source/Shared/GNSWeavePacket.h" +#import "internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Shared/GNSWeavePacket.h" -#import "internal/platform/implementation/apple/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/apple/Mediums/BLE/Tests/BUILD b/internal/platform/implementation/apple/Mediums/BLE/Tests/BUILD new file mode 100644 index 00000000..1fa33571 --- /dev/null +++ b/internal/platform/implementation/apple/Mediums/BLE/Tests/BUILD @@ -0,0 +1,71 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +load("@rules_apple//apple:ios.bzl", "ios_unit_test") +load("@rules_cc//cc:objc_library.bzl", "objc_library") +load("//third_party/nearby:minimum_os.bzl", "IOS_MINIMUM_OS") + +licenses(["notice"]) + +package(default_visibility = ["//internal/platform/implementation/apple:__subpackages__"]) + +objc_library( + name = "BLETestsLib", + testonly = 1, + srcs = [ + "GNCBLEGATTCharacteristicTest.mm", + "GNCBLEGATTClientTest.m", + "GNCBLEGATTServerTest.m", + "GNCBLEL2CAPClientTest.m", + "GNCBLEL2CAPConnectionTest.m", + "GNCBLEL2CAPFakeInputOutputStream.m", + "GNCBLEL2CAPServerTest.m", + "GNCBLEL2CAPStreamTest.m", + "GNCBLEMediumTest.m", + "GNCBLEUtilsTest.mm", + "GNCFakeCentralManager.m", + "GNCFakePeripheral.m", + "GNCFakePeripheralManager.m", + "NSData+GNCBase85Test.m", + "NSData+GNCWebSafeBase64Test.m", + ], + hdrs = [ + "GNCBLEGATTClient+Testing.h", + "GNCBLEGATTServer+Testing.h", + "GNCBLEL2CAPClient+Testing.h", + "GNCBLEL2CAPFakeInputOutputStream.h", + "GNCBLEMedium+Testing.h", + "GNCFakeCentralManager.h", + "GNCFakePeripheral.h", + "GNCFakePeripheralManager.h", + ], + deps = [ + "//internal/platform/implementation:comm", + "//internal/platform/implementation:types", + "//internal/platform/implementation/apple", # buildcleaner: keep + "//internal/platform/implementation/apple:ble_v2", + "//internal/platform/implementation/apple/Mediums/BLE", + "//third_party/apple_frameworks:CoreBluetooth", + "//third_party/apple_frameworks:Foundation", + "//third_party/apple_frameworks:XCTest", + ], +) + +ios_unit_test( + name = "BLETests", + google_create_srl_bindings_module = False, + minimum_os_version = IOS_MINIMUM_OS, + runner = "//testing/utp/ios:IOS_LATEST", + deps = [":BLETestsLib"], +) diff --git a/internal/platform/implementation/apple/Tests/GNCBLEGATTCharacteristicTest.mm b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEGATTCharacteristicTest.mm similarity index 96% rename from internal/platform/implementation/apple/Tests/GNCBLEGATTCharacteristicTest.mm rename to internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEGATTCharacteristicTest.mm index 4aa8c827..81797419 100644 --- a/internal/platform/implementation/apple/Tests/GNCBLEGATTCharacteristicTest.mm +++ b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEGATTCharacteristicTest.mm @@ -16,7 +16,7 @@ #import "XCTest/XCTest.h" #import -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTCharacteristic.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTCharacteristic.h" @interface GNCBLEGATTCharacteristicTest : XCTestCase @end diff --git a/internal/platform/implementation/apple/Tests/GNCBLEGATTClient+Testing.h b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEGATTClient+Testing.h similarity index 95% rename from internal/platform/implementation/apple/Tests/GNCBLEGATTClient+Testing.h rename to internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEGATTClient+Testing.h index 035138fd..1e9a7cbc 100644 --- a/internal/platform/implementation/apple/Tests/GNCBLEGATTClient+Testing.h +++ b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEGATTClient+Testing.h @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTClient.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTClient.h" #import diff --git a/internal/platform/implementation/apple/Tests/GNCBLEGATTClientTest.m b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEGATTClientTest.m similarity index 98% rename from internal/platform/implementation/apple/Tests/GNCBLEGATTClientTest.m rename to internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEGATTClientTest.m index fbf4ccd4..700e201e 100644 --- a/internal/platform/implementation/apple/Tests/GNCBLEGATTClientTest.m +++ b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEGATTClientTest.m @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTClient.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTClient.h" #import #import #import -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTCharacteristic.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCPeripheral.h" -#import "internal/platform/implementation/apple/Tests/GNCBLEGATTClient+Testing.h" -#import "internal/platform/implementation/apple/Tests/GNCFakePeripheral.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTCharacteristic.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCPeripheral.h" +#import "internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEGATTClient+Testing.h" +#import "internal/platform/implementation/apple/Mediums/BLE/Tests/GNCFakePeripheral.h" static NSString *const kServiceUUID1 = @"0000FEF3-0000-1000-8000-00805F9B34FB"; static NSString *const kServiceUUID2 = @"0000FEF4-0000-1000-8000-00805F9B34FB"; diff --git a/internal/platform/implementation/apple/Tests/GNCBLEGATTServer+Testing.h b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEGATTServer+Testing.h similarity index 92% rename from internal/platform/implementation/apple/Tests/GNCBLEGATTServer+Testing.h rename to internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEGATTServer+Testing.h index a125da19..7a0a8df4 100644 --- a/internal/platform/implementation/apple/Tests/GNCBLEGATTServer+Testing.h +++ b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEGATTServer+Testing.h @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTServer.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTServer.h" #import diff --git a/internal/platform/implementation/apple/Tests/GNCBLEGATTServerTest.m b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEGATTServerTest.m similarity index 98% rename from internal/platform/implementation/apple/Tests/GNCBLEGATTServerTest.m rename to internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEGATTServerTest.m index 1f1ad717..f6bfac51 100644 --- a/internal/platform/implementation/apple/Tests/GNCBLEGATTServerTest.m +++ b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEGATTServerTest.m @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTServer.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTServer.h" #import #import #import -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTCharacteristic.h" -#import "internal/platform/implementation/apple/Tests/GNCBLEGATTServer+Testing.h" -#import "internal/platform/implementation/apple/Tests/GNCFakePeripheralManager.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTCharacteristic.h" +#import "internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEGATTServer+Testing.h" +#import "internal/platform/implementation/apple/Mediums/BLE/Tests/GNCFakePeripheralManager.h" static NSString *const kServiceUUID1 = @"0000FEF3-0000-1000-8000-00805F9B34FB"; static NSString *const kServiceUUID2 = @"0000FEF4-0000-1000-8000-00805F9B34FB"; diff --git a/internal/platform/implementation/apple/Tests/GNCBLEL2CAPClient+Testing.h b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEL2CAPClient+Testing.h similarity index 94% rename from internal/platform/implementation/apple/Tests/GNCBLEL2CAPClient+Testing.h rename to internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEL2CAPClient+Testing.h index b6f69ad4..4024d2ab 100644 --- a/internal/platform/implementation/apple/Tests/GNCBLEL2CAPClient+Testing.h +++ b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEL2CAPClient+Testing.h @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPClient.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPClient.h" #import diff --git a/internal/platform/implementation/apple/Tests/GNCBLEL2CAPClientTest.m b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEL2CAPClientTest.m similarity index 91% rename from internal/platform/implementation/apple/Tests/GNCBLEL2CAPClientTest.m rename to internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEL2CAPClientTest.m index 203ddac3..812265e5 100644 --- a/internal/platform/implementation/apple/Tests/GNCBLEL2CAPClientTest.m +++ b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEL2CAPClientTest.m @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPClient.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPClient.h" #import #import #import -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCPeripheral.h" -#import "internal/platform/implementation/apple/Tests/GNCBLEL2CAPClient+Testing.h" -#import "internal/platform/implementation/apple/Tests/GNCFakePeripheral.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCPeripheral.h" +#import "internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEL2CAPClient+Testing.h" +#import "internal/platform/implementation/apple/Mediums/BLE/Tests/GNCFakePeripheral.h" @interface GNCBLEL2CAPClientTest : XCTestCase @property(nonatomic) GNCFakePeripheral *fakePeripheral; diff --git a/internal/platform/implementation/apple/Tests/GNCBLEL2CAPConnectionTest.m b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEL2CAPConnectionTest.m similarity index 94% rename from internal/platform/implementation/apple/Tests/GNCBLEL2CAPConnectionTest.m rename to internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEL2CAPConnectionTest.m index d0cfd19a..b0b24e6d 100644 --- a/internal/platform/implementation/apple/Tests/GNCBLEL2CAPConnectionTest.m +++ b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEL2CAPConnectionTest.m @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPConnection.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPConnection.h" #import #import -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPStream.h" -#import "internal/platform/implementation/apple/Tests/GNCBLEL2CAPFakeInputOutputStream.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPStream.h" +#import "internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEL2CAPFakeInputOutputStream.h" // TODO: b/399815436 - More tests for GNCBLEL2CAPConnection. @interface GNCBLEL2CAPConnection (Testing) diff --git a/internal/platform/implementation/apple/Tests/GNCBLEL2CAPFakeInputOutputStream.h b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEL2CAPFakeInputOutputStream.h similarity index 100% rename from internal/platform/implementation/apple/Tests/GNCBLEL2CAPFakeInputOutputStream.h rename to internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEL2CAPFakeInputOutputStream.h diff --git a/internal/platform/implementation/apple/Tests/GNCBLEL2CAPFakeInputOutputStream.m b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEL2CAPFakeInputOutputStream.m similarity index 96% rename from internal/platform/implementation/apple/Tests/GNCBLEL2CAPFakeInputOutputStream.m rename to internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEL2CAPFakeInputOutputStream.m index e32268a2..58b8878c 100644 --- a/internal/platform/implementation/apple/Tests/GNCBLEL2CAPFakeInputOutputStream.m +++ b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEL2CAPFakeInputOutputStream.m @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/Tests/GNCBLEL2CAPFakeInputOutputStream.h" +#import "internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEL2CAPFakeInputOutputStream.h" @implementation GNCBLEL2CAPFakeInputOutputStream { /// Output stream for |_inputStream| to "simulate" data from watch during tests. diff --git a/internal/platform/implementation/apple/Tests/GNCBLEL2CAPServer+Testing.h b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEL2CAPServer+Testing.h similarity index 92% rename from internal/platform/implementation/apple/Tests/GNCBLEL2CAPServer+Testing.h rename to internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEL2CAPServer+Testing.h index b356823d..47ab8951 100644 --- a/internal/platform/implementation/apple/Tests/GNCBLEL2CAPServer+Testing.h +++ b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEL2CAPServer+Testing.h @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPServer.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPServer.h" #import diff --git a/internal/platform/implementation/apple/Tests/GNCBLEL2CAPServerTest.m b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEL2CAPServerTest.m similarity index 97% rename from internal/platform/implementation/apple/Tests/GNCBLEL2CAPServerTest.m rename to internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEL2CAPServerTest.m index 57b29ab2..d24f0e58 100644 --- a/internal/platform/implementation/apple/Tests/GNCBLEL2CAPServerTest.m +++ b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEL2CAPServerTest.m @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPServer.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPServer.h" #import #import #import -#import "internal/platform/implementation/apple/Tests/GNCFakePeripheralManager.h" +#import "internal/platform/implementation/apple/Mediums/BLE/Tests/GNCFakePeripheralManager.h" @interface GNCBLEL2CAPServerTest : XCTestCase @end diff --git a/internal/platform/implementation/apple/Tests/GNCBLEL2CAPStreamTest.m b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEL2CAPStreamTest.m similarity index 97% rename from internal/platform/implementation/apple/Tests/GNCBLEL2CAPStreamTest.m rename to internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEL2CAPStreamTest.m index 80d38cb2..f3da8f2c 100644 --- a/internal/platform/implementation/apple/Tests/GNCBLEL2CAPStreamTest.m +++ b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEL2CAPStreamTest.m @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPStream.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPStream.h" #import -#import "internal/platform/implementation/apple/Tests/GNCBLEL2CAPFakeInputOutputStream.h" +#import "internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEL2CAPFakeInputOutputStream.h" @interface GNCBLEL2CAPStreamTest : XCTestCase @end diff --git a/internal/platform/implementation/apple/Tests/GNCBLEMedium+Testing.h b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEMedium+Testing.h similarity index 95% rename from internal/platform/implementation/apple/Tests/GNCBLEMedium+Testing.h rename to internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEMedium+Testing.h index 4eea8d87..5da28b57 100644 --- a/internal/platform/implementation/apple/Tests/GNCBLEMedium+Testing.h +++ b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEMedium+Testing.h @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEMedium.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEMedium.h" #import diff --git a/internal/platform/implementation/apple/Tests/GNCBLEMediumTest.m b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEMediumTest.m similarity index 95% rename from internal/platform/implementation/apple/Tests/GNCBLEMediumTest.m rename to internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEMediumTest.m index c9ab1562..f329f92c 100644 --- a/internal/platform/implementation/apple/Tests/GNCBLEMediumTest.m +++ b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEMediumTest.m @@ -12,20 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEMedium.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEMedium.h" #import #import #import -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTClient.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTServer.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCPeripheral.h" -#import "internal/platform/implementation/apple/Tests/GNCBLEL2CAPClient+Testing.h" -#import "internal/platform/implementation/apple/Tests/GNCBLEMedium+Testing.h" -#import "internal/platform/implementation/apple/Tests/GNCFakeCentralManager.h" -#import "internal/platform/implementation/apple/Tests/GNCFakePeripheral.h" -#import "internal/platform/implementation/apple/Tests/GNCFakePeripheralManager.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTClient.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTServer.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCPeripheral.h" +#import "internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEL2CAPClient+Testing.h" +#import "internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEMedium+Testing.h" +#import "internal/platform/implementation/apple/Mediums/BLE/Tests/GNCFakeCentralManager.h" +#import "internal/platform/implementation/apple/Mediums/BLE/Tests/GNCFakePeripheral.h" +#import "internal/platform/implementation/apple/Mediums/BLE/Tests/GNCFakePeripheralManager.h" static NSString *const kServiceUUID = @"0000FEF3-0000-1000-8000-00805F9B34FB"; diff --git a/internal/platform/implementation/apple/Tests/GNCBLEUtilsTest.mm b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEUtilsTest.mm similarity index 99% rename from internal/platform/implementation/apple/Tests/GNCBLEUtilsTest.mm rename to internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEUtilsTest.mm index 1cc73ecb..48ca7f27 100644 --- a/internal/platform/implementation/apple/Tests/GNCBLEUtilsTest.mm +++ b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCBLEUtilsTest.mm @@ -16,7 +16,7 @@ #import #import -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTCharacteristic.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTCharacteristic.h" #import "internal/platform/implementation/apple/ble_utils.h" #include "internal/platform/implementation/ble_v2.h" diff --git a/internal/platform/implementation/apple/Tests/GNCFakeCentralManager.h b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCFakeCentralManager.h similarity index 96% rename from internal/platform/implementation/apple/Tests/GNCFakeCentralManager.h rename to internal/platform/implementation/apple/Mediums/BLE/Tests/GNCFakeCentralManager.h index 2e2c15e5..b6933f06 100644 --- a/internal/platform/implementation/apple/Tests/GNCFakeCentralManager.h +++ b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCFakeCentralManager.h @@ -15,7 +15,7 @@ #import #import -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCCentralManager.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCCentralManager.h" NS_ASSUME_NONNULL_BEGIN diff --git a/internal/platform/implementation/apple/Tests/GNCFakeCentralManager.m b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCFakeCentralManager.m similarity index 91% rename from internal/platform/implementation/apple/Tests/GNCFakeCentralManager.m rename to internal/platform/implementation/apple/Mediums/BLE/Tests/GNCFakeCentralManager.m index 30867e1b..c11de5d9 100644 --- a/internal/platform/implementation/apple/Tests/GNCFakeCentralManager.m +++ b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCFakeCentralManager.m @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/Tests/GNCFakeCentralManager.h" +#import "internal/platform/implementation/apple/Mediums/BLE/Tests/GNCFakeCentralManager.h" #import #import #import -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCCentralManager.h" -#import "internal/platform/implementation/apple/Tests/GNCFakePeripheral.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCCentralManager.h" +#import "internal/platform/implementation/apple/Mediums/BLE/Tests/GNCFakePeripheral.h" @implementation GNCFakeCentralManager { CBManagerState _state; diff --git a/internal/platform/implementation/apple/Tests/GNCFakePeripheral.h b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCFakePeripheral.h similarity index 96% rename from internal/platform/implementation/apple/Tests/GNCFakePeripheral.h rename to internal/platform/implementation/apple/Mediums/BLE/Tests/GNCFakePeripheral.h index f6750a2d..51c9096a 100644 --- a/internal/platform/implementation/apple/Tests/GNCFakePeripheral.h +++ b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCFakePeripheral.h @@ -15,7 +15,7 @@ #import #import -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCPeripheral.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCPeripheral.h" NS_ASSUME_NONNULL_BEGIN diff --git a/internal/platform/implementation/apple/Tests/GNCFakePeripheral.m b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCFakePeripheral.m similarity index 96% rename from internal/platform/implementation/apple/Tests/GNCFakePeripheral.m rename to internal/platform/implementation/apple/Mediums/BLE/Tests/GNCFakePeripheral.m index a261c59d..21f23a5b 100644 --- a/internal/platform/implementation/apple/Tests/GNCFakePeripheral.m +++ b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCFakePeripheral.m @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/Tests/GNCFakePeripheral.h" +#import "internal/platform/implementation/apple/Mediums/BLE/Tests/GNCFakePeripheral.h" #import #import #import -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCPeripheral.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCPeripheral.h" NS_ASSUME_NONNULL_BEGIN diff --git a/internal/platform/implementation/apple/Tests/GNCFakePeripheralManager.h b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCFakePeripheralManager.h similarity index 97% rename from internal/platform/implementation/apple/Tests/GNCFakePeripheralManager.h rename to internal/platform/implementation/apple/Mediums/BLE/Tests/GNCFakePeripheralManager.h index 7326ab4f..68078e0f 100644 --- a/internal/platform/implementation/apple/Tests/GNCFakePeripheralManager.h +++ b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCFakePeripheralManager.h @@ -15,7 +15,7 @@ #import #import -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCPeripheralManager.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCPeripheralManager.h" @class XCTestExpectation; diff --git a/internal/platform/implementation/apple/Tests/GNCFakePeripheralManager.m b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCFakePeripheralManager.m similarity index 96% rename from internal/platform/implementation/apple/Tests/GNCFakePeripheralManager.m rename to internal/platform/implementation/apple/Mediums/BLE/Tests/GNCFakePeripheralManager.m index 914d51e0..817694e1 100644 --- a/internal/platform/implementation/apple/Tests/GNCFakePeripheralManager.m +++ b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCFakePeripheralManager.m @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/Tests/GNCFakePeripheralManager.h" +#import "internal/platform/implementation/apple/Mediums/BLE/Tests/GNCFakePeripheralManager.h" #import #import #import -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCPeripheralManager.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCPeripheralManager.h" @interface CBCharacteristic () diff --git a/internal/platform/implementation/apple/Tests/GNCMBleUtilsTest.mm b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCMBleUtilsTest.mm similarity index 99% rename from internal/platform/implementation/apple/Tests/GNCMBleUtilsTest.mm rename to internal/platform/implementation/apple/Mediums/BLE/Tests/GNCMBleUtilsTest.mm index 4a6b23e0..85729b6b 100644 --- a/internal/platform/implementation/apple/Tests/GNCMBleUtilsTest.mm +++ b/internal/platform/implementation/apple/Mediums/BLE/Tests/GNCMBleUtilsTest.mm @@ -17,7 +17,7 @@ #include #include -#import "internal/platform/implementation/apple/Mediums/Ble/GNCMBleUtils.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCMBleUtils.h" NS_ASSUME_NONNULL_BEGIN diff --git a/internal/platform/implementation/apple/Tests/NSData+GNCBase85Test.m b/internal/platform/implementation/apple/Mediums/BLE/Tests/NSData+GNCBase85Test.m similarity index 96% rename from internal/platform/implementation/apple/Tests/NSData+GNCBase85Test.m rename to internal/platform/implementation/apple/Mediums/BLE/Tests/NSData+GNCBase85Test.m index 33fc2f1c..b02e8be9 100644 --- a/internal/platform/implementation/apple/Tests/NSData+GNCBase85Test.m +++ b/internal/platform/implementation/apple/Mediums/BLE/Tests/NSData+GNCBase85Test.m @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/Mediums/BLEv2/NSData+GNCBase85.h" +#import "internal/platform/implementation/apple/Mediums/BLE/NSData+GNCBase85.h" #import #import diff --git a/internal/platform/implementation/apple/Tests/NSData+GNCWebSafeBase64Test.m b/internal/platform/implementation/apple/Mediums/BLE/Tests/NSData+GNCWebSafeBase64Test.m similarity index 97% rename from internal/platform/implementation/apple/Tests/NSData+GNCWebSafeBase64Test.m rename to internal/platform/implementation/apple/Mediums/BLE/Tests/NSData+GNCWebSafeBase64Test.m index 8310962c..78e3337b 100644 --- a/internal/platform/implementation/apple/Tests/NSData+GNCWebSafeBase64Test.m +++ b/internal/platform/implementation/apple/Mediums/BLE/Tests/NSData+GNCWebSafeBase64Test.m @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/apple/Mediums/BLEv2/NSData+GNCWebSafeBase64.h" +#import "internal/platform/implementation/apple/Mediums/BLE/NSData+GNCWebSafeBase64.h" #import #import diff --git a/internal/platform/implementation/apple/Mediums/BUILD b/internal/platform/implementation/apple/Mediums/BUILD index c8dfb77d..434d8fd1 100644 --- a/internal/platform/implementation/apple/Mediums/BUILD +++ b/internal/platform/implementation/apple/Mediums/BUILD @@ -24,64 +24,20 @@ package(default_visibility = [ objc_library( name = "Mediums", srcs = [ - "BLEv2/GNCBLEError.m", - "BLEv2/GNCBLEGATTCharacteristic.m", - "BLEv2/GNCBLEGATTClient.m", - "BLEv2/GNCBLEGATTServer.m", - "BLEv2/GNCBLEL2CAPClient.m", - "BLEv2/GNCBLEL2CAPConnection.m", - "BLEv2/GNCBLEL2CAPServer.m", - "BLEv2/GNCBLEL2CAPStream.m", - "BLEv2/GNCBLEMedium.m", - "BLEv2/GNCCentralManager.m", - "BLEv2/GNCPeripheral.m", - "BLEv2/GNCPeripheralManager.m", - "BLEv2/NSData+GNCBase85.mm", - "BLEv2/NSData+GNCWebSafeBase64.m", - "Ble/GNCMBleConnection.m", - "Ble/GNCMBleUtils.mm", - "GNCLeaks.h", - "GNCLeaks.m", - "GNCMConnection.m", "Hotspot/GNCHotspotMedium.m", "Hotspot/GNCHotspotSocket.m", ], hdrs = [ - "BLEv2/GNCBLEError.h", - "BLEv2/GNCBLEGATTCharacteristic.h", - "BLEv2/GNCBLEGATTClient.h", - "BLEv2/GNCBLEGATTServer.h", - "BLEv2/GNCBLEL2CAPClient.h", - "BLEv2/GNCBLEL2CAPConnection.h", - "BLEv2/GNCBLEL2CAPServer.h", - "BLEv2/GNCBLEL2CAPStream.h", - "BLEv2/GNCBLEMedium.h", - "BLEv2/GNCCentralManager.h", - "BLEv2/GNCPeripheral.h", - "BLEv2/GNCPeripheralManager.h", - "BLEv2/NSData+GNCBase85.h", - "BLEv2/NSData+GNCWebSafeBase64.h", - "Ble/GNCMBleConnection.h", - "Ble/GNCMBleUtils.h", - "GNCMConnection.h", "Hotspot/GNCHotspotMedium.h", "Hotspot/GNCHotspotSocket.h", ], deps = [ - "//internal/encoding:base85", - "//internal/platform/implementation/apple:Shared", - "//internal/platform/implementation/apple/Flags", "//internal/platform/implementation/apple/Log:GNCLogger", - "//internal/platform/implementation/apple/Mediums/Ble/Sockets:Shared", "//internal/platform/implementation/apple/Mediums/WiFiCommon", - "//proto/mediums:ble_frames_cc_proto", - "//third_party/apple_frameworks:CoreBluetooth", "//third_party/apple_frameworks:CoreLocation", "//third_party/apple_frameworks:Foundation", "//third_party/apple_frameworks:Network", "//third_party/apple_frameworks:NetworkExtension", - "//third_party/apple_frameworks:ObjectiveC", - "//third_party/apple_frameworks:Security", "//third_party/apple_frameworks:SystemConfiguration", ], ) diff --git a/internal/platform/implementation/apple/Tests/BUILD b/internal/platform/implementation/apple/Tests/BUILD index 343923a5..b03f55dc 100644 --- a/internal/platform/implementation/apple/Tests/BUILD +++ b/internal/platform/implementation/apple/Tests/BUILD @@ -24,50 +24,23 @@ objc_library( name = "PlatformTestslib", testonly = True, srcs = [ - "GNCBLEGATTCharacteristicTest.mm", - "GNCBLEGATTClient+Testing.h", - "GNCBLEGATTClientTest.m", - "GNCBLEGATTServer+Testing.h", - "GNCBLEGATTServerTest.m", - "GNCBLEL2CAPClient+Testing.h", - "GNCBLEL2CAPClientTest.m", - "GNCBLEL2CAPConnectionTest.m", - "GNCBLEL2CAPFakeInputOutputStream.h", - "GNCBLEL2CAPFakeInputOutputStream.m", - "GNCBLEL2CAPServerTest.m", - "GNCBLEL2CAPStreamTest.m", - "GNCBLEMedium+Testing.h", - "GNCBLEMediumTest.m", - "GNCBLEUtilsTest.mm", "GNCCryptoTest.mm", "GNCDeviceInfoTest.mm", - "GNCFakeCentralManager.h", - "GNCFakeCentralManager.m", - "GNCFakePeripheral.h", - "GNCFakePeripheral.m", - "GNCFakePeripheralManager.h", - "GNCFakePeripheralManager.m", "GNCMultiThreadExecutorTest.mm", "GNCPlatformTest.mm", "GNCScheduledExecutorTest.mm", "GNCSingleThreadExecutorTest.mm", "GNCUtilsTest.m", - "NSData+GNCBase85Test.m", - "NSData+GNCWebSafeBase64Test.m", "UtilsTest.mm", ], deps = [ "//internal/platform:base", - "//internal/platform/implementation:comm", "//internal/platform/implementation:platform", "//internal/platform/implementation:types", "//internal/platform/implementation/apple", # buildcleaner: keep "//internal/platform/implementation/apple:Shared", "//internal/platform/implementation/apple:ble_v2", - "//internal/platform/implementation/apple:comm", - "//internal/platform/implementation/apple/Mediums", "//third_party/apple_frameworks:CommonCrypto", - "//third_party/apple_frameworks:CoreBluetooth", "//third_party/apple_frameworks:Foundation", "//third_party/apple_frameworks:XCTest", "@com_google_absl//absl/time", diff --git a/internal/platform/implementation/apple/ble_gatt_client.mm b/internal/platform/implementation/apple/ble_gatt_client.mm index 41b29f5d..94e5cd66 100644 --- a/internal/platform/implementation/apple/ble_gatt_client.mm +++ b/internal/platform/implementation/apple/ble_gatt_client.mm @@ -25,7 +25,7 @@ #import "internal/platform/implementation/apple/Flags/GNCFeatureFlags.h" #import "internal/platform/implementation/apple/Log/GNCLogger.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTClient.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTClient.h" #import "internal/platform/implementation/apple/ble_utils.h" namespace nearby { diff --git a/internal/platform/implementation/apple/ble_gatt_server.mm b/internal/platform/implementation/apple/ble_gatt_server.mm index cd19bdd6..64af45f9 100644 --- a/internal/platform/implementation/apple/ble_gatt_server.mm +++ b/internal/platform/implementation/apple/ble_gatt_server.mm @@ -20,7 +20,7 @@ #include "internal/platform/implementation/ble_v2.h" #import "internal/platform/implementation/apple/Log/GNCLogger.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTServer.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTServer.h" #import "internal/platform/implementation/apple/ble_utils.h" #import "internal/platform/implementation/apple/utils.h" diff --git a/internal/platform/implementation/apple/ble_l2cap_server_socket.mm b/internal/platform/implementation/apple/ble_l2cap_server_socket.mm index ebecee17..d4680f2b 100644 --- a/internal/platform/implementation/apple/ble_l2cap_server_socket.mm +++ b/internal/platform/implementation/apple/ble_l2cap_server_socket.mm @@ -20,7 +20,7 @@ #include #import "internal/platform/implementation/apple/Log/GNCLogger.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPServer.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPServer.h" namespace nearby { namespace apple { diff --git a/internal/platform/implementation/apple/ble_l2cap_socket.mm b/internal/platform/implementation/apple/ble_l2cap_socket.mm index 65e47038..833d7b57 100644 --- a/internal/platform/implementation/apple/ble_l2cap_socket.mm +++ b/internal/platform/implementation/apple/ble_l2cap_socket.mm @@ -15,7 +15,7 @@ #import "internal/platform/implementation/apple/ble_l2cap_socket.h" #import "internal/platform/implementation/apple/Log/GNCLogger.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPConnection.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPConnection.h" #import "internal/platform/implementation/apple/utils.h" #include "internal/platform/implementation/ble_v2.h" diff --git a/internal/platform/implementation/apple/ble_medium.mm b/internal/platform/implementation/apple/ble_medium.mm index 4073be42..94d7ac49 100644 --- a/internal/platform/implementation/apple/ble_medium.mm +++ b/internal/platform/implementation/apple/ble_medium.mm @@ -27,23 +27,23 @@ #include "internal/platform/implementation/ble_v2.h" #include "internal/platform/implementation/bluetooth_adapter.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTCharacteristic.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTClient.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTServer.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPClient.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPConnection.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEL2CAPServer.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEMedium.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCPeripheral.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTCharacteristic.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTClient.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTServer.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPClient.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPConnection.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEL2CAPServer.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEMedium.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCPeripheral.h" #import "internal/platform/implementation/apple/Log/GNCLogger.h" // TODO(b/293336684): Old Weave imports that need to be deleted once shared Weave is complete. -#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/Ble/Sockets/Source/Peripheral/GNSPeripheralManager.h" -#import "internal/platform/implementation/apple/Mediums/Ble/Sockets/Source/Peripheral/GNSPeripheralServiceManager.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/BLE/Sockets/Source/Peripheral/GNSPeripheralManager.h" +#import "internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Peripheral/GNSPeripheralServiceManager.h" #import "internal/platform/implementation/apple/ble_gatt_client.h" #import "internal/platform/implementation/apple/ble_gatt_server.h" #import "internal/platform/implementation/apple/ble_l2cap_server_socket.h" diff --git a/internal/platform/implementation/apple/ble_peripheral.mm b/internal/platform/implementation/apple/ble_peripheral.mm index 1c8db23a..8f7e7971 100644 --- a/internal/platform/implementation/apple/ble_peripheral.mm +++ b/internal/platform/implementation/apple/ble_peripheral.mm @@ -21,7 +21,7 @@ #include "internal/platform/implementation/ble_v2.h" -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCPeripheral.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCPeripheral.h" namespace nearby { namespace apple { diff --git a/internal/platform/implementation/apple/ble_socket.mm b/internal/platform/implementation/apple/ble_socket.mm index b4d00506..997e5254 100644 --- a/internal/platform/implementation/apple/ble_socket.mm +++ b/internal/platform/implementation/apple/ble_socket.mm @@ -16,7 +16,7 @@ #include "internal/platform/implementation/ble_v2.h" -#import "internal/platform/implementation/apple/Mediums/Ble/GNCMBleConnection.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCMBleConnection.h" #import "internal/platform/implementation/apple/ble_peripheral.h" #import "internal/platform/implementation/apple/ble_utils.h" #import "internal/platform/implementation/apple/utils.h" diff --git a/internal/platform/implementation/apple/ble_utils.mm b/internal/platform/implementation/apple/ble_utils.mm index cd9f3cdb..45e2ebe2 100644 --- a/internal/platform/implementation/apple/ble_utils.mm +++ b/internal/platform/implementation/apple/ble_utils.mm @@ -19,7 +19,7 @@ #include -#import "internal/platform/implementation/apple/Mediums/BLEv2/GNCBLEGATTCharacteristic.h" +#import "internal/platform/implementation/apple/Mediums/BLE/GNCBLEGATTCharacteristic.h" #import "internal/platform/implementation/apple/utils.h" namespace nearby {