From 0f8c1b1fbe20e5aa0d700bc3fdff19ddd664f0a6 Mon Sep 17 00:00:00 2001 From: bourdakos Date: Thu, 31 Mar 2022 09:14:02 -0700 Subject: [PATCH] Move public headers to be compatible with SPM PiperOrigin-RevId: 438583798 --- internal/platform/implementation/ios/BUILD | 18 +++++++++--------- .../ios/Source/Internal/GNCAdvertiser.mm | 4 ++-- .../ios/Source/Internal/GNCCoreConnection.h | 2 +- .../ios/Source/Internal/GNCCoreConnection.mm | 4 ++-- .../ios/Source/Internal/GNCDiscoverer.mm | 4 ++-- .../ios/Source/Internal/GNCPayload+Internal.h | 2 +- .../ios/Source/Internal/GNCPayload.mm | 2 +- .../ios/Source/Internal/GNCPayloadListener.h | 2 +- .../ios/Source/Internal/GNCPayloadListener.mm | 4 ++-- .../ios/Source/Internal/GNCUtils.h | 4 ++-- .../ios/Source/Internal/GNCUtils.mm | 4 ++-- .../NearbyConnections}/GNCAdvertiser.h | 0 .../NearbyConnections}/GNCConnection.h | 0 .../NearbyConnections}/GNCConnections.h | 0 .../NearbyConnections}/GNCDiscoverer.h | 0 .../NearbyConnections}/GNCPayload.h | 0 16 files changed, 25 insertions(+), 25 deletions(-) rename internal/platform/implementation/ios/Source/{ => Public/NearbyConnections}/GNCAdvertiser.h (100%) rename internal/platform/implementation/ios/Source/{ => Public/NearbyConnections}/GNCConnection.h (100%) rename internal/platform/implementation/ios/Source/{ => Public/NearbyConnections}/GNCConnections.h (100%) rename internal/platform/implementation/ios/Source/{ => Public/NearbyConnections}/GNCDiscoverer.h (100%) rename internal/platform/implementation/ios/Source/{ => Public/NearbyConnections}/GNCPayload.h (100%) diff --git a/internal/platform/implementation/ios/BUILD b/internal/platform/implementation/ios/BUILD index 7c5c5be7..22db339c 100644 --- a/internal/platform/implementation/ios/BUILD +++ b/internal/platform/implementation/ios/BUILD @@ -30,16 +30,16 @@ objc_library( "Source/Internal/platform.mm", ], hdrs = [ - "Source/GNCAdvertiser.h", - "Source/GNCConnection.h", - "Source/GNCConnections.h", - "Source/GNCDiscoverer.h", - "Source/GNCPayload.h", "Source/Internal/GNCCore.h", "Source/Internal/GNCCoreConnection.h", "Source/Internal/GNCPayload+Internal.h", "Source/Internal/GNCPayloadListener.h", "Source/Internal/GNCUtils.h", + "Source/Public/NearbyConnections/GNCAdvertiser.h", + "Source/Public/NearbyConnections/GNCConnection.h", + "Source/Public/NearbyConnections/GNCConnections.h", + "Source/Public/NearbyConnections/GNCDiscoverer.h", + "Source/Public/NearbyConnections/GNCPayload.h", ], deps = [ "//connections:core", @@ -55,10 +55,10 @@ objc_library( MIN_IOS_VERSION = "12.0" HDRS_POD = [ - "Source/GNCAdvertiser.h", - "Source/GNCConnection.h", - "Source/GNCDiscoverer.h", - "Source/GNCPayload.h", + "Source/Public/NearbyConnections/GNCAdvertiser.h", + "Source/Public/NearbyConnections/GNCConnection.h", + "Source/Public/NearbyConnections/GNCDiscoverer.h", + "Source/Public/NearbyConnections/GNCPayload.h", ] ios_static_framework( diff --git a/internal/platform/implementation/ios/Source/Internal/GNCAdvertiser.mm b/internal/platform/implementation/ios/Source/Internal/GNCAdvertiser.mm index ddbd42fa..e2d929fc 100644 --- a/internal/platform/implementation/ios/Source/Internal/GNCAdvertiser.mm +++ b/internal/platform/implementation/ios/Source/Internal/GNCAdvertiser.mm @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/Source/GNCAdvertiser.h" +#import "internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCAdvertiser.h" #include @@ -23,12 +23,12 @@ #include "connections/params.h" #include "connections/status.h" #include "internal/platform/byte_array.h" -#import "internal/platform/implementation/ios/Source/GNCConnection.h" #import "internal/platform/implementation/ios/Source/Internal/GNCCore.h" #import "internal/platform/implementation/ios/Source/Internal/GNCCoreConnection.h" #import "internal/platform/implementation/ios/Source/Internal/GNCPayloadListener.h" #import "internal/platform/implementation/ios/Source/Internal/GNCUtils.h" #import "internal/platform/implementation/ios/Source/Platform/utils.h" +#import "internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCConnection.h" #import "GoogleToolboxForMac/GTMLogger.h" NS_ASSUME_NONNULL_BEGIN diff --git a/internal/platform/implementation/ios/Source/Internal/GNCCoreConnection.h b/internal/platform/implementation/ios/Source/Internal/GNCCoreConnection.h index 08afddfd..aa58f762 100644 --- a/internal/platform/implementation/ios/Source/Internal/GNCCoreConnection.h +++ b/internal/platform/implementation/ios/Source/Internal/GNCCoreConnection.h @@ -14,8 +14,8 @@ #import -#import "internal/platform/implementation/ios/Source/GNCConnection.h" #import "internal/platform/implementation/ios/Source/Internal/GNCCore.h" +#import "internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCConnection.h" NS_ASSUME_NONNULL_BEGIN diff --git a/internal/platform/implementation/ios/Source/Internal/GNCCoreConnection.mm b/internal/platform/implementation/ios/Source/Internal/GNCCoreConnection.mm index 896372e5..e90baeea 100644 --- a/internal/platform/implementation/ios/Source/Internal/GNCCoreConnection.mm +++ b/internal/platform/implementation/ios/Source/Internal/GNCCoreConnection.mm @@ -19,10 +19,10 @@ #include "internal/platform/exception.h" #include "internal/platform/file.h" #include "internal/platform/implementation/input_file.h" -#import "internal/platform/implementation/ios/Source/GNCConnection.h" -#import "internal/platform/implementation/ios/Source/GNCPayload.h" #import "internal/platform/implementation/ios/Source/Internal/GNCCore.h" #import "internal/platform/implementation/ios/Source/Platform/utils.h" +#import "internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCConnection.h" +#import "internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCPayload.h" #include "internal/platform/input_stream.h" #include "internal/platform/payload_id.h" diff --git a/internal/platform/implementation/ios/Source/Internal/GNCDiscoverer.mm b/internal/platform/implementation/ios/Source/Internal/GNCDiscoverer.mm index e644f9ae..0312d968 100644 --- a/internal/platform/implementation/ios/Source/Internal/GNCDiscoverer.mm +++ b/internal/platform/implementation/ios/Source/Internal/GNCDiscoverer.mm @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/Source/GNCDiscoverer.h" +#import "internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCDiscoverer.h" #include #include @@ -24,12 +24,12 @@ #include "connections/listeners.h" #include "connections/status.h" #include "internal/platform/byte_array.h" -#import "internal/platform/implementation/ios/Source/GNCConnection.h" #import "internal/platform/implementation/ios/Source/Internal/GNCCore.h" #import "internal/platform/implementation/ios/Source/Internal/GNCCoreConnection.h" #import "internal/platform/implementation/ios/Source/Internal/GNCPayloadListener.h" #import "internal/platform/implementation/ios/Source/Internal/GNCUtils.h" #import "internal/platform/implementation/ios/Source/Platform/utils.h" +#import "internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCConnection.h" #import "GoogleToolboxForMac/GTMLogger.h" NS_ASSUME_NONNULL_BEGIN diff --git a/internal/platform/implementation/ios/Source/Internal/GNCPayload+Internal.h b/internal/platform/implementation/ios/Source/Internal/GNCPayload+Internal.h index 4792826c..87b9ce57 100644 --- a/internal/platform/implementation/ios/Source/Internal/GNCPayload+Internal.h +++ b/internal/platform/implementation/ios/Source/Internal/GNCPayload+Internal.h @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/Source/GNCPayload.h" +#import "internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCPayload.h" NS_ASSUME_NONNULL_BEGIN diff --git a/internal/platform/implementation/ios/Source/Internal/GNCPayload.mm b/internal/platform/implementation/ios/Source/Internal/GNCPayload.mm index 30c88fe5..47ee7228 100644 --- a/internal/platform/implementation/ios/Source/Internal/GNCPayload.mm +++ b/internal/platform/implementation/ios/Source/Internal/GNCPayload.mm @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "internal/platform/implementation/ios/Source/GNCPayload.h" +#import "internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCPayload.h" #include "connections/payload.h" #include "internal/platform/payload_id.h" diff --git a/internal/platform/implementation/ios/Source/Internal/GNCPayloadListener.h b/internal/platform/implementation/ios/Source/Internal/GNCPayloadListener.h index 51ae1a1c..9545d791 100644 --- a/internal/platform/implementation/ios/Source/Internal/GNCPayloadListener.h +++ b/internal/platform/implementation/ios/Source/Internal/GNCPayloadListener.h @@ -14,8 +14,8 @@ #import -#import "internal/platform/implementation/ios/Source/GNCConnection.h" #import "internal/platform/implementation/ios/Source/Internal/GNCCore.h" +#import "internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCConnection.h" NS_ASSUME_NONNULL_BEGIN diff --git a/internal/platform/implementation/ios/Source/Internal/GNCPayloadListener.mm b/internal/platform/implementation/ios/Source/Internal/GNCPayloadListener.mm index be656538..a9a88a6f 100644 --- a/internal/platform/implementation/ios/Source/Internal/GNCPayloadListener.mm +++ b/internal/platform/implementation/ios/Source/Internal/GNCPayloadListener.mm @@ -22,12 +22,12 @@ #include "internal/platform/byte_array.h" #include "internal/platform/exception.h" #include "internal/platform/file.h" -#import "internal/platform/implementation/ios/Source/GNCConnection.h" -#import "internal/platform/implementation/ios/Source/GNCPayload.h" #import "internal/platform/implementation/ios/Source/Internal/GNCCore.h" #import "internal/platform/implementation/ios/Source/Internal/GNCCoreConnection.h" #import "internal/platform/implementation/ios/Source/Internal/GNCPayload+Internal.h" #include "internal/platform/implementation/ios/Source/Platform/utils.h" +#import "internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCConnection.h" +#import "internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCPayload.h" #include "internal/platform/input_stream.h" NS_ASSUME_NONNULL_BEGIN diff --git a/internal/platform/implementation/ios/Source/Internal/GNCUtils.h b/internal/platform/implementation/ios/Source/Internal/GNCUtils.h index 7f1e7b66..af05207f 100644 --- a/internal/platform/implementation/ios/Source/Internal/GNCUtils.h +++ b/internal/platform/implementation/ios/Source/Internal/GNCUtils.h @@ -17,8 +17,8 @@ #include #include "connections/listeners.h" -#import "internal/platform/implementation/ios/Source/GNCAdvertiser.h" -#import "internal/platform/implementation/ios/Source/GNCConnection.h" +#import "internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCAdvertiser.h" +#import "internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCConnection.h" NS_ASSUME_NONNULL_BEGIN diff --git a/internal/platform/implementation/ios/Source/Internal/GNCUtils.mm b/internal/platform/implementation/ios/Source/Internal/GNCUtils.mm index 2f3aa81d..3d24d402 100644 --- a/internal/platform/implementation/ios/Source/Internal/GNCUtils.mm +++ b/internal/platform/implementation/ios/Source/Internal/GNCUtils.mm @@ -15,8 +15,8 @@ #import "internal/platform/implementation/ios/Source/Internal/GNCUtils.h" #include "connections/strategy.h" -#import "internal/platform/implementation/ios/Source/GNCAdvertiser.h" -#import "internal/platform/implementation/ios/Source/GNCConnection.h" +#import "internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCAdvertiser.h" +#import "internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCConnection.h" NS_ASSUME_NONNULL_BEGIN diff --git a/internal/platform/implementation/ios/Source/GNCAdvertiser.h b/internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCAdvertiser.h similarity index 100% rename from internal/platform/implementation/ios/Source/GNCAdvertiser.h rename to internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCAdvertiser.h diff --git a/internal/platform/implementation/ios/Source/GNCConnection.h b/internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCConnection.h similarity index 100% rename from internal/platform/implementation/ios/Source/GNCConnection.h rename to internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCConnection.h diff --git a/internal/platform/implementation/ios/Source/GNCConnections.h b/internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCConnections.h similarity index 100% rename from internal/platform/implementation/ios/Source/GNCConnections.h rename to internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCConnections.h diff --git a/internal/platform/implementation/ios/Source/GNCDiscoverer.h b/internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCDiscoverer.h similarity index 100% rename from internal/platform/implementation/ios/Source/GNCDiscoverer.h rename to internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCDiscoverer.h diff --git a/internal/platform/implementation/ios/Source/GNCPayload.h b/internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCPayload.h similarity index 100% rename from internal/platform/implementation/ios/Source/GNCPayload.h rename to internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCPayload.h