From 7b9ee6283128cec559025167723e2fe88347131e Mon Sep 17 00:00:00 2001 From: YoloMao Date: Mon, 18 Sep 2023 19:59:58 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20privacy=20manifest=20=E9=80=82=E9=85=8D?= =?UTF-8?q?=20macOS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Core/GrowingAnnotationCore.m | 2 +- .../Core/GrowingModuleManager.m | 6 ++-- .../Core/GrowingServiceManager.m | 6 ++-- .../Database/GrowingEventDatabase.m | 2 +- .../Event/Base/GrowingAttributesBuilder.m | 2 +- .../Event/Base/GrowingBaseEvent.m | 4 +-- GrowingTrackerCore/Event/GrowingEventFilter.m | 2 +- .../Event/GrowingEventManager.m | 10 +++--- .../Event/GrowingFieldsIgnore.m | 2 +- .../FileStorage/GrowingFileStorage.m | 2 +- GrowingTrackerCore/GrowingRealTracker.m | 8 ++--- .../GrowingTrackConfiguration.m | 2 +- .../Helpers/Foundation/NSData+GrowingHelper.m | 6 ++-- .../Manager/GrowingConfigurationManager.m | 2 +- GrowingTrackerCore/Manager/GrowingSession.m | 2 +- .../GrowingAnnotationCore.h | 0 .../GrowingAttributesBuilder.h | 0 .../{include => Public}/GrowingBaseEvent.h | 0 .../{include => Public}/GrowingBaseService.h | 0 .../GrowingCompressService.h | 0 .../{include => Public}/GrowingDynamicProxy.h | 0 .../GrowingEncryptionService.h | 0 .../GrowingEventDatabaseService.h | 0 .../{include => Public}/GrowingEventFilter.h | 0 .../GrowingEventNetworkService.h | 0 .../GrowingEventPersistenceProtocol.h | 0 .../{include => Public}/GrowingFieldsIgnore.h | 0 .../GrowingFlutterService.h | 0 .../GrowingModuleManager.h | 0 .../GrowingModuleProtocol.h | 0 .../GrowingRequestProtocol.h | 0 .../GrowingScreenshotService.h | 0 .../GrowingServiceManager.h | 0 .../GrowingTrackConfiguration.h | 0 .../GrowingWebSocketService.h | 0 .../Utils/GrowingDynamicProxy.m | 2 +- Modules/Advert/GrowingAdvertising.m | 4 +-- Modules/Flutter/GrowingFlutterPlugin.m | 2 +- Modules/Hybrid/GrowingHybridBridgeProvider.m | 4 +-- .../Hybrid/GrowingWKWebViewJavascriptBridge.m | 2 +- .../MobileDebugger/GrowingMobileDebugger.m | 8 ++--- Modules/WebCircle/GrowingWebCircle.m | 8 ++--- Package.swift | 35 +++++++++++++++++-- Services/Database/GrowingEventFMDatabase.m | 2 +- Services/Network/GrowingNetworkManager.m | 2 +- .../Resources/PrivacyInfo.xcprivacy | 0 .../dummy.m | 0 .../include/dummy.h | 0 .../Resources/PrivacyInfo.xcprivacy | 0 .../dummy.m | 0 .../include/dummy.h | 0 51 files changed, 79 insertions(+), 48 deletions(-) rename GrowingTrackerCore/{include => Public}/GrowingAnnotationCore.h (100%) rename GrowingTrackerCore/{include => Public}/GrowingAttributesBuilder.h (100%) rename GrowingTrackerCore/{include => Public}/GrowingBaseEvent.h (100%) rename GrowingTrackerCore/{include => Public}/GrowingBaseService.h (100%) rename GrowingTrackerCore/{include => Public}/GrowingCompressService.h (100%) rename GrowingTrackerCore/{include => Public}/GrowingDynamicProxy.h (100%) rename GrowingTrackerCore/{include => Public}/GrowingEncryptionService.h (100%) rename GrowingTrackerCore/{include => Public}/GrowingEventDatabaseService.h (100%) rename GrowingTrackerCore/{include => Public}/GrowingEventFilter.h (100%) rename GrowingTrackerCore/{include => Public}/GrowingEventNetworkService.h (100%) rename GrowingTrackerCore/{include => Public}/GrowingEventPersistenceProtocol.h (100%) rename GrowingTrackerCore/{include => Public}/GrowingFieldsIgnore.h (100%) rename GrowingTrackerCore/{include => Public}/GrowingFlutterService.h (100%) rename GrowingTrackerCore/{include => Public}/GrowingModuleManager.h (100%) rename GrowingTrackerCore/{include => Public}/GrowingModuleProtocol.h (100%) rename GrowingTrackerCore/{include => Public}/GrowingRequestProtocol.h (100%) rename GrowingTrackerCore/{include => Public}/GrowingScreenshotService.h (100%) rename GrowingTrackerCore/{include => Public}/GrowingServiceManager.h (100%) rename GrowingTrackerCore/{include => Public}/GrowingTrackConfiguration.h (100%) rename GrowingTrackerCore/{include => Public}/GrowingWebSocketService.h (100%) rename SwiftPM-Wrap/{GrowingResources-Wrapper => GrowingPrivacy-Wrapper}/Resources/PrivacyInfo.xcprivacy (100%) rename SwiftPM-Wrap/{GrowingResources-Wrapper => GrowingPrivacy-Wrapper}/dummy.m (100%) rename SwiftPM-Wrap/{GrowingResources-Wrapper => GrowingPrivacy-Wrapper}/include/dummy.h (100%) rename SwiftPM-Wrap/{GrowingResources-macOS-Wrapper => GrowingPrivacy-macOS-Wrapper}/Resources/PrivacyInfo.xcprivacy (100%) rename SwiftPM-Wrap/{GrowingResources-macOS-Wrapper => GrowingPrivacy-macOS-Wrapper}/dummy.m (100%) rename SwiftPM-Wrap/{GrowingResources-macOS-Wrapper => GrowingPrivacy-macOS-Wrapper}/include/dummy.h (100%) diff --git a/GrowingTrackerCore/Core/GrowingAnnotationCore.m b/GrowingTrackerCore/Core/GrowingAnnotationCore.m index b78d70b76..6782e3fc8 100644 --- a/GrowingTrackerCore/Core/GrowingAnnotationCore.m +++ b/GrowingTrackerCore/Core/GrowingAnnotationCore.m @@ -17,7 +17,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "GrowingTrackerCore/include/GrowingAnnotationCore.h" +#import "GrowingTrackerCore/Public/GrowingAnnotationCore.h" #include #include #include diff --git a/GrowingTrackerCore/Core/GrowingModuleManager.m b/GrowingTrackerCore/Core/GrowingModuleManager.m index e9196559a..123f89c67 100644 --- a/GrowingTrackerCore/Core/GrowingModuleManager.m +++ b/GrowingTrackerCore/Core/GrowingModuleManager.m @@ -17,13 +17,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "GrowingTrackerCore/include/GrowingModuleManager.h" +#import "GrowingTrackerCore/Public/GrowingModuleManager.h" #import #import #import "GrowingTrackerCore/Core/GrowingContext.h" #import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogger.h" -#import "GrowingTrackerCore/include/GrowingAnnotationCore.h" -#import "GrowingTrackerCore/include/GrowingModuleProtocol.h" +#import "GrowingTrackerCore/Public/GrowingAnnotationCore.h" +#import "GrowingTrackerCore/Public/GrowingModuleProtocol.h" static NSString *kInitSelector = @"growingModInit:"; static NSString *kSetDataCollectionEnabledSelector = @"growingModSetDataCollectionEnabled:"; diff --git a/GrowingTrackerCore/Core/GrowingServiceManager.m b/GrowingTrackerCore/Core/GrowingServiceManager.m index e85063b6c..d1a483243 100644 --- a/GrowingTrackerCore/Core/GrowingServiceManager.m +++ b/GrowingTrackerCore/Core/GrowingServiceManager.m @@ -17,11 +17,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "GrowingTrackerCore/include/GrowingServiceManager.h" +#import "GrowingTrackerCore/Public/GrowingServiceManager.h" #import #import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogger.h" -#import "GrowingTrackerCore/include/GrowingAnnotationCore.h" -#import "GrowingTrackerCore/include/GrowingBaseService.h" +#import "GrowingTrackerCore/Public/GrowingAnnotationCore.h" +#import "GrowingTrackerCore/Public/GrowingBaseService.h" @interface GrowingServiceManager () diff --git a/GrowingTrackerCore/Database/GrowingEventDatabase.m b/GrowingTrackerCore/Database/GrowingEventDatabase.m index cee6d2660..f8b37ceba 100644 --- a/GrowingTrackerCore/Database/GrowingEventDatabase.m +++ b/GrowingTrackerCore/Database/GrowingEventDatabase.m @@ -20,7 +20,7 @@ #import "GrowingTrackerCore/Database/GrowingEventDatabase.h" #import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogger.h" #import "GrowingTrackerCore/Utils/GrowingInternalMacros.h" -#import "GrowingTrackerCore/include/GrowingServiceManager.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/GrowingAttributesBuilder.m b/GrowingTrackerCore/Event/Base/GrowingAttributesBuilder.m index d326f4357..2ea050d6a 100644 --- a/GrowingTrackerCore/Event/Base/GrowingAttributesBuilder.m +++ b/GrowingTrackerCore/Event/Base/GrowingAttributesBuilder.m @@ -17,7 +17,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "GrowingTrackerCore/include/GrowingAttributesBuilder.h" +#import "GrowingTrackerCore/Public/GrowingAttributesBuilder.h" #import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogger.h" @interface GrowingAttributesBuilder () diff --git a/GrowingTrackerCore/Event/Base/GrowingBaseEvent.m b/GrowingTrackerCore/Event/Base/GrowingBaseEvent.m index a7ec874f1..d09f7aa5a 100644 --- a/GrowingTrackerCore/Event/Base/GrowingBaseEvent.m +++ b/GrowingTrackerCore/Event/Base/GrowingBaseEvent.m @@ -17,14 +17,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "GrowingTrackerCore/include/GrowingBaseEvent.h" +#import "GrowingTrackerCore/Public/GrowingBaseEvent.h" #import "GrowingTrackerCore/Event/Tools/GrowingPersistenceDataProvider.h" #import "GrowingTrackerCore/GrowingRealTracker.h" #import "GrowingTrackerCore/Manager/GrowingConfigurationManager.h" #import "GrowingTrackerCore/Manager/GrowingSession.h" #import "GrowingTrackerCore/Network/GrowingNetworkInterfaceManager.h" #import "GrowingTrackerCore/Utils/GrowingDeviceInfo.h" -#import "GrowingTrackerCore/include/GrowingFieldsIgnore.h" +#import "GrowingTrackerCore/Public/GrowingFieldsIgnore.h" #import "GrowingULTimeUtil.h" @implementation GrowingBaseEvent diff --git a/GrowingTrackerCore/Event/GrowingEventFilter.m b/GrowingTrackerCore/Event/GrowingEventFilter.m index 94d200ce9..bbbe7d5e0 100644 --- a/GrowingTrackerCore/Event/GrowingEventFilter.m +++ b/GrowingTrackerCore/Event/GrowingEventFilter.m @@ -17,7 +17,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "GrowingTrackerCore/include/GrowingEventFilter.h" +#import "GrowingTrackerCore/Public/GrowingEventFilter.h" #import "GrowingTrackerCore/Manager/GrowingConfigurationManager.h" NSUInteger const GrowingFilterClickChange = (GrowingFilterEventViewClick | GrowingFilterEventViewChange); diff --git a/GrowingTrackerCore/Event/GrowingEventManager.m b/GrowingTrackerCore/Event/GrowingEventManager.m index 587bcd11e..72dd56daf 100644 --- a/GrowingTrackerCore/Event/GrowingEventManager.m +++ b/GrowingTrackerCore/Event/GrowingEventManager.m @@ -29,11 +29,11 @@ #import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogger.h" #import "GrowingTrackerCore/Thread/GrowingDispatchManager.h" #import "GrowingTrackerCore/Utils/GrowingDeviceInfo.h" -#import "GrowingTrackerCore/include/GrowingBaseEvent.h" -#import "GrowingTrackerCore/include/GrowingEventFilter.h" -#import "GrowingTrackerCore/include/GrowingEventNetworkService.h" -#import "GrowingTrackerCore/include/GrowingServiceManager.h" -#import "GrowingTrackerCore/include/GrowingTrackConfiguration.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" 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/Event/GrowingFieldsIgnore.m b/GrowingTrackerCore/Event/GrowingFieldsIgnore.m index d06915a70..6154f9c68 100644 --- a/GrowingTrackerCore/Event/GrowingFieldsIgnore.m +++ b/GrowingTrackerCore/Event/GrowingFieldsIgnore.m @@ -17,7 +17,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "GrowingTrackerCore/include/GrowingFieldsIgnore.h" +#import "GrowingTrackerCore/Public/GrowingFieldsIgnore.h" #import "GrowingTrackerCore/Manager/GrowingConfigurationManager.h" // 忽略当前所有可设置的属性掩码值 diff --git a/GrowingTrackerCore/FileStorage/GrowingFileStorage.m b/GrowingTrackerCore/FileStorage/GrowingFileStorage.m index c8a9caf74..91857734d 100644 --- a/GrowingTrackerCore/FileStorage/GrowingFileStorage.m +++ b/GrowingTrackerCore/FileStorage/GrowingFileStorage.m @@ -21,7 +21,7 @@ #import "GrowingTrackerCore/Helpers/GrowingHelpers.h" #import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogger.h" #import "GrowingTrackerCore/Utils/GrowingDeviceInfo.h" -#import "GrowingTrackerCore/include/GrowingServiceManager.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 cc806457b..ebc37d415 100644 --- a/GrowingTrackerCore/GrowingRealTracker.m +++ b/GrowingTrackerCore/GrowingRealTracker.m @@ -32,10 +32,10 @@ #import "GrowingTrackerCore/Timer/GrowingEventTimer.h" #import "GrowingTrackerCore/Utils/GrowingArgumentChecker.h" #import "GrowingTrackerCore/Utils/GrowingDeviceInfo.h" -#import "GrowingTrackerCore/include/GrowingAttributesBuilder.h" -#import "GrowingTrackerCore/include/GrowingModuleManager.h" -#import "GrowingTrackerCore/include/GrowingServiceManager.h" -#import "GrowingTrackerCore/include/GrowingTrackConfiguration.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/GrowingTrackConfiguration.m b/GrowingTrackerCore/GrowingTrackConfiguration.m index e0461f8ea..264effafc 100644 --- a/GrowingTrackerCore/GrowingTrackConfiguration.m +++ b/GrowingTrackerCore/GrowingTrackConfiguration.m @@ -17,7 +17,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "GrowingTrackerCore/include/GrowingTrackConfiguration.h" +#import "GrowingTrackerCore/Public/GrowingTrackConfiguration.h" #import "GrowingTrackerCore/Manager/GrowingSession.h" NSString *const kGrowingDefaultDataCollectionServerHost = @"https://napi.growingio.com"; diff --git a/GrowingTrackerCore/Helpers/Foundation/NSData+GrowingHelper.m b/GrowingTrackerCore/Helpers/Foundation/NSData+GrowingHelper.m index de4fb970b..4310cc77f 100644 --- a/GrowingTrackerCore/Helpers/Foundation/NSData+GrowingHelper.m +++ b/GrowingTrackerCore/Helpers/Foundation/NSData+GrowingHelper.m @@ -20,9 +20,9 @@ #import "GrowingTrackerCore/Helpers/Foundation/NSData+GrowingHelper.h" #import "GrowingTrackerCore/Helpers/Foundation/NSString+GrowingHelper.h" #import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogger.h" -#import "GrowingTrackerCore/include/GrowingCompressService.h" -#import "GrowingTrackerCore/include/GrowingEncryptionService.h" -#import "GrowingTrackerCore/include/GrowingServiceManager.h" +#import "GrowingTrackerCore/Public/GrowingCompressService.h" +#import "GrowingTrackerCore/Public/GrowingEncryptionService.h" +#import "GrowingTrackerCore/Public/GrowingServiceManager.h" #import diff --git a/GrowingTrackerCore/Manager/GrowingConfigurationManager.m b/GrowingTrackerCore/Manager/GrowingConfigurationManager.m index 93be4987d..eb2dce0d7 100644 --- a/GrowingTrackerCore/Manager/GrowingConfigurationManager.m +++ b/GrowingTrackerCore/Manager/GrowingConfigurationManager.m @@ -18,7 +18,7 @@ // limitations under the License. #import "GrowingTrackerCore/Manager/GrowingConfigurationManager.h" -#import "GrowingTrackerCore/include/GrowingTrackConfiguration.h" +#import "GrowingTrackerCore/Public/GrowingTrackConfiguration.h" @implementation GrowingConfigurationManager diff --git a/GrowingTrackerCore/Manager/GrowingSession.m b/GrowingTrackerCore/Manager/GrowingSession.m index 8ad736d88..2dfad7f45 100644 --- a/GrowingTrackerCore/Manager/GrowingSession.m +++ b/GrowingTrackerCore/Manager/GrowingSession.m @@ -28,7 +28,7 @@ #import "GrowingTrackerCore/Thread/GrowingDispatchManager.h" #import "GrowingTrackerCore/Timer/GrowingEventTimer.h" #import "GrowingTrackerCore/Utils/GrowingInternalMacros.h" -#import "GrowingTrackerCore/include/GrowingTrackConfiguration.h" +#import "GrowingTrackerCore/Public/GrowingTrackConfiguration.h" #import "GrowingULAppLifecycle.h" #import "GrowingULTimeUtil.h" diff --git a/GrowingTrackerCore/include/GrowingAnnotationCore.h b/GrowingTrackerCore/Public/GrowingAnnotationCore.h similarity index 100% rename from GrowingTrackerCore/include/GrowingAnnotationCore.h rename to GrowingTrackerCore/Public/GrowingAnnotationCore.h diff --git a/GrowingTrackerCore/include/GrowingAttributesBuilder.h b/GrowingTrackerCore/Public/GrowingAttributesBuilder.h similarity index 100% rename from GrowingTrackerCore/include/GrowingAttributesBuilder.h rename to GrowingTrackerCore/Public/GrowingAttributesBuilder.h diff --git a/GrowingTrackerCore/include/GrowingBaseEvent.h b/GrowingTrackerCore/Public/GrowingBaseEvent.h similarity index 100% rename from GrowingTrackerCore/include/GrowingBaseEvent.h rename to GrowingTrackerCore/Public/GrowingBaseEvent.h diff --git a/GrowingTrackerCore/include/GrowingBaseService.h b/GrowingTrackerCore/Public/GrowingBaseService.h similarity index 100% rename from GrowingTrackerCore/include/GrowingBaseService.h rename to GrowingTrackerCore/Public/GrowingBaseService.h diff --git a/GrowingTrackerCore/include/GrowingCompressService.h b/GrowingTrackerCore/Public/GrowingCompressService.h similarity index 100% rename from GrowingTrackerCore/include/GrowingCompressService.h rename to GrowingTrackerCore/Public/GrowingCompressService.h diff --git a/GrowingTrackerCore/include/GrowingDynamicProxy.h b/GrowingTrackerCore/Public/GrowingDynamicProxy.h similarity index 100% rename from GrowingTrackerCore/include/GrowingDynamicProxy.h rename to GrowingTrackerCore/Public/GrowingDynamicProxy.h diff --git a/GrowingTrackerCore/include/GrowingEncryptionService.h b/GrowingTrackerCore/Public/GrowingEncryptionService.h similarity index 100% rename from GrowingTrackerCore/include/GrowingEncryptionService.h rename to GrowingTrackerCore/Public/GrowingEncryptionService.h diff --git a/GrowingTrackerCore/include/GrowingEventDatabaseService.h b/GrowingTrackerCore/Public/GrowingEventDatabaseService.h similarity index 100% rename from GrowingTrackerCore/include/GrowingEventDatabaseService.h rename to GrowingTrackerCore/Public/GrowingEventDatabaseService.h diff --git a/GrowingTrackerCore/include/GrowingEventFilter.h b/GrowingTrackerCore/Public/GrowingEventFilter.h similarity index 100% rename from GrowingTrackerCore/include/GrowingEventFilter.h rename to GrowingTrackerCore/Public/GrowingEventFilter.h diff --git a/GrowingTrackerCore/include/GrowingEventNetworkService.h b/GrowingTrackerCore/Public/GrowingEventNetworkService.h similarity index 100% rename from GrowingTrackerCore/include/GrowingEventNetworkService.h rename to GrowingTrackerCore/Public/GrowingEventNetworkService.h diff --git a/GrowingTrackerCore/include/GrowingEventPersistenceProtocol.h b/GrowingTrackerCore/Public/GrowingEventPersistenceProtocol.h similarity index 100% rename from GrowingTrackerCore/include/GrowingEventPersistenceProtocol.h rename to GrowingTrackerCore/Public/GrowingEventPersistenceProtocol.h diff --git a/GrowingTrackerCore/include/GrowingFieldsIgnore.h b/GrowingTrackerCore/Public/GrowingFieldsIgnore.h similarity index 100% rename from GrowingTrackerCore/include/GrowingFieldsIgnore.h rename to GrowingTrackerCore/Public/GrowingFieldsIgnore.h diff --git a/GrowingTrackerCore/include/GrowingFlutterService.h b/GrowingTrackerCore/Public/GrowingFlutterService.h similarity index 100% rename from GrowingTrackerCore/include/GrowingFlutterService.h rename to GrowingTrackerCore/Public/GrowingFlutterService.h diff --git a/GrowingTrackerCore/include/GrowingModuleManager.h b/GrowingTrackerCore/Public/GrowingModuleManager.h similarity index 100% rename from GrowingTrackerCore/include/GrowingModuleManager.h rename to GrowingTrackerCore/Public/GrowingModuleManager.h diff --git a/GrowingTrackerCore/include/GrowingModuleProtocol.h b/GrowingTrackerCore/Public/GrowingModuleProtocol.h similarity index 100% rename from GrowingTrackerCore/include/GrowingModuleProtocol.h rename to GrowingTrackerCore/Public/GrowingModuleProtocol.h diff --git a/GrowingTrackerCore/include/GrowingRequestProtocol.h b/GrowingTrackerCore/Public/GrowingRequestProtocol.h similarity index 100% rename from GrowingTrackerCore/include/GrowingRequestProtocol.h rename to GrowingTrackerCore/Public/GrowingRequestProtocol.h diff --git a/GrowingTrackerCore/include/GrowingScreenshotService.h b/GrowingTrackerCore/Public/GrowingScreenshotService.h similarity index 100% rename from GrowingTrackerCore/include/GrowingScreenshotService.h rename to GrowingTrackerCore/Public/GrowingScreenshotService.h diff --git a/GrowingTrackerCore/include/GrowingServiceManager.h b/GrowingTrackerCore/Public/GrowingServiceManager.h similarity index 100% rename from GrowingTrackerCore/include/GrowingServiceManager.h rename to GrowingTrackerCore/Public/GrowingServiceManager.h diff --git a/GrowingTrackerCore/include/GrowingTrackConfiguration.h b/GrowingTrackerCore/Public/GrowingTrackConfiguration.h similarity index 100% rename from GrowingTrackerCore/include/GrowingTrackConfiguration.h rename to GrowingTrackerCore/Public/GrowingTrackConfiguration.h diff --git a/GrowingTrackerCore/include/GrowingWebSocketService.h b/GrowingTrackerCore/Public/GrowingWebSocketService.h similarity index 100% rename from GrowingTrackerCore/include/GrowingWebSocketService.h rename to GrowingTrackerCore/Public/GrowingWebSocketService.h diff --git a/GrowingTrackerCore/Utils/GrowingDynamicProxy.m b/GrowingTrackerCore/Utils/GrowingDynamicProxy.m index 6ee8d6279..16cb90f97 100644 --- a/GrowingTrackerCore/Utils/GrowingDynamicProxy.m +++ b/GrowingTrackerCore/Utils/GrowingDynamicProxy.m @@ -17,7 +17,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "GrowingTrackerCore/include/GrowingDynamicProxy.h" +#import "GrowingTrackerCore/Public/GrowingDynamicProxy.h" #import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogMacros.h" #import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogger.h" diff --git a/Modules/Advert/GrowingAdvertising.m b/Modules/Advert/GrowingAdvertising.m index 795c06eb8..2edbfd9bb 100644 --- a/Modules/Advert/GrowingAdvertising.m +++ b/Modules/Advert/GrowingAdvertising.m @@ -35,8 +35,8 @@ #import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogger.h" #import "GrowingTrackerCore/Thread/GrowingDispatchManager.h" #import "GrowingTrackerCore/Utils/GrowingDeviceInfo.h" -#import "GrowingTrackerCore/include/GrowingEventNetworkService.h" -#import "GrowingTrackerCore/include/GrowingServiceManager.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 8bb7b87a8..b23354dab 100644 --- a/Modules/Flutter/GrowingFlutterPlugin.m +++ b/Modules/Flutter/GrowingFlutterPlugin.m @@ -22,7 +22,7 @@ #import "GrowingTrackerCore/Event/Autotrack/GrowingViewElementEvent.h" #import "GrowingTrackerCore/Event/GrowingEventManager.h" #import "GrowingTrackerCore/Thread/GrowingDispatchManager.h" -#import "GrowingTrackerCore/include/GrowingAttributesBuilder.h" +#import "GrowingTrackerCore/Public/GrowingAttributesBuilder.h" #import "GrowingULAppLifecycle.h" GrowingMod(GrowingFlutterPlugin) diff --git a/Modules/Hybrid/GrowingHybridBridgeProvider.m b/Modules/Hybrid/GrowingHybridBridgeProvider.m index bff89378c..4d043ee37 100644 --- a/Modules/Hybrid/GrowingHybridBridgeProvider.m +++ b/Modules/Hybrid/GrowingHybridBridgeProvider.m @@ -28,8 +28,8 @@ #import "GrowingTrackerCore/Manager/GrowingSession.h" #import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogger.h" #import "GrowingTrackerCore/Utils/GrowingDeviceInfo.h" -#import "GrowingTrackerCore/include/GrowingAnnotationCore.h" -#import "GrowingTrackerCore/include/GrowingBaseEvent.h" +#import "GrowingTrackerCore/Public/GrowingAnnotationCore.h" +#import "GrowingTrackerCore/Public/GrowingBaseEvent.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 88e9a7d44..8a0a4c16c 100644 --- a/Modules/Hybrid/GrowingWKWebViewJavascriptBridge.m +++ b/Modules/Hybrid/GrowingWKWebViewJavascriptBridge.m @@ -27,7 +27,7 @@ #import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogMacros.h" #import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogger.h" #import "GrowingTrackerCore/Utils/GrowingDeviceInfo.h" -#import "GrowingTrackerCore/include/GrowingTrackConfiguration.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 fb51d42d8..a9a8fb763 100644 --- a/Modules/MobileDebugger/GrowingMobileDebugger.m +++ b/Modules/MobileDebugger/GrowingMobileDebugger.m @@ -31,10 +31,10 @@ #import "GrowingTrackerCore/Thread/GrowingDispatchManager.h" #import "GrowingTrackerCore/Utils/GrowingDeviceInfo.h" #import "GrowingTrackerCore/Utils/GrowingInternalMacros.h" -#import "GrowingTrackerCore/include/GrowingAnnotationCore.h" -#import "GrowingTrackerCore/include/GrowingScreenshotService.h" -#import "GrowingTrackerCore/include/GrowingServiceManager.h" -#import "GrowingTrackerCore/include/GrowingWebSocketService.h" +#import "GrowingTrackerCore/Public/GrowingAnnotationCore.h" +#import "GrowingTrackerCore/Public/GrowingScreenshotService.h" +#import "GrowingTrackerCore/Public/GrowingServiceManager.h" +#import "GrowingTrackerCore/Public/GrowingWebSocketService.h" #import "GrowingULTimeUtil.h" #import "Modules/MobileDebugger/GrowingDebuggerEventQueue.h" diff --git a/Modules/WebCircle/GrowingWebCircle.m b/Modules/WebCircle/GrowingWebCircle.m index 9c859e4d0..8904d0d44 100644 --- a/Modules/WebCircle/GrowingWebCircle.m +++ b/Modules/WebCircle/GrowingWebCircle.m @@ -37,10 +37,10 @@ #import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogger.h" #import "GrowingTrackerCore/Thread/GrowingDispatchManager.h" #import "GrowingTrackerCore/Utils/GrowingDeviceInfo.h" -#import "GrowingTrackerCore/include/GrowingFlutterService.h" -#import "GrowingTrackerCore/include/GrowingScreenshotService.h" -#import "GrowingTrackerCore/include/GrowingServiceManager.h" -#import "GrowingTrackerCore/include/GrowingWebSocketService.h" +#import "GrowingTrackerCore/Public/GrowingFlutterService.h" +#import "GrowingTrackerCore/Public/GrowingScreenshotService.h" +#import "GrowingTrackerCore/Public/GrowingServiceManager.h" +#import "GrowingTrackerCore/Public/GrowingWebSocketService.h" #import "Modules/WebCircle/GrowingWebCircleElement.h" #import "Modules/WebCircle/GrowingWebCircleStatusView.h" diff --git a/Package.swift b/Package.swift index 108d88421..8042a6cae 100644 --- a/Package.swift +++ b/Package.swift @@ -58,6 +58,10 @@ let package = Package( .autotracker, .tracker, + // MARK: - Resources + .Resources.privacy, + .Resources.privacy_macos, + // MARK: - Core .Core.trackerCore, @@ -130,6 +134,16 @@ extension Target { publicHeadersPath: ".", cSettings: [.hspFor(.Path.tracker_objc)]) + enum Resources { + static let privacy = target(name: .privacy, + path: .Path.privacy, + resources: [.copy("Resources/PrivacyInfo.xcprivacy")]) + + static let privacy_macos = target(name: .privacy_macos, + path: .Path.privacy_macos, + resources: [.copy("Resources/PrivacyInfo.xcprivacy")]) + } + enum Core { static let autotrackerCore = target(name: .autotrackerCore, dependencies: [ @@ -141,9 +155,13 @@ extension Target { cSettings: [.hspFor(.Path.autotrackerCore)]) static let trackerCore = target(name: .trackerCore, - dependencies: [.trackerUtils], + dependencies: [ + .trackerUtils, + .Resources.privacy, + .Resources.privacy_macos, + ], path: .Path.trackerCore, - resources: [.copy("Resources/PrivacyInfo.xcprivacy")], + publicHeadersPath: .Path.publicHeaders, cSettings: [.hspFor(.Path.trackerCore)], linkerSettings: [ .cPlusPlusLibrary, @@ -275,6 +293,11 @@ extension Target.Dependency { static let apm = product(name: "GrowingAPM", package: "growingio-sdk-ios-performance-ext") static let protobuf = product(name: "SwiftProtobuf", package: "swift-protobuf") + enum Resources { + static let privacy = byName(name: .privacy, condition: .when(platforms: [.iOS, .macCatalyst])) + static let privacy_macos = byName(name: .privacy_macos, condition: .when(platforms: [.macOS])) + } + enum Core { static let autotrackerCore = byName(name: .autotrackerCore, condition: .when(platforms: [.iOS, .macCatalyst])) static let trackerCore = byName(name: .trackerCore) @@ -319,6 +342,10 @@ extension String { static let autotracker_objc = "GrowingAutotracker_Objc" static let tracker_objc = "GrowingTracker_Objc" + // Resources + static let privacy = "GrowingPrivacy" + static let privacy_macos = "GrowingPrivacy_macOS" + // Core static let autotrackerCore = "GrowingAutotrackerCore" static let trackerCore = "GrowingTrackerCore" @@ -350,6 +377,10 @@ extension String { static let autotracker_objc = "GrowingAutotracker" static let tracker_objc = "GrowingTracker" + // Resources + static let privacy = "SwiftPM-Wrap/GrowingPrivacy-Wrapper" + static let privacy_macos = "SwiftPM-Wrap/GrowingPrivacy-macOS-Wrapper" + // Core static let autotrackerCore = "GrowingAutotrackerCore" static let trackerCore = "GrowingTrackerCore" diff --git a/Services/Database/GrowingEventFMDatabase.m b/Services/Database/GrowingEventFMDatabase.m index 8adc746a0..fceb7b6b8 100644 --- a/Services/Database/GrowingEventFMDatabase.m +++ b/Services/Database/GrowingEventFMDatabase.m @@ -19,7 +19,7 @@ #import "Services/Database/GrowingEventFMDatabase.h" #import "GrowingTrackerCore/FileStorage/GrowingFileStorage.h" -#import "GrowingTrackerCore/include/GrowingEventPersistenceProtocol.h" +#import "GrowingTrackerCore/Public/GrowingEventPersistenceProtocol.h" #import "GrowingULTimeUtil.h" #import "Services/Database/FMDB/GrowingFMDB.h" diff --git a/Services/Network/GrowingNetworkManager.m b/Services/Network/GrowingNetworkManager.m index 6b579b607..1a1dd58ed 100644 --- a/Services/Network/GrowingNetworkManager.m +++ b/Services/Network/GrowingNetworkManager.m @@ -19,7 +19,7 @@ #import "Services/Network/GrowingNetworkManager.h" #import "GrowingTrackerCore/Thirdparty/Logger/GrowingLogger.h" -#import "GrowingTrackerCore/include/GrowingAnnotationCore.h" +#import "GrowingTrackerCore/Public/GrowingAnnotationCore.h" #import "Services/Network/NSURLSession+GrowingURLSessionHelper.h" GrowingService(GrowingEventNetworkService, GrowingNetworkManager) diff --git a/SwiftPM-Wrap/GrowingResources-Wrapper/Resources/PrivacyInfo.xcprivacy b/SwiftPM-Wrap/GrowingPrivacy-Wrapper/Resources/PrivacyInfo.xcprivacy similarity index 100% rename from SwiftPM-Wrap/GrowingResources-Wrapper/Resources/PrivacyInfo.xcprivacy rename to SwiftPM-Wrap/GrowingPrivacy-Wrapper/Resources/PrivacyInfo.xcprivacy diff --git a/SwiftPM-Wrap/GrowingResources-Wrapper/dummy.m b/SwiftPM-Wrap/GrowingPrivacy-Wrapper/dummy.m similarity index 100% rename from SwiftPM-Wrap/GrowingResources-Wrapper/dummy.m rename to SwiftPM-Wrap/GrowingPrivacy-Wrapper/dummy.m diff --git a/SwiftPM-Wrap/GrowingResources-Wrapper/include/dummy.h b/SwiftPM-Wrap/GrowingPrivacy-Wrapper/include/dummy.h similarity index 100% rename from SwiftPM-Wrap/GrowingResources-Wrapper/include/dummy.h rename to SwiftPM-Wrap/GrowingPrivacy-Wrapper/include/dummy.h diff --git a/SwiftPM-Wrap/GrowingResources-macOS-Wrapper/Resources/PrivacyInfo.xcprivacy b/SwiftPM-Wrap/GrowingPrivacy-macOS-Wrapper/Resources/PrivacyInfo.xcprivacy similarity index 100% rename from SwiftPM-Wrap/GrowingResources-macOS-Wrapper/Resources/PrivacyInfo.xcprivacy rename to SwiftPM-Wrap/GrowingPrivacy-macOS-Wrapper/Resources/PrivacyInfo.xcprivacy diff --git a/SwiftPM-Wrap/GrowingResources-macOS-Wrapper/dummy.m b/SwiftPM-Wrap/GrowingPrivacy-macOS-Wrapper/dummy.m similarity index 100% rename from SwiftPM-Wrap/GrowingResources-macOS-Wrapper/dummy.m rename to SwiftPM-Wrap/GrowingPrivacy-macOS-Wrapper/dummy.m diff --git a/SwiftPM-Wrap/GrowingResources-macOS-Wrapper/include/dummy.h b/SwiftPM-Wrap/GrowingPrivacy-macOS-Wrapper/include/dummy.h similarity index 100% rename from SwiftPM-Wrap/GrowingResources-macOS-Wrapper/include/dummy.h rename to SwiftPM-Wrap/GrowingPrivacy-macOS-Wrapper/include/dummy.h