build: restructures Adjust project

adjust · Aug 2, 2024 · 192765f · 192765f
1 parent e49b5b9
commit 192765f
Show file tree

Hide file tree

Showing 143 changed files with 1,692 additions and 4,215 deletions.
diff --git a/Adjust.podspec b/Adjust.podspec
@@ -13,21 +13,22 @@ Pod::Spec.new do |s|
   s.ios.weak_framework      = 'AdSupport'
   s.tvos.weak_framework     = 'AdSupport'
   s.default_subspec         = 'Adjust'
-
-  s.subspec 'Core' do |co|
-    co.source_files = 'Adjust/**/*.{h,m}'
-    co.resource_bundle = {'Adjust' => ['Adjust/*.xcprivacy']}
-  end
+  s.module_map              = 'ModuleMap/module.modulemap'
 
   s.subspec 'Adjust' do |ads|
-    ads.dependency 'Adjust/Core'
+    ads.source_files = 'Adjust/**/*.{h,m}'
+    ads.public_header_files = 'Adjust/*.h', 'UmbrellaHeaders/sdk/*.h'
+    ads.resource_bundle = {'Adjust' => ['Adjust/*.xcprivacy']}
+    ads.header_dir = 'AdjustSdk'
     ads.dependency 'AdjustSignature', '3.18'
   end
 
   s.subspec 'AdjustWebBridge' do |wb|
-    wb.dependency 'Adjust/Core'
+    wb.source_files = 'Adjust/**/*.{h,m}', 'AdjustBridge/*.{h,m}', 'UmbrellaHeaders/webbridge/*.{h,m}'
+    wb.public_header_files = 'Adjust/*.h', 'AdjustBridge/*.h', 'UmbrellaHeaders/webbridge/*.h'
+    wb.resource_bundle = {'Adjust' => ['Adjust/*.xcprivacy']}
+    wb.header_dir = 'AdjustSdk'
     wb.dependency 'AdjustSignature', '3.18'
-    wb.source_files = 'AdjustBridge/*.{h,m}', 'AdjustBridge/WebViewJavascriptBridge/*.{h,m}'
     wb.ios.deployment_target = '12.0'
   end
 end
diff --git a/Adjust.xcodeproj/project.pbxproj b/Adjust.xcodeproj/project.pbxproj
diff --git a/Adjust/ADJConfig.h b/Adjust/ADJConfig.h
@@ -8,12 +8,13 @@
 
 #import <Foundation/Foundation.h>
 
-#import "ADJLogger.h"
-#import "ADJAttribution.h"
-#import "ADJEventSuccess.h"
-#import "ADJEventFailure.h"
-#import "ADJSessionSuccess.h"
-#import "ADJSessionFailure.h"
+@class ADJLogger;
+@class ADJAttribution;
+@class ADJEventSuccess;
+@class ADJEventFailure;
+@class ADJSessionSuccess;
+@class ADJSessionFailure;
+typedef NS_ENUM(NSUInteger, ADJLogLevel);
 
 #pragma mark - AdjustDelegate methods
 

diff --git a/Adjust/ADJConfig.m b/Adjust/ADJConfig.m
@@ -10,7 +10,6 @@
 #import "ADJAdjustFactory.h"
 #import "ADJLogger.h"
 #import "ADJUtil.h"
-#import "Adjust.h"
 
 @interface ADJConfig()
 

diff --git a/Adjust/ADJLogger.h b/Adjust/ADJLogger.h
@@ -7,15 +7,15 @@
 //
 #import <Foundation/Foundation.h>
 
-typedef enum {
+typedef NS_ENUM(NSUInteger, ADJLogLevel) {
     ADJLogLevelVerbose  = 1,
     ADJLogLevelDebug    = 2,
     ADJLogLevelInfo     = 3,
     ADJLogLevelWarn     = 4,
     ADJLogLevelError    = 5,
     ADJLogLevelAssert   = 6,
     ADJLogLevelSuppress = 7
-} ADJLogLevel;
+};
 
 /**
  * @brief Adjust logger protocol.

diff --git a/Adjust/Adjust.h b/Adjust/Adjust.h
@@ -7,15 +7,17 @@
 //  Copyright (c) 2012-2021 Adjust GmbH. All rights reserved.
 //
 
-#import "ADJEvent.h"
-#import "ADJConfig.h"
-#import "ADJAttribution.h"
-#import "ADJAppStoreSubscription.h"
-#import "ADJThirdPartySharing.h"
-#import "ADJAdRevenue.h"
-#import "ADJLinkResolution.h"
-#import "ADJAppStorePurchase.h"
-#import "ADJPurchaseVerificationResult.h"
+#import <Foundation/Foundation.h>
+
+@class ADJEvent;
+@class ADJConfig;
+@class ADJAttribution;
+@class ADJAppStoreSubscription;
+@class ADJThirdPartySharing;
+@class ADJAdRevenue;
+@class ADJLinkResolution;
+@class ADJAppStorePurchase;
+@class ADJPurchaseVerificationResult;
 
 typedef void(^ADJResolvedDeeplinkBlock)(NSString * _Nullable resolvedLink);
 typedef void(^ADJAttributionGetterBlock)(ADJAttribution * _Nullable attribution);

diff --git a/Adjust/Adjust.m b/Adjust/Adjust.m
@@ -13,6 +13,7 @@
 #import "ADJAdjustFactory.h"
 #import "ADJActivityHandler.h"
 #import "ADJSKAdNetwork.h"
+#import "ADJPurchaseVerificationResult.h"
 
 #if !__has_feature(objc_arc)
 #error Adjust requires ARC

diff --git a/Adjust/Internal/ADJActivityHandler.m b/Adjust/Internal/ADJActivityHandler.m
@@ -24,6 +24,8 @@
 #import "ADJUrlStrategy.h"
 #import "ADJSKAdNetwork.h"
 #import "ADJPurchaseVerificationHandler.h"
+#import "ADJPurchaseVerificationResult.h"
+#import "ADJAdRevenue.h"
 
 NSString * const ADJAdServicesPackageKey = @"apple_ads";
 

diff --git a/Adjust/Internal/ADJPackageBuilder.h b/Adjust/Internal/ADJPackageBuilder.h
@@ -5,14 +5,14 @@
 //  Created by Christian Wellenbrock (@wellle) on 3rd July 2013.
 //  Copyright (c) 2013-2018 Adjust GmbH. All rights reserved.
 //
+#import <Foundation/Foundation.h>
 
 #import "ADJEvent.h"
 #import "ADJConfig.h"
 #import "ADJPackageParams.h"
 #import "ADJActivityState.h"
 #import "ADJActivityPackage.h"
 #import "ADJGlobalParameters.h"
-#import <Foundation/Foundation.h>
 #import "ADJActivityHandler.h"
 #import "ADJThirdPartySharing.h"
 

diff --git a/Adjust/Internal/ADJPackageBuilder.m b/Adjust/Internal/ADJPackageBuilder.m
@@ -15,6 +15,9 @@
 #import "ADJActivityPackage.h"
 #import "ADJAdditions.h"
 #import "ADJUserDefaults.h"
+#import "ADJAdRevenue.h"
+#import "ADJAppStorePurchase.h"
+#import "ADJAppStoreSubscription.h"
 
 NSString * const ADJAttributionTokenParameter = @"attribution_token";
 

diff --git a/Adjust/Internal/ADJPurchaseVerificationHandler.m b/Adjust/Internal/ADJPurchaseVerificationHandler.m
@@ -13,6 +13,7 @@
 #import "ADJBackoffStrategy.h"
 #import "ADJUserDefaults.h"
 #import "ADJPackageBuilder.h"
+#import "ADJPurchaseVerificationResult.h"
 
 static const char * const kInternalQueueName = "com.adjust.PurchaseVerificationQueue";
 

diff --git a/Adjust/Internal/ADJUrlStrategy.m b/Adjust/Internal/ADJUrlStrategy.m
@@ -7,7 +7,6 @@
 //
 
 #import "ADJUrlStrategy.h"
-#import "Adjust.h"
 #import "ADJAdjustFactory.h"
 
 static NSString * const kBaseAnalyticsUrl = @"https://analytics.adjust.com";

diff --git a/Adjust/Internal/ADJUtil.m b/Adjust/Internal/ADJUtil.m
@@ -24,10 +24,6 @@
 #import "ADJAdjustFactory.h"
 #import "ADJAdditions.h"
 
-#if !ADJUST_NO_IDFA
-#import <AdSupport/ASIdentifierManager.h>
-#endif
-
 static NSRegularExpression *universalLinkRegex = nil;
 static NSNumberFormatter *secondsNumberFormatter = nil;
 static NSRegularExpression *optionalRedirectRegex = nil;

diff --git a/Adjust/include/ADJAdRevenue.h b/Adjust/include/ADJAdRevenue.h
diff --git a/Adjust/include/ADJAppStorePurchase.h b/Adjust/include/ADJAppStorePurchase.h
diff --git a/Adjust/include/ADJAppStoreSubscription.h b/Adjust/include/ADJAppStoreSubscription.h
diff --git a/Adjust/include/ADJAttribution.h b/Adjust/include/ADJAttribution.h
diff --git a/Adjust/include/ADJConfig.h b/Adjust/include/ADJConfig.h
diff --git a/Adjust/include/ADJEvent.h b/Adjust/include/ADJEvent.h
diff --git a/Adjust/include/ADJEventFailure.h b/Adjust/include/ADJEventFailure.h
diff --git a/Adjust/include/ADJEventSuccess.h b/Adjust/include/ADJEventSuccess.h
diff --git a/Adjust/include/ADJLinkResolution.h b/Adjust/include/ADJLinkResolution.h
diff --git a/Adjust/include/ADJLogger.h b/Adjust/include/ADJLogger.h
diff --git a/Adjust/include/ADJPurchaseVerificationResult.h b/Adjust/include/ADJPurchaseVerificationResult.h
diff --git a/Adjust/include/ADJSessionFailure.h b/Adjust/include/ADJSessionFailure.h
diff --git a/Adjust/include/ADJSessionSuccess.h b/Adjust/include/ADJSessionSuccess.h
diff --git a/Adjust/include/ADJThirdPartySharing.h b/Adjust/include/ADJThirdPartySharing.h
diff --git a/Adjust/include/Adjust.h b/Adjust/include/Adjust.h
diff --git a/Adjust/include/AdjustSdk/ADJAdRevenue.h b/Adjust/include/AdjustSdk/ADJAdRevenue.h
@@ -0,0 +1 @@
+../../ADJAdRevenue.h
diff --git a/Adjust/include/AdjustSdk/ADJAppStorePurchase.h b/Adjust/include/AdjustSdk/ADJAppStorePurchase.h
@@ -0,0 +1 @@
+../../ADJAppStorePurchase.h
diff --git a/Adjust/include/AdjustSdk/ADJAppStoreSubscription.h b/Adjust/include/AdjustSdk/ADJAppStoreSubscription.h
@@ -0,0 +1 @@
+../../ADJAppStoreSubscription.h
diff --git a/Adjust/include/AdjustSdk/ADJAttribution.h b/Adjust/include/AdjustSdk/ADJAttribution.h
@@ -0,0 +1 @@
+../../ADJAttribution.h
diff --git a/Adjust/include/AdjustSdk/ADJConfig.h b/Adjust/include/AdjustSdk/ADJConfig.h
@@ -0,0 +1 @@
+../../ADJConfig.h
diff --git a/Adjust/include/AdjustSdk/ADJEvent.h b/Adjust/include/AdjustSdk/ADJEvent.h
@@ -0,0 +1 @@
+../../ADJEvent.h
diff --git a/Adjust/include/AdjustSdk/ADJEventFailure.h b/Adjust/include/AdjustSdk/ADJEventFailure.h
@@ -0,0 +1 @@
+../../ADJEventFailure.h
diff --git a/Adjust/include/AdjustSdk/ADJEventSuccess.h b/Adjust/include/AdjustSdk/ADJEventSuccess.h
@@ -0,0 +1 @@
+../../ADJEventSuccess.h
diff --git a/Adjust/include/AdjustSdk/ADJLinkResolution.h b/Adjust/include/AdjustSdk/ADJLinkResolution.h
@@ -0,0 +1 @@
+../../ADJLinkResolution.h
diff --git a/Adjust/include/AdjustSdk/ADJLogger.h b/Adjust/include/AdjustSdk/ADJLogger.h
@@ -0,0 +1 @@
+../../ADJLogger.h
diff --git a/Adjust/include/AdjustSdk/ADJPurchaseVerificationResult.h b/Adjust/include/AdjustSdk/ADJPurchaseVerificationResult.h
@@ -0,0 +1 @@
+../../ADJPurchaseVerificationResult.h
diff --git a/Adjust/include/AdjustSdk/ADJSessionFailure.h b/Adjust/include/AdjustSdk/ADJSessionFailure.h
@@ -0,0 +1 @@
+../../ADJSessionFailure.h
diff --git a/Adjust/include/AdjustSdk/ADJSessionSuccess.h b/Adjust/include/AdjustSdk/ADJSessionSuccess.h
@@ -0,0 +1 @@
+../../ADJSessionSuccess.h
diff --git a/Adjust/include/AdjustSdk/ADJThirdPartySharing.h b/Adjust/include/AdjustSdk/ADJThirdPartySharing.h
@@ -0,0 +1 @@
+../../ADJThirdPartySharing.h
diff --git a/Adjust/include/AdjustSdk/Adjust.h b/Adjust/include/AdjustSdk/Adjust.h
@@ -0,0 +1 @@
+../../Adjust.h
diff --git a/Adjust/include/AdjustSdk/AdjustSdk.h b/Adjust/include/AdjustSdk/AdjustSdk.h
@@ -0,0 +1 @@
+../../../UmbrellaHeaders/sdk/AdjustSdk.h
diff --git a/AdjustBridge/AdjustBridge.h b/AdjustBridge/AdjustBridge.h
@@ -6,10 +6,11 @@
 //  Copyright © 2016-2018 Adjust GmbH. All rights reserved.
 //
 
+#import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 #import <WebKit/WebKit.h>
-#import <Foundation/Foundation.h>
-#import "AdjustBridgeRegister.h"
+
+@class AdjustBridgeRegister;
 
 @interface AdjustBridge : NSObject
 

diff --git a/AdjustBridge/AdjustBridge.m b/AdjustBridge/AdjustBridge.m
@@ -6,9 +6,9 @@
 //  Copyright © 2016-2018 Adjust GmbH. All rights reserved.
 //
 
-#import "Adjust.h"
 #import "AdjustBridge.h"
-#import "ADJAdjustFactory.h"
+#import <AdjustSdk/AdjustSdk.h>
+#import "AdjustBridgeRegister.h"
 #import "WKWebViewJavascriptBridge.h"
 
 @interface AdjustBridge() <AdjustDelegate>
@@ -25,6 +25,7 @@ @interface AdjustBridge() <AdjustDelegate>
 @property (nonatomic, strong) NSMutableDictionary *fbPixelMapping;
 @property (nonatomic, strong) NSMutableArray *urlStrategyDomains;
 @property (nonatomic, strong) ADJAttribution *attribution;
+@property (nonatomic, strong) ADJLogger *logger;
 
 @end
 
@@ -40,6 +41,7 @@ - (id)init {
 
     _bridgeRegister = nil;
     self.isDeferredDeeplinkOpeningEnabled = YES;
+    _logger = [[ADJLogger alloc] init];
 
     [self resetAdjustBridge];
 
@@ -174,7 +176,7 @@ - (void)augmentHybridWebView {
     NSString *fbAppId = [self getFbAppId];
 
     if (fbAppId == nil) {
-        [[ADJAdjustFactory logger] error:@"FacebookAppID is not correctly configured in the pList"];
+        [self.logger error:@"FacebookAppID is not correctly configured in the pList"];
         return;
     }
     [_bridgeRegister augmentHybridWebView:fbAppId];
@@ -674,17 +676,17 @@ - (void)registerAugmentedView {
     [self.bridgeRegister registerHandler:@"adjust_fbPixelEvent" handler:^(id data, WVJBResponseCallback responseCallback) {
         NSString *pixelID = [data objectForKey:@"pixelID"];
         if (pixelID == nil) {
-            [[ADJAdjustFactory logger] error:@"Can't bridge an event without a referral Pixel ID. Check your webview Pixel configuration"];
+            [self.logger error:@"Can't bridge an event without a referral Pixel ID. Check your webview Pixel configuration"];
             return;
         }
         NSString *evtName = [data objectForKey:@"evtName"];
         NSString *eventToken = [self getEventTokenFromFbPixelEventName:evtName];
         if (eventToken == nil) {
-            [[ADJAdjustFactory logger] debug:@"No mapping found for the fb pixel event %@, trying to fall back to the default event token", evtName];
+            [self.logger debug:@"No mapping found for the fb pixel event %@, trying to fall back to the default event token", evtName];
             eventToken = self.fbPixelDefaultEventToken;
         }
         if (eventToken == nil) {
-            [[ADJAdjustFactory logger] debug:@"There is not a default event token configured or a mapping found for event named: '%@'. It won't be tracked as an adjust event", evtName];
+            [self.logger  debug:@"There is not a default event token configured or a mapping found for event named: '%@'. It won't be tracked as an adjust event", evtName];
             return;
         }
 

diff --git a/AdjustBridge/AdjustBridgeRegister.h b/AdjustBridge/AdjustBridgeRegister.h
@@ -7,7 +7,8 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "WKWebViewJavascriptBridge.h"
+#import <WebKit/WebKit.h>
+#import "WebViewJavascriptBridgeBase.h"
 
 @interface AdjustBridgeRegister : NSObject
 

diff --git a/AdjustBridge/AdjustBridgeRegister.m b/AdjustBridge/AdjustBridgeRegister.m
@@ -7,6 +7,7 @@
 //
 
 #import "AdjustBridgeRegister.h"
+#import "WKWebViewJavascriptBridge.h"
 
 static NSString * const kHandlerPrefix = @"adjust_";
 static NSString * fbAppIdStatic = nil;

diff --git a/...ascriptBridge/WKWebViewJavascriptBridge.h → AdjustBridge/WKWebViewJavascriptBridge.h b/...ascriptBridge/WKWebViewJavascriptBridge.h → AdjustBridge/WKWebViewJavascriptBridge.h
diff --git a/...ascriptBridge/WKWebViewJavascriptBridge.m → AdjustBridge/WKWebViewJavascriptBridge.m b/...ascriptBridge/WKWebViewJavascriptBridge.m → AdjustBridge/WKWebViewJavascriptBridge.m
diff --git a/...criptBridge/WebViewJavascriptBridgeBase.h → AdjustBridge/WebViewJavascriptBridgeBase.h b/...criptBridge/WebViewJavascriptBridgeBase.h → AdjustBridge/WebViewJavascriptBridgeBase.h
diff --git a/...criptBridge/WebViewJavascriptBridgeBase.m → AdjustBridge/WebViewJavascriptBridgeBase.m b/...criptBridge/WebViewJavascriptBridgeBase.m → AdjustBridge/WebViewJavascriptBridgeBase.m
@@ -8,7 +8,6 @@
 #import <Foundation/Foundation.h>
 #import "WebViewJavascriptBridgeBase.h"
 #import "WebViewJavascriptBridge_JS.h"
-//#import "AdjustBridge_JS.h"
 #import "AdjustBridgeRegister.h"
 
 @implementation WebViewJavascriptBridgeBase {

diff --git a/...scriptBridge/WebViewJavascriptBridge_JS.h → AdjustBridge/WebViewJavascriptBridge_JS.h b/...scriptBridge/WebViewJavascriptBridge_JS.h → AdjustBridge/WebViewJavascriptBridge_JS.h
diff --git a/...scriptBridge/WebViewJavascriptBridge_JS.m → AdjustBridge/WebViewJavascriptBridge_JS.m b/...scriptBridge/WebViewJavascriptBridge_JS.m → AdjustBridge/WebViewJavascriptBridge_JS.m
@@ -10,7 +10,7 @@
 
 #import "WebViewJavascriptBridge_JS.h"
 
-NSString * WebViewJavascriptBridge_js() {
+NSString * WebViewJavascriptBridge_js(void) {
 	#define __wvjb_js_func__(x) #x
 
 	// BEGIN preprocessorJSCode

diff --git a/AdjustBridge/include/AdjustBridge.h b/AdjustBridge/include/AdjustBridge.h
diff --git a/AdjustBridge/include/AdjustBridgeRegister.h b/AdjustBridge/include/AdjustBridgeRegister.h
diff --git a/AdjustBridge/include/AdjustWebBridge/AdjustBridge.h b/AdjustBridge/include/AdjustWebBridge/AdjustBridge.h
@@ -0,0 +1 @@
+../../AdjustBridge.h
diff --git a/AdjustBridge/include/AdjustWebBridge/AdjustBridgeRegister.h b/AdjustBridge/include/AdjustWebBridge/AdjustBridgeRegister.h
@@ -0,0 +1 @@
+../../AdjustBridgeRegister.h
diff --git a/AdjustBridge/include/AdjustWebBridge/WKWebViewJavascriptBridge.h b/AdjustBridge/include/AdjustWebBridge/WKWebViewJavascriptBridge.h
@@ -0,0 +1 @@
+../../WKWebViewJavascriptBridge.h
diff --git a/AdjustBridge/include/AdjustWebBridge/WebViewJavascriptBridgeBase.h b/AdjustBridge/include/AdjustWebBridge/WebViewJavascriptBridgeBase.h
@@ -0,0 +1 @@
+../../WebViewJavascriptBridgeBase.h
diff --git a/AdjustBridge/include/WKWebViewJavascriptBridge.h b/AdjustBridge/include/WKWebViewJavascriptBridge.h
diff --git a/AdjustBridge/include/WebViewJavascriptBridgeBase.h b/AdjustBridge/include/WebViewJavascriptBridgeBase.h