diff --git a/GrowingTrackerCore/Core/GrowingModuleManager.m b/GrowingTrackerCore/Core/GrowingModuleManager.m index 123f89c67..7e4320053 100644 --- a/GrowingTrackerCore/Core/GrowingModuleManager.m +++ b/GrowingTrackerCore/Core/GrowingModuleManager.m @@ -21,9 +21,9 @@ #import #import #import "GrowingTrackerCore/Core/GrowingContext.h" -#import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogger.h" #import "GrowingTrackerCore/Public/GrowingAnnotationCore.h" #import "GrowingTrackerCore/Public/GrowingModuleProtocol.h" +#import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogger.h" static NSString *kInitSelector = @"growingModInit:"; static NSString *kSetDataCollectionEnabledSelector = @"growingModSetDataCollectionEnabled:"; diff --git a/GrowingTrackerCore/Core/GrowingServiceManager.m b/GrowingTrackerCore/Core/GrowingServiceManager.m index d1a483243..222d8c0d1 100644 --- a/GrowingTrackerCore/Core/GrowingServiceManager.m +++ b/GrowingTrackerCore/Core/GrowingServiceManager.m @@ -19,9 +19,9 @@ #import "GrowingTrackerCore/Public/GrowingServiceManager.h" #import -#import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogger.h" #import "GrowingTrackerCore/Public/GrowingAnnotationCore.h" #import "GrowingTrackerCore/Public/GrowingBaseService.h" +#import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogger.h" @interface GrowingServiceManager () diff --git a/GrowingTrackerCore/Database/GrowingEventDatabase.m b/GrowingTrackerCore/Database/GrowingEventDatabase.m index f8b37ceba..f8798e335 100644 --- a/GrowingTrackerCore/Database/GrowingEventDatabase.m +++ b/GrowingTrackerCore/Database/GrowingEventDatabase.m @@ -18,9 +18,9 @@ // limitations under the License. #import "GrowingTrackerCore/Database/GrowingEventDatabase.h" +#import "GrowingTrackerCore/Public/GrowingServiceManager.h" #import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogger.h" #import "GrowingTrackerCore/Utils/GrowingInternalMacros.h" -#import "GrowingTrackerCore/Public/GrowingServiceManager.h" long long const GrowingEventDatabaseExpirationTime = 86400000 * 7; NSString *const GrowingEventDatabaseErrorDomain = @"com.growing.event.database.error"; diff --git a/GrowingTrackerCore/Event/Base/GrowingBaseEvent.m b/GrowingTrackerCore/Event/Base/GrowingBaseEvent.m index d09f7aa5a..2f1347a15 100644 --- a/GrowingTrackerCore/Event/Base/GrowingBaseEvent.m +++ b/GrowingTrackerCore/Event/Base/GrowingBaseEvent.m @@ -23,8 +23,8 @@ #import "GrowingTrackerCore/Manager/GrowingConfigurationManager.h" #import "GrowingTrackerCore/Manager/GrowingSession.h" #import "GrowingTrackerCore/Network/GrowingNetworkInterfaceManager.h" -#import "GrowingTrackerCore/Utils/GrowingDeviceInfo.h" #import "GrowingTrackerCore/Public/GrowingFieldsIgnore.h" +#import "GrowingTrackerCore/Utils/GrowingDeviceInfo.h" #import "GrowingULTimeUtil.h" @implementation GrowingBaseEvent diff --git a/GrowingTrackerCore/Event/GrowingEventManager.m b/GrowingTrackerCore/Event/GrowingEventManager.m index 72dd56daf..b232c9e86 100644 --- a/GrowingTrackerCore/Event/GrowingEventManager.m +++ b/GrowingTrackerCore/Event/GrowingEventManager.m @@ -26,14 +26,14 @@ #import "GrowingTrackerCore/Manager/GrowingSession.h" #import "GrowingTrackerCore/Network/GrowingNetworkInterfaceManager.h" #import "GrowingTrackerCore/Network/Request/GrowingEventRequest.h" -#import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogger.h" -#import "GrowingTrackerCore/Thread/GrowingDispatchManager.h" -#import "GrowingTrackerCore/Utils/GrowingDeviceInfo.h" #import "GrowingTrackerCore/Public/GrowingBaseEvent.h" #import "GrowingTrackerCore/Public/GrowingEventFilter.h" #import "GrowingTrackerCore/Public/GrowingEventNetworkService.h" #import "GrowingTrackerCore/Public/GrowingServiceManager.h" #import "GrowingTrackerCore/Public/GrowingTrackConfiguration.h" +#import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogger.h" +#import "GrowingTrackerCore/Thread/GrowingDispatchManager.h" +#import "GrowingTrackerCore/Utils/GrowingDeviceInfo.h" static const NSUInteger kGrowingMaxDBCacheSize = 100; // default: write to DB as soon as there are 100 events static const NSUInteger kGrowingMaxBatchSize = 500; // default: send no more than 500 events in every batch diff --git a/GrowingTrackerCore/FileStorage/GrowingFileStorage.m b/GrowingTrackerCore/FileStorage/GrowingFileStorage.m index 91857734d..64bdb4853 100644 --- a/GrowingTrackerCore/FileStorage/GrowingFileStorage.m +++ b/GrowingTrackerCore/FileStorage/GrowingFileStorage.m @@ -19,9 +19,9 @@ #import "GrowingTrackerCore/FileStorage/GrowingFileStorage.h" #import "GrowingTrackerCore/Helpers/GrowingHelpers.h" +#import "GrowingTrackerCore/Public/GrowingServiceManager.h" #import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogger.h" #import "GrowingTrackerCore/Utils/GrowingDeviceInfo.h" -#import "GrowingTrackerCore/Public/GrowingServiceManager.h" NSString *const kGrowingResidentDirName = @"com.growingio.core"; NSString *const kGrowingDirCommonPrefix = @"com.growingio."; diff --git a/GrowingTrackerCore/GrowingRealTracker.m b/GrowingTrackerCore/GrowingRealTracker.m index ebc37d415..3b82a1127 100644 --- a/GrowingTrackerCore/GrowingRealTracker.m +++ b/GrowingTrackerCore/GrowingRealTracker.m @@ -27,15 +27,15 @@ #import "GrowingTrackerCore/LogFormat/GrowingWSLoggerFormat.h" #import "GrowingTrackerCore/Manager/GrowingConfigurationManager.h" #import "GrowingTrackerCore/Manager/GrowingSession.h" +#import "GrowingTrackerCore/Public/GrowingAttributesBuilder.h" +#import "GrowingTrackerCore/Public/GrowingModuleManager.h" +#import "GrowingTrackerCore/Public/GrowingServiceManager.h" +#import "GrowingTrackerCore/Public/GrowingTrackConfiguration.h" #import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogger.h" #import "GrowingTrackerCore/Thread/GrowingDispatchManager.h" #import "GrowingTrackerCore/Timer/GrowingEventTimer.h" #import "GrowingTrackerCore/Utils/GrowingArgumentChecker.h" #import "GrowingTrackerCore/Utils/GrowingDeviceInfo.h" -#import "GrowingTrackerCore/Public/GrowingAttributesBuilder.h" -#import "GrowingTrackerCore/Public/GrowingModuleManager.h" -#import "GrowingTrackerCore/Public/GrowingServiceManager.h" -#import "GrowingTrackerCore/Public/GrowingTrackConfiguration.h" #import "GrowingULAppLifecycle.h" NSString *const GrowingTrackerVersionName = @"4.0.0"; diff --git a/GrowingTrackerCore/Helpers/Foundation/NSData+GrowingHelper.m b/GrowingTrackerCore/Helpers/Foundation/NSData+GrowingHelper.m index 4310cc77f..4adf4ed98 100644 --- a/GrowingTrackerCore/Helpers/Foundation/NSData+GrowingHelper.m +++ b/GrowingTrackerCore/Helpers/Foundation/NSData+GrowingHelper.m @@ -19,10 +19,10 @@ #import "GrowingTrackerCore/Helpers/Foundation/NSData+GrowingHelper.h" #import "GrowingTrackerCore/Helpers/Foundation/NSString+GrowingHelper.h" -#import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogger.h" #import "GrowingTrackerCore/Public/GrowingCompressService.h" #import "GrowingTrackerCore/Public/GrowingEncryptionService.h" #import "GrowingTrackerCore/Public/GrowingServiceManager.h" +#import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogger.h" #import diff --git a/GrowingTrackerCore/Manager/GrowingSession.m b/GrowingTrackerCore/Manager/GrowingSession.m index 2dfad7f45..a86f361a5 100644 --- a/GrowingTrackerCore/Manager/GrowingSession.m +++ b/GrowingTrackerCore/Manager/GrowingSession.m @@ -23,12 +23,12 @@ #import "GrowingTrackerCore/Event/Tools/GrowingPersistenceDataProvider.h" #import "GrowingTrackerCore/Helpers/GrowingHelpers.h" #import "GrowingTrackerCore/Manager/GrowingConfigurationManager.h" +#import "GrowingTrackerCore/Public/GrowingTrackConfiguration.h" #import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogMacros.h" #import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogger.h" #import "GrowingTrackerCore/Thread/GrowingDispatchManager.h" #import "GrowingTrackerCore/Timer/GrowingEventTimer.h" #import "GrowingTrackerCore/Utils/GrowingInternalMacros.h" -#import "GrowingTrackerCore/Public/GrowingTrackConfiguration.h" #import "GrowingULAppLifecycle.h" #import "GrowingULTimeUtil.h" diff --git a/Modules/Advert/GrowingAdvertising.m b/Modules/Advert/GrowingAdvertising.m index 2edbfd9bb..1be439281 100644 --- a/Modules/Advert/GrowingAdvertising.m +++ b/Modules/Advert/GrowingAdvertising.m @@ -32,11 +32,11 @@ #import "GrowingTrackerCore/Manager/GrowingConfigurationManager.h" #import "GrowingTrackerCore/Manager/GrowingSession.h" #import "GrowingTrackerCore/Network/Request/GrowingNetworkConfig.h" +#import "GrowingTrackerCore/Public/GrowingEventNetworkService.h" +#import "GrowingTrackerCore/Public/GrowingServiceManager.h" #import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogger.h" #import "GrowingTrackerCore/Thread/GrowingDispatchManager.h" #import "GrowingTrackerCore/Utils/GrowingDeviceInfo.h" -#import "GrowingTrackerCore/Public/GrowingEventNetworkService.h" -#import "GrowingTrackerCore/Public/GrowingServiceManager.h" #import "GrowingULAppLifecycle.h" #import diff --git a/Modules/Flutter/GrowingFlutterPlugin.m b/Modules/Flutter/GrowingFlutterPlugin.m index b23354dab..b032dcc84 100644 --- a/Modules/Flutter/GrowingFlutterPlugin.m +++ b/Modules/Flutter/GrowingFlutterPlugin.m @@ -21,8 +21,8 @@ #import "GrowingTrackerCore/Event/Autotrack/GrowingPageEvent.h" #import "GrowingTrackerCore/Event/Autotrack/GrowingViewElementEvent.h" #import "GrowingTrackerCore/Event/GrowingEventManager.h" -#import "GrowingTrackerCore/Thread/GrowingDispatchManager.h" #import "GrowingTrackerCore/Public/GrowingAttributesBuilder.h" +#import "GrowingTrackerCore/Thread/GrowingDispatchManager.h" #import "GrowingULAppLifecycle.h" GrowingMod(GrowingFlutterPlugin) diff --git a/Modules/Hybrid/GrowingHybridBridgeProvider.m b/Modules/Hybrid/GrowingHybridBridgeProvider.m index 4d043ee37..81c3bd948 100644 --- a/Modules/Hybrid/GrowingHybridBridgeProvider.m +++ b/Modules/Hybrid/GrowingHybridBridgeProvider.m @@ -26,10 +26,10 @@ #import "GrowingTrackerCore/Event/GrowingVisitorAttributesEvent.h" #import "GrowingTrackerCore/Helpers/GrowingHelpers.h" #import "GrowingTrackerCore/Manager/GrowingSession.h" -#import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogger.h" -#import "GrowingTrackerCore/Utils/GrowingDeviceInfo.h" #import "GrowingTrackerCore/Public/GrowingAnnotationCore.h" #import "GrowingTrackerCore/Public/GrowingBaseEvent.h" +#import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogger.h" +#import "GrowingTrackerCore/Utils/GrowingDeviceInfo.h" #import "GrowingULTimeUtil.h" #import "Modules/Hybrid/Events/GrowingHybridCustomEvent.h" #import "Modules/Hybrid/Events/GrowingHybridEventType.h" diff --git a/Modules/Hybrid/GrowingWKWebViewJavascriptBridge.m b/Modules/Hybrid/GrowingWKWebViewJavascriptBridge.m index 8a0a4c16c..d6b2d138c 100644 --- a/Modules/Hybrid/GrowingWKWebViewJavascriptBridge.m +++ b/Modules/Hybrid/GrowingWKWebViewJavascriptBridge.m @@ -24,10 +24,10 @@ #import "GrowingTrackerCore/Event/GrowingNodeProtocol.h" #import "GrowingTrackerCore/GrowingRealTracker.h" #import "GrowingTrackerCore/Manager/GrowingConfigurationManager.h" +#import "GrowingTrackerCore/Public/GrowingTrackConfiguration.h" #import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogMacros.h" #import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogger.h" #import "GrowingTrackerCore/Utils/GrowingDeviceInfo.h" -#import "GrowingTrackerCore/Public/GrowingTrackConfiguration.h" #import "Modules/Hybrid/GrowingHybridBridgeProvider.h" #import "Modules/Hybrid/GrowingWKWebViewJavascriptBridge_JS.h" #import "Modules/Hybrid/GrowingWebViewJavascriptBridgeConfiguration.h" diff --git a/Modules/MobileDebugger/GrowingMobileDebugger.m b/Modules/MobileDebugger/GrowingMobileDebugger.m index a9a8fb763..db99fe5a1 100644 --- a/Modules/MobileDebugger/GrowingMobileDebugger.m +++ b/Modules/MobileDebugger/GrowingMobileDebugger.m @@ -27,14 +27,14 @@ #import "GrowingTrackerCore/Menu/GrowingAlert.h" #import "GrowingTrackerCore/Menu/GrowingStatusBar.h" #import "GrowingTrackerCore/Network/Request/GrowingNetworkConfig.h" -#import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogger.h" -#import "GrowingTrackerCore/Thread/GrowingDispatchManager.h" -#import "GrowingTrackerCore/Utils/GrowingDeviceInfo.h" -#import "GrowingTrackerCore/Utils/GrowingInternalMacros.h" #import "GrowingTrackerCore/Public/GrowingAnnotationCore.h" #import "GrowingTrackerCore/Public/GrowingScreenshotService.h" #import "GrowingTrackerCore/Public/GrowingServiceManager.h" #import "GrowingTrackerCore/Public/GrowingWebSocketService.h" +#import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogger.h" +#import "GrowingTrackerCore/Thread/GrowingDispatchManager.h" +#import "GrowingTrackerCore/Utils/GrowingDeviceInfo.h" +#import "GrowingTrackerCore/Utils/GrowingInternalMacros.h" #import "GrowingULTimeUtil.h" #import "Modules/MobileDebugger/GrowingDebuggerEventQueue.h" diff --git a/Modules/WebCircle/GrowingWebCircle.m b/Modules/WebCircle/GrowingWebCircle.m index 8904d0d44..ea28438eb 100644 --- a/Modules/WebCircle/GrowingWebCircle.m +++ b/Modules/WebCircle/GrowingWebCircle.m @@ -34,13 +34,13 @@ #import "GrowingTrackerCore/Manager/GrowingConfigurationManager.h" #import "GrowingTrackerCore/Menu/GrowingAlert.h" #import "GrowingTrackerCore/Network/Request/GrowingNetworkConfig.h" -#import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogger.h" -#import "GrowingTrackerCore/Thread/GrowingDispatchManager.h" -#import "GrowingTrackerCore/Utils/GrowingDeviceInfo.h" #import "GrowingTrackerCore/Public/GrowingFlutterService.h" #import "GrowingTrackerCore/Public/GrowingScreenshotService.h" #import "GrowingTrackerCore/Public/GrowingServiceManager.h" #import "GrowingTrackerCore/Public/GrowingWebSocketService.h" +#import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogger.h" +#import "GrowingTrackerCore/Thread/GrowingDispatchManager.h" +#import "GrowingTrackerCore/Utils/GrowingDeviceInfo.h" #import "Modules/WebCircle/GrowingWebCircleElement.h" #import "Modules/WebCircle/GrowingWebCircleStatusView.h" diff --git a/Package.swift b/Package.swift index 8042a6cae..e4374248f 100644 --- a/Package.swift +++ b/Package.swift @@ -59,6 +59,7 @@ let package = Package( .tracker, // MARK: - Resources + .Resources.privacy, .Resources.privacy_macos, @@ -136,8 +137,8 @@ extension Target { enum Resources { static let privacy = target(name: .privacy, - path: .Path.privacy, - resources: [.copy("Resources/PrivacyInfo.xcprivacy")]) + path: .Path.privacy, + resources: [.copy("Resources/PrivacyInfo.xcprivacy")]) static let privacy_macos = target(name: .privacy_macos, path: .Path.privacy_macos, @@ -405,4 +406,4 @@ extension String { static let encrypt = "Services/Encryption" static let screenshot = "Services/Screenshot" } -} \ No newline at end of file +} diff --git a/Services/Network/GrowingNetworkManager.m b/Services/Network/GrowingNetworkManager.m index 1a1dd58ed..6cf972939 100644 --- a/Services/Network/GrowingNetworkManager.m +++ b/Services/Network/GrowingNetworkManager.m @@ -18,8 +18,8 @@ // limitations under the License. #import "Services/Network/GrowingNetworkManager.h" -#import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogger.h" #import "GrowingTrackerCore/Public/GrowingAnnotationCore.h" +#import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogger.h" #import "Services/Network/NSURLSession+GrowingURLSessionHelper.h" GrowingService(GrowingEventNetworkService, GrowingNetworkManager)