Skip to content

Commit fbe9536

Browse files
authored
Merge pull request #776 from adjust/v546
Version 5.4.6
2 parents 517f44c + 8b10afd commit fbe9536

File tree

24 files changed

+60
-33
lines changed

24 files changed

+60
-33
lines changed

Adjust.podspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22
s.name = "Adjust"
33
s.module_name = "AdjustSdk"
4-
s.version = "5.4.5"
4+
s.version = "5.4.6"
55
s.summary = "This is the iOS SDK of Adjust. You can read more about it at https://adjust.com."
66
s.homepage = "https://github.com/adjust/ios_sdk"
77
s.license = { :type => 'MIT', :file => 'LICENSE' }
@@ -20,7 +20,7 @@ Pod::Spec.new do |s|
2020
adj.exclude_files = 'Adjust/include/**/*.h'
2121
adj.resource_bundle = {'Adjust' => ['Adjust/*.xcprivacy']}
2222
adj.header_dir = 'AdjustSdk'
23-
adj.dependency 'AdjustSignature', '3.47.0'
23+
adj.dependency 'AdjustSignature', '3.61.0'
2424
end
2525

2626
s.subspec 'AdjustWebBridge' do |awb|
@@ -30,7 +30,7 @@ Pod::Spec.new do |s|
3030
awb.resource_bundle = {'Adjust' => ['Adjust/*.xcprivacy']}
3131
awb.header_dir = 'AdjustSdk'
3232
awb.ios.deployment_target = '12.0'
33-
awb.dependency 'AdjustSignature', '3.47.0'
33+
awb.dependency 'AdjustSignature', '3.61.0'
3434
end
3535

3636
s.subspec 'AdjustGoogleOdm' do |odm|

Adjust/ADJLinkResolution.m

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@
1010

1111
static NSUInteger kMaxRecursions = 10;
1212

13+
@interface ADJLinkResolution (Private)
14+
15+
+ (BOOL)isTerminalUrlWithHost:(nullable NSString *)urlHost;
16+
17+
@end
18+
1319
@interface ADJLinkResolutionDelegate : NSObject<NSURLSessionTaskDelegate>
1420

1521
+ (nonnull ADJLinkResolutionDelegate *)sharedInstance;
@@ -40,6 +46,13 @@ - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task
4046
newRequest:(NSURLRequest *)request
4147
completionHandler:(void (^)(NSURLRequest * _Nullable))completionHandler
4248
{
49+
// if we're already at a terminal host (adjust.com / adj.st / go.link),
50+
// stop auto-following to preserve the terminal URL (avoid jumping to App Store links)
51+
if ([ADJLinkResolution isTerminalUrlWithHost:response.URL.host]) {
52+
completionHandler(nil);
53+
return;
54+
}
55+
4356
NSURL *_Nullable convertedUrl = [ADJLinkResolutionDelegate convertUrlToHttps:request.URL];
4457

4558
if (request.URL != nil && convertedUrl != nil && ! [request.URL isEqual:convertedUrl]) {
@@ -177,7 +190,7 @@ + (BOOL)isTerminalUrlWithHost:(nullable NSString *)urlHost {
177190
}
178191

179192
NSArray<NSString *> *_Nonnull terminalUrlHostSuffixArray =
180-
@[@"adjust.com", @"adj.st", @"go.link"];
193+
@[@"adjust.com", @"adj.st", @"go.link", @"adjust.cn", @"adjust.net.in", @"adjust.world", @"adjust.io"];
181194

182195
return [ADJLinkResolution urlMatchesSuffixWithHost:urlHost
183196
suffixArray:terminalUrlHostSuffixArray];

Adjust/Adjust.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Adjust.h
33
// Adjust SDK
44
//
5-
// V5.4.5
5+
// V5.4.6
66
// Created by Christian Wellenbrock (@wellle) on 23rd July 2013.
77
// Copyright (c) 2012-Present Adjust GmbH. All rights reserved.
88
//

Adjust/Internal/ADJUtil.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
static NSRegularExpression *goLinkUniversalLinkRegex = nil;
3232
static NSRegularExpression *excludedDeeplinkRegex = nil;
3333

34-
static NSString * const kClientSdk = @"ios5.4.5";
34+
static NSString * const kClientSdk = @"ios5.4.6";
3535
static NSString * const kDeeplinkParam = @"deep_link=";
3636
static NSString * const kSchemeDelimiter = @"://";
3737
static NSString * const kDefaultScheme = @"AdjustUniversalScheme";

AdjustBridge/AdjustBridgeRegister.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ function canSend(okCheck, errReason) {
176176
if (this.sdkPrefix) {
177177
return this.sdkPrefix;
178178
} else {
179-
return 'web-bridge5.4.5';
179+
return 'web-bridge5.4.6';
180180
}
181181
},
182182

AdjustSignature/AdjustSigSdk.xcframework/Info.plist

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,40 +6,40 @@
66
<array>
77
<dict>
88
<key>BinaryPath</key>
9-
<string>AdjustSigSdk.framework/Versions/A/AdjustSigSdk</string>
9+
<string>AdjustSigSdk.framework/AdjustSigSdk</string>
1010
<key>LibraryIdentifier</key>
11-
<string>ios-arm64_x86_64-maccatalyst</string>
11+
<string>ios-arm64</string>
1212
<key>LibraryPath</key>
1313
<string>AdjustSigSdk.framework</string>
1414
<key>SupportedArchitectures</key>
1515
<array>
1616
<string>arm64</string>
17-
<string>x86_64</string>
1817
</array>
1918
<key>SupportedPlatform</key>
2019
<string>ios</string>
21-
<key>SupportedPlatformVariant</key>
22-
<string>maccatalyst</string>
2320
</dict>
2421
<dict>
2522
<key>BinaryPath</key>
2623
<string>AdjustSigSdk.framework/AdjustSigSdk</string>
2724
<key>LibraryIdentifier</key>
28-
<string>ios-arm64</string>
25+
<string>ios-arm64_x86_64-simulator</string>
2926
<key>LibraryPath</key>
3027
<string>AdjustSigSdk.framework</string>
3128
<key>SupportedArchitectures</key>
3229
<array>
3330
<string>arm64</string>
31+
<string>x86_64</string>
3432
</array>
3533
<key>SupportedPlatform</key>
3634
<string>ios</string>
35+
<key>SupportedPlatformVariant</key>
36+
<string>simulator</string>
3737
</dict>
3838
<dict>
3939
<key>BinaryPath</key>
40-
<string>AdjustSigSdk.framework/AdjustSigSdk</string>
40+
<string>AdjustSigSdk.framework/Versions/A/AdjustSigSdk</string>
4141
<key>LibraryIdentifier</key>
42-
<string>ios-arm64_x86_64-simulator</string>
42+
<string>ios-arm64_x86_64-maccatalyst</string>
4343
<key>LibraryPath</key>
4444
<string>AdjustSigSdk.framework</string>
4545
<key>SupportedArchitectures</key>
@@ -50,7 +50,7 @@
5050
<key>SupportedPlatform</key>
5151
<string>ios</string>
5252
<key>SupportedPlatformVariant</key>
53-
<string>simulator</string>
53+
<string>maccatalyst</string>
5454
</dict>
5555
<dict>
5656
<key>BinaryPath</key>
Binary file not shown.
Binary file not shown.

AdjustSignature/AdjustSigSdk.xcframework/_CodeSignature/CodeResources

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<dict>
77
<key>ios-arm64/AdjustSigSdk.framework/AdjustSigSdk</key>
88
<data>
9-
FN94zO7Od0e+lsaTCnZ3/gzdwtE=
9+
Nq5dZL4tIHgGm0sA52Qn/eg0nK0=
1010
</data>
1111
<key>ios-arm64/AdjustSigSdk.framework/Headers/ADJSigner.h</key>
1212
<data>
@@ -26,7 +26,7 @@
2626
</data>
2727
<key>ios-arm64_x86_64-maccatalyst/AdjustSigSdk.framework/Versions/A/AdjustSigSdk</key>
2828
<data>
29-
jj/Vjx/GV6hpLEdi+j6J+mXAbQM=
29+
k0nvD7iNBG2cV92UyTNnrWochBo=
3030
</data>
3131
<key>ios-arm64_x86_64-maccatalyst/AdjustSigSdk.framework/Versions/A/Headers/ADJSigner.h</key>
3232
<data>
@@ -46,7 +46,7 @@
4646
</data>
4747
<key>ios-arm64_x86_64-simulator/AdjustSigSdk.framework/AdjustSigSdk</key>
4848
<data>
49-
mlIQ+exMZuUtDicN8FlsiC9tKdg=
49+
ea2yeLfsqWBAGfA+CEKMnayQy0U=
5050
</data>
5151
<key>ios-arm64_x86_64-simulator/AdjustSigSdk.framework/Headers/ADJSigner.h</key>
5252
<data>
@@ -66,7 +66,7 @@
6666
</data>
6767
<key>tvos-arm64/AdjustSigSdk.framework/AdjustSigSdk</key>
6868
<data>
69-
USQcD+EQFn7zBjjzm9Nmb/wx/mc=
69+
zHc/kEUwi4wSkURFhXHXrY2KzEk=
7070
</data>
7171
<key>tvos-arm64/AdjustSigSdk.framework/Headers/ADJSigner.h</key>
7272
<data>
@@ -86,7 +86,7 @@
8686
</data>
8787
<key>tvos-arm64_x86_64-simulator/AdjustSigSdk.framework/AdjustSigSdk</key>
8888
<data>
89-
RScK8h73H+/oalOIcsGM0Gljazg=
89+
qVAo3/v04ge0C/j3dQ4IjT7LrKw=
9090
</data>
9191
<key>tvos-arm64_x86_64-simulator/AdjustSigSdk.framework/Headers/ADJSigner.h</key>
9292
<data>
@@ -111,11 +111,11 @@
111111
<dict>
112112
<key>hash</key>
113113
<data>
114-
FN94zO7Od0e+lsaTCnZ3/gzdwtE=
114+
Nq5dZL4tIHgGm0sA52Qn/eg0nK0=
115115
</data>
116116
<key>hash2</key>
117117
<data>
118-
O/BBK6Id2P8fn+1CcAXnJDu+m7IQneAoHG2LNb7MZ1E=
118+
C6551C5rErpDMhjPCJB4UMmIFcPWmk5MImROCBGnlhU=
119119
</data>
120120
</dict>
121121
<key>ios-arm64/AdjustSigSdk.framework/Headers/ADJSigner.h</key>
@@ -186,11 +186,11 @@
186186
<dict>
187187
<key>hash</key>
188188
<data>
189-
jj/Vjx/GV6hpLEdi+j6J+mXAbQM=
189+
k0nvD7iNBG2cV92UyTNnrWochBo=
190190
</data>
191191
<key>hash2</key>
192192
<data>
193-
xqXWWsmQENxVh6dcgWCBFDkQb+nlSmZ4kJZH7sck9Zs=
193+
M4dq+F9mby0Z3Jw4U7XCKTbjmfPMNUMFCs7JJwer7xg=
194194
</data>
195195
</dict>
196196
<key>ios-arm64_x86_64-maccatalyst/AdjustSigSdk.framework/Versions/A/Headers/ADJSigner.h</key>
@@ -246,11 +246,11 @@
246246
<dict>
247247
<key>hash</key>
248248
<data>
249-
mlIQ+exMZuUtDicN8FlsiC9tKdg=
249+
ea2yeLfsqWBAGfA+CEKMnayQy0U=
250250
</data>
251251
<key>hash2</key>
252252
<data>
253-
jnHG0Sg7fvyDB3s/qMssZiVt21JN2SKk/UpVGsI+wt4=
253+
DkQay/hH7S09/yhNL9AfEvlq+yoP5/q18QSQaXqhOpA=
254254
</data>
255255
</dict>
256256
<key>ios-arm64_x86_64-simulator/AdjustSigSdk.framework/Headers/ADJSigner.h</key>
@@ -301,11 +301,11 @@
301301
<dict>
302302
<key>hash</key>
303303
<data>
304-
USQcD+EQFn7zBjjzm9Nmb/wx/mc=
304+
zHc/kEUwi4wSkURFhXHXrY2KzEk=
305305
</data>
306306
<key>hash2</key>
307307
<data>
308-
FYn6CI9xsh8zji0wVBAnki7WCNYI4HFcsuJi/sE7fDk=
308+
4QRm2diebDi3ltFXn57z8jy8saE478dhQTfHPgbJ9JM=
309309
</data>
310310
</dict>
311311
<key>tvos-arm64/AdjustSigSdk.framework/Headers/ADJSigner.h</key>
@@ -356,11 +356,11 @@
356356
<dict>
357357
<key>hash</key>
358358
<data>
359-
RScK8h73H+/oalOIcsGM0Gljazg=
359+
qVAo3/v04ge0C/j3dQ4IjT7LrKw=
360360
</data>
361361
<key>hash2</key>
362362
<data>
363-
54gBFyVHcDPNmWJIMSWgaIAgZXMa9Pwak/irAlPZ6qk=
363+
BRI+QjvjYW36fQq1cccWvMSZ61AtXkHWUYPsQ4kNZCw=
364364
</data>
365365
</dict>
366366
<key>tvos-arm64_x86_64-simulator/AdjustSigSdk.framework/Headers/ADJSigner.h</key>
Binary file not shown.

0 commit comments

Comments
 (0)