Skip to content

Commit

Permalink
GDT: move some headers from public to internal (#6643)
Browse files Browse the repository at this point in the history 
* Move extra public headers to Internal and fix imports

* Cleanup

* Use relative paths in internal headers

* Fix imports in internal headers

* ./scripts/style.sh

* Fix GDTTestApp

* Fix test app

* Use real uploader for watchOS test app

* comma
  • Loading branch information
@maksymmalyhin
maksymmalyhin authored Oct 5, 2020
1 parent cdb4865 commit bde8e07
Show file tree
Hide file tree
Showing 49 changed files with 103 additions and 78 deletions.
12 changes: 11 additions & 1 deletion GoogleDataTransport.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,13 @@ Shared library for iOS SDK data transport needs.
if ENV['GDT_DEV'] && ENV['GDT_DEV'] == '1' then
s.app_spec 'TestApp' do |app_spec|
app_spec.platforms = {:ios => '8.0', :osx => '10.11', :tvos => '10.0'}
app_spec.source_files = 'GoogleDataTransport/GDTTestApp/*.swift'
app_spec.source_files = [
'GoogleDataTransport/GDTTestApp/*.swift',
'GoogleDataTransport/GDTCORLibrary/Internal/GDTCORRegistrar.h',
'GoogleDataTransport/GDTCORLibrary/Internal/GDTCORUploader.h',
'GoogleDataTransport/GDTTestApp/Bridging-Header.h',
]

app_spec.ios.resources = ['GoogleDataTransport/GDTTestApp/ios/*.storyboard']
app_spec.macos.resources = ['GoogleDataTransport/GDTTestApp/macos/*.storyboard']
app_spec.tvos.resources = ['GoogleDataTransport/GDTTestApp/tvos/*.storyboard']
Expand All @@ -66,6 +72,10 @@ Shared library for iOS SDK data transport needs.
'UIMainStoryboardFile' => 'Main',
'NSMainStoryboardFile' => 'Main'
}

app_spec.pod_target_xcconfig = {
'SWIFT_OBJC_BRIDGING_HEADER' => '$(PODS_TARGET_SRCROOT)/GoogleDataTransport/GDTTestApp/Bridging-Header.h'
}
end
end

Expand Down
2 changes: 1 addition & 1 deletion GoogleDataTransport/GDTCCTLibrary/GDTCCTNanopbHelpers.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
#import <AppKit/AppKit.h>
#endif // TARGET_OS_IOS || TARGET_OS_TV

#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORPlatform.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORClock.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORConsoleLogger.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCOREvent.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORPlatform.h"

#import <nanopb/pb.h>
#import <nanopb/pb_decode.h>
Expand Down
6 changes: 3 additions & 3 deletions GoogleDataTransport/GDTCCTLibrary/GDTCCTUploader.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@

#import "GoogleDataTransport/GDTCCTLibrary/Private/GDTCCTUploader.h"

#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORPlatform.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORRegistrar.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORStorageProtocol.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORConsoleLogger.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCOREvent.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORPlatform.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORRegistrar.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORStorageProtocol.h"

#import <nanopb/pb.h>
#import <nanopb/pb_decode.h>
Expand Down
2 changes: 1 addition & 1 deletion GoogleDataTransport/GDTCCTLibrary/Private/GDTCCTNanopbHelpers.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

#import <Foundation/Foundation.h>

#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORReachability.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCOREvent.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORReachability.h"

#import "GoogleDataTransport/GDTCCTLibrary/Protogen/nanopb/cct.nanopb.h"

Expand Down
2 changes: 1 addition & 1 deletion GoogleDataTransport/GDTCCTLibrary/Private/GDTCCTUploader.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#import <Foundation/Foundation.h>

#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORUploader.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORUploader.h"

NS_ASSUME_NONNULL_BEGIN

Expand Down
2 changes: 1 addition & 1 deletion GoogleDataTransport/GDTCCTTests/Common/TestStorage/GDTCCTTestStorage.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#import <Foundation/Foundation.h>
#import <XCTest/XCTest.h>

#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORStorageProtocol.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORStorageProtocol.h"

NS_ASSUME_NONNULL_BEGIN

Expand Down
2 changes: 1 addition & 1 deletion GoogleDataTransport/GDTCCTTests/Unit/GDTCCTUploaderTest.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#import <XCTest/XCTest.h>

#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORStorageProtocol.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORStorageProtocol.h"
#import "GoogleDataTransport/GDTCORTests/Common/Categories/GDTCORRegistrar+Testing.h"

#import "GoogleDataTransport/GDTCCTLibrary/Private/GDTCCTNanopbHelpers.h"
Expand Down
4 changes: 2 additions & 2 deletions GoogleDataTransport/GDTCCTTests/Unit/Helpers/GDTCCTEventGenerator.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
#import "GoogleDataTransport/GDTCCTTests/Unit/Helpers/GDTCCTEventGenerator.h"

#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORAssert.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORPlatform.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORStorageProtocol.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCOREventDataObject.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORPlatform.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORStorageProtocol.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORTargets.h"

#import "GoogleDataTransport/GDTCCTLibrary/Public/GDTCOREvent+GDTCCTSupport.h"
Expand Down
4 changes: 2 additions & 2 deletions GoogleDataTransport/GDTCORLibrary/GDTCOREvent.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCOREvent.h"

#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORAssert.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORPlatform.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORStorageProtocol.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORClock.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORConsoleLogger.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORPlatform.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORStorageProtocol.h"

#import "GoogleDataTransport/GDTCORLibrary/Private/GDTCOREvent_Private.h"

Expand Down
6 changes: 3 additions & 3 deletions GoogleDataTransport/GDTCORLibrary/GDTCORFlatFileStorage.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
#import "GoogleDataTransport/GDTCORLibrary/Private/GDTCORFlatFileStorage.h"

#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORAssert.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORLifecycle.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORPlatform.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORStorageEventSelector.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORConsoleLogger.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCOREvent.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORLifecycle.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORPlatform.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORStorageEventSelector.h"

#import "GoogleDataTransport/GDTCORLibrary/Private/GDTCOREvent_Private.h"
#import "GoogleDataTransport/GDTCORLibrary/Private/GDTCORRegistrar_Private.h"
Expand Down
2 changes: 1 addition & 1 deletion GoogleDataTransport/GDTCORLibrary/GDTCORLifecycle.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORLifecycle.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORLifecycle.h"

#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORConsoleLogger.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCOREvent.h"
Expand Down
4 changes: 2 additions & 2 deletions GoogleDataTransport/GDTCORLibrary/GDTCORPlatform.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
* limitations under the License.
*/

#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORPlatform.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORPlatform.h"

#import <sys/sysctl.h>

#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORAssert.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORReachability.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORConsoleLogger.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORReachability.h"

#import "GoogleDataTransport/GDTCORLibrary/Private/GDTCORRegistrar_Private.h"

Expand Down
2 changes: 1 addition & 1 deletion GoogleDataTransport/GDTCORLibrary/GDTCORReachability.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORReachability.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORReachability.h"
#import "GoogleDataTransport/GDTCORLibrary/Private/GDTCORReachability_Private.h"

#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORConsoleLogger.h"
Expand Down
2 changes: 1 addition & 1 deletion GoogleDataTransport/GDTCORLibrary/GDTCORRegistrar.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORRegistrar.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORRegistrar.h"
#import "GoogleDataTransport/GDTCORLibrary/Private/GDTCORRegistrar_Private.h"

#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORConsoleLogger.h"
Expand Down
2 changes: 1 addition & 1 deletion GoogleDataTransport/GDTCORLibrary/GDTCORStorageEventSelector.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORStorageEventSelector.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORStorageEventSelector.h"

@implementation GDTCORStorageEventSelector

Expand Down
4 changes: 2 additions & 2 deletions GoogleDataTransport/GDTCORLibrary/GDTCORTransformer.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
#import "GoogleDataTransport/GDTCORLibrary/Private/GDTCORTransformer_Private.h"

#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORAssert.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORLifecycle.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORStorageProtocol.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORConsoleLogger.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCOREvent.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCOREventTransformer.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORLifecycle.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORStorageProtocol.h"

#import "GoogleDataTransport/GDTCORLibrary/Private/GDTCOREvent_Private.h"
#import "GoogleDataTransport/GDTCORLibrary/Private/GDTCORRegistrar_Private.h"
Expand Down
2 changes: 1 addition & 1 deletion GoogleDataTransport/GDTCORLibrary/GDTCORUploadCoordinator.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
#import "GoogleDataTransport/GDTCORLibrary/Private/GDTCORUploadCoordinator.h"

#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORAssert.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORReachability.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORClock.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORConsoleLogger.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORReachability.h"

#import "GoogleDataTransport/GDTCORLibrary/Private/GDTCORRegistrar_Private.h"

Expand Down
2 changes: 1 addition & 1 deletion GoogleDataTransport/GDTCORLibrary/Internal/GDTCORDirectorySizeTracker.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#import <Foundation/Foundation.h>

#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORStorageProtocol.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORStorageProtocol.h"

NS_ASSUME_NONNULL_BEGIN

Expand Down
2 changes: 1 addition & 1 deletion ...lic/GoogleDataTransport/GDTCORLifecycle.h → .../GDTCORLibrary/Internal/GDTCORLifecycle.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#import <Foundation/Foundation.h>

#import "GDTCORPlatform.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORPlatform.h"

@class GDTCOREvent;

Expand Down
0 ...blic/GoogleDataTransport/GDTCORPlatform.h → ...t/GDTCORLibrary/Internal/GDTCORPlatform.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion .../GoogleDataTransport/GDTCORReachability.h → ...TCORLibrary/Internal/GDTCORReachability.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#import <Foundation/Foundation.h>

#import "GDTCORPlatform.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORPlatform.h"

NS_ASSUME_NONNULL_BEGIN

Expand Down
6 changes: 3 additions & 3 deletions ...lic/GoogleDataTransport/GDTCORRegistrar.h → .../GDTCORLibrary/Internal/GDTCORRegistrar.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

#import <Foundation/Foundation.h>

#import "GDTCORStorageProtocol.h"
#import "GDTCORTargets.h"
#import "GDTCORUploader.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORStorageProtocol.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORUploader.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORTargets.h"

NS_ASSUME_NONNULL_BEGIN

Expand Down
2 changes: 1 addition & 1 deletion ...ataTransport/GDTCORStorageEventSelector.h → ...ary/Internal/GDTCORStorageEventSelector.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#import <Foundation/Foundation.h>

#import "GDTCORTargets.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORTargets.h"

NS_ASSUME_NONNULL_BEGIN

Expand Down
6 changes: 3 additions & 3 deletions ...ogleDataTransport/GDTCORStorageProtocol.h → ...RLibrary/Internal/GDTCORStorageProtocol.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

#import <Foundation/Foundation.h>

#import "GDTCORLifecycle.h"
#import "GDTCORStorageEventSelector.h"
#import "GDTCORTargets.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORLifecycle.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORStorageEventSelector.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORTargets.h"

@class GDTCOREvent;
@class GDTCORClock;
Expand Down
6 changes: 3 additions & 3 deletions ...blic/GoogleDataTransport/GDTCORUploader.h → ...t/GDTCORLibrary/Internal/GDTCORUploader.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

#import <Foundation/Foundation.h>

#import "GDTCORClock.h"
#import "GDTCORLifecycle.h"
#import "GDTCORTargets.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORLifecycle.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORClock.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORTargets.h"

NS_ASSUME_NONNULL_BEGIN

Expand Down
6 changes: 3 additions & 3 deletions GoogleDataTransport/GDTCORLibrary/Private/GDTCORFlatFileStorage.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

#import <Foundation/Foundation.h>

#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORLifecycle.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORStorageEventSelector.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORStorageProtocol.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORLifecycle.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORStorageEventSelector.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORStorageProtocol.h"

@class GDTCOREvent;
@class GDTCORUploadCoordinator;
Expand Down
2 changes: 1 addition & 1 deletion GoogleDataTransport/GDTCORLibrary/Private/GDTCORReachability_Private.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORReachability.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORReachability.h"

@interface GDTCORReachability ()

Expand Down
2 changes: 1 addition & 1 deletion GoogleDataTransport/GDTCORLibrary/Private/GDTCORRegistrar_Private.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORRegistrar.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORRegistrar.h"

@interface GDTCORRegistrar ()

Expand Down
2 changes: 1 addition & 1 deletion GoogleDataTransport/GDTCORLibrary/Private/GDTCORTransformer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#import <Foundation/Foundation.h>

#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORLifecycle.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORLifecycle.h"

@class GDTCOREvent;

Expand Down
4 changes: 2 additions & 2 deletions GoogleDataTransport/GDTCORLibrary/Private/GDTCORUploadCoordinator.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

#import <Foundation/Foundation.h>

#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORLifecycle.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORRegistrar.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORLifecycle.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORRegistrar.h"

@class GDTCORClock;

Expand Down
3 changes: 0 additions & 3 deletions GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GoogleDataTransport.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,5 @@
#import "GDTCOREvent.h"
#import "GDTCOREventDataObject.h"
#import "GDTCOREventTransformer.h"
#import "GDTCORLifecycle.h"
#import "GDTCORRegistrar.h"
#import "GDTCORTargets.h"
#import "GDTCORTransport.h"
#import "GDTCORUploader.h"
2 changes: 1 addition & 1 deletion GoogleDataTransport/GDTCORTests/Common/Categories/GDTCORRegistrar+Testing.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* limitations under the License.
*/

#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORRegistrar.h"
#import "GoogleDataTransport/GDTCORLibrary/Private/GDTCORRegistrar_Private.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORRegistrar.h"

NS_ASSUME_NONNULL_BEGIN

Expand Down
2 changes: 1 addition & 1 deletion GoogleDataTransport/GDTCORTests/Common/Categories/GDTCORUploadCoordinator+Testing.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

#import <objc/runtime.h>

#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORRegistrar.h"
#import "GoogleDataTransport/GDTCORLibrary/Private/GDTCORFlatFileStorage.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORRegistrar.h"

@implementation GDTCORUploadCoordinator (Testing)

Expand Down
2 changes: 1 addition & 1 deletion GoogleDataTransport/GDTCORTests/Common/Fakes/GDTCORApplicationFake.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#import <Foundation/Foundation.h>

#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORPlatform.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORPlatform.h"

NS_ASSUME_NONNULL_BEGIN

Expand Down
2 changes: 1 addition & 1 deletion GoogleDataTransport/GDTCORTests/Common/Fakes/GDTCORStorageFake.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORStorageProtocol.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORStorageProtocol.h"

NS_ASSUME_NONNULL_BEGIN

Expand Down
2 changes: 1 addition & 1 deletion GoogleDataTransport/GDTCORTests/Integration/Helpers/GDTCORIntegrationTestUploader.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#import <Foundation/Foundation.h>

#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORUploader.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORUploader.h"

@class GDTCORTestServer;

Expand Down
2 changes: 1 addition & 1 deletion GoogleDataTransport/GDTCORTests/Integration/Helpers/GDTCORIntegrationTestUploader.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
#import "GoogleDataTransport/GDTCORTests/Integration/Helpers/GDTCORIntegrationTestUploader.h"

#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORAssert.h"
#import "GoogleDataTransport/GDTCORLibrary/Internal/GDTCORRegistrar.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCOREvent.h"
#import "GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORRegistrar.h"

#import "GoogleDataTransport/GDTCORTests/Integration/TestServer/GDTCORTestServer.h"

Expand Down
Loading

0 comments on commit bde8e07

Please sign in to comment.