Skip to content

Commit b1feb89

Browse files
authored
Merge pull request #587 from adjust/v4297
Version 4.29.7
2 parents 0a126dd + 53477ae commit b1feb89

File tree

18 files changed

+97
-45
lines changed

18 files changed

+97
-45
lines changed

Adjust.podspec

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
Pod::Spec.new do |s|
22
s.name = "Adjust"
3-
s.version = "4.29.6"
3+
s.version = "4.29.7"
44
s.summary = "This is the iOS SDK of adjust. You can read more about it at http://adjust.com."
55
s.homepage = "https://github.com/adjust/ios_sdk"
66
s.license = { :type => 'MIT', :file => 'MIT-LICENSE' }
7-
s.author = { "Christian Wellenbrock" => "welle@adjust.com" }
8-
s.source = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.29.6" }
9-
s.ios.deployment_target = '6.0'
7+
s.author = { "Adjust GmbH" => "sdk@adjust.com" }
8+
s.source = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.29.7" }
9+
s.ios.deployment_target = '9.0'
1010
s.tvos.deployment_target = '9.0'
1111
s.framework = 'SystemConfiguration'
1212
s.ios.weak_framework = 'AdSupport', 'iAd', 'CoreTelephony'
@@ -37,6 +37,6 @@ Pod::Spec.new do |s|
3737
s.subspec 'WebBridge' do |wb|
3838
wb.source_files = 'AdjustBridge/*.{h,m}', 'AdjustBridge/WebViewJavascriptBridge/*.{h,m}'
3939
wb.dependency 'Adjust/Core'
40-
wb.ios.deployment_target = '6.0'
40+
wb.ios.deployment_target = '9.0'
4141
end
4242
end

Adjust.xcodeproj/project.pbxproj

Lines changed: 59 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 51;
77
objects = {
88

99
/* Begin PBXAggregateTarget section */
@@ -2267,7 +2267,7 @@
22672267
isa = PBXProject;
22682268
attributes = {
22692269
LastUpgradeCheck = 1250;
2270-
ORGANIZATIONNAME = "adjust GmbH";
2270+
ORGANIZATIONNAME = "Adjust GmbH";
22712271
TargetAttributes = {
22722272
9615158E1CD2CB2C0022D336 = {
22732273
CreatedOnToolsVersion = 7.3.1;
@@ -2300,7 +2300,7 @@
23002300
};
23012301
};
23022302
buildConfigurationList = 9679920818BBAE2800394606 /* Build configuration list for PBXProject "Adjust" */;
2303-
compatibilityVersion = "Xcode 3.2";
2303+
compatibilityVersion = "Xcode 10.0";
23042304
developmentRegion = en;
23052305
hasScannedForEncodings = 0;
23062306
knownRegions = (
@@ -2971,7 +2971,7 @@
29712971
GCC_WARN_UNINITIALIZED_AUTOS = YES;
29722972
GCC_WARN_UNUSED_FUNCTION = YES;
29732973
GCC_WARN_UNUSED_VARIABLE = YES;
2974-
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
2974+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
29752975
ONLY_ACTIVE_ARCH = YES;
29762976
OTHER_CFLAGS = "-fembed-bitcode";
29772977
SDKROOT = iphoneos;
@@ -3020,7 +3020,7 @@
30203020
GCC_WARN_UNINITIALIZED_AUTOS = YES;
30213021
GCC_WARN_UNUSED_FUNCTION = YES;
30223022
GCC_WARN_UNUSED_VARIABLE = YES;
3023-
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
3023+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
30243024
OTHER_CFLAGS = "-fembed-bitcode";
30253025
SDKROOT = iphoneos;
30263026
VALIDATE_PRODUCT = YES;
@@ -3157,8 +3157,12 @@
31573157
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
31583158
INFOPLIST_FILE = AdjustSdkWebBridge/Info.plist;
31593159
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
3160-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
3161-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
3160+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
3161+
LD_RUNPATH_SEARCH_PATHS = (
3162+
"$(inherited)",
3163+
"@executable_path/Frameworks",
3164+
"@loader_path/Frameworks",
3165+
);
31623166
MTL_ENABLE_DEBUG_INFO = YES;
31633167
PRODUCT_BUNDLE_IDENTIFIER = com.adjust.AdjustSdkWebBridge;
31643168
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
@@ -3191,8 +3195,12 @@
31913195
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
31923196
INFOPLIST_FILE = AdjustSdkWebBridge/Info.plist;
31933197
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
3194-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
3195-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
3198+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
3199+
LD_RUNPATH_SEARCH_PATHS = (
3200+
"$(inherited)",
3201+
"@executable_path/Frameworks",
3202+
"@loader_path/Frameworks",
3203+
);
31963204
MTL_ENABLE_DEBUG_INFO = NO;
31973205
PRODUCT_BUNDLE_IDENTIFIER = com.adjust.AdjustSdkWebBridge;
31983206
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
@@ -3218,7 +3226,10 @@
32183226
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
32193227
INFOPLIST_FILE = AdjustExampleTests/Info.plist;
32203228
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
3221-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
3229+
LD_RUNPATH_SEARCH_PATHS = (
3230+
"$(inherited)",
3231+
"@executable_path/Frameworks",
3232+
);
32223233
MTL_ENABLE_DEBUG_INFO = YES;
32233234
PRODUCT_BUNDLE_IDENTIFIER = com.adjust.examples;
32243235
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3239,7 +3250,10 @@
32393250
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
32403251
INFOPLIST_FILE = AdjustExampleTests/Info.plist;
32413252
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
3242-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
3253+
LD_RUNPATH_SEARCH_PATHS = (
3254+
"$(inherited)",
3255+
"@executable_path/Frameworks",
3256+
);
32433257
MTL_ENABLE_DEBUG_INFO = NO;
32443258
PRODUCT_BUNDLE_IDENTIFIER = com.adjust.examples;
32453259
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3272,8 +3286,12 @@
32723286
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
32733287
INFOPLIST_FILE = AdjustSdkIm/Info.plist;
32743288
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
3275-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
3276-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
3289+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
3290+
LD_RUNPATH_SEARCH_PATHS = (
3291+
"$(inherited)",
3292+
"@executable_path/Frameworks",
3293+
"@loader_path/Frameworks",
3294+
);
32773295
MTL_ENABLE_DEBUG_INFO = YES;
32783296
PRODUCT_BUNDLE_IDENTIFIER = com.adjust.AdjustSdkIm;
32793297
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
@@ -3307,8 +3325,12 @@
33073325
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
33083326
INFOPLIST_FILE = AdjustSdkIm/Info.plist;
33093327
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
3310-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
3311-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
3328+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
3329+
LD_RUNPATH_SEARCH_PATHS = (
3330+
"$(inherited)",
3331+
"@executable_path/Frameworks",
3332+
"@loader_path/Frameworks",
3333+
);
33123334
MTL_ENABLE_DEBUG_INFO = NO;
33133335
PRODUCT_BUNDLE_IDENTIFIER = com.adjust.AdjustSdkIm;
33143336
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
@@ -3335,8 +3357,12 @@
33353357
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
33363358
INFOPLIST_FILE = AdjustSdk/Info.plist;
33373359
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
3338-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
3339-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
3360+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
3361+
LD_RUNPATH_SEARCH_PATHS = (
3362+
"$(inherited)",
3363+
"@executable_path/Frameworks",
3364+
"@loader_path/Frameworks",
3365+
);
33403366
MTL_ENABLE_DEBUG_INFO = YES;
33413367
ONLY_ACTIVE_ARCH = NO;
33423368
PRODUCT_BUNDLE_IDENTIFIER = com.adjust.AdjustSdk;
@@ -3363,8 +3389,12 @@
33633389
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
33643390
INFOPLIST_FILE = AdjustSdk/Info.plist;
33653391
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
3366-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
3367-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
3392+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
3393+
LD_RUNPATH_SEARCH_PATHS = (
3394+
"$(inherited)",
3395+
"@executable_path/Frameworks",
3396+
"@loader_path/Frameworks",
3397+
);
33683398
MTL_ENABLE_DEBUG_INFO = NO;
33693399
ONLY_ACTIVE_ARCH = NO;
33703400
PRODUCT_BUNDLE_IDENTIFIER = com.adjust.AdjustSdk;
@@ -3393,7 +3423,11 @@
33933423
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
33943424
INFOPLIST_FILE = AdjustSdkTv/Info.plist;
33953425
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
3396-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
3426+
LD_RUNPATH_SEARCH_PATHS = (
3427+
"$(inherited)",
3428+
"@executable_path/Frameworks",
3429+
"@loader_path/Frameworks",
3430+
);
33973431
MTL_ENABLE_DEBUG_INFO = YES;
33983432
ONLY_ACTIVE_ARCH = NO;
33993433
PRODUCT_BUNDLE_IDENTIFIER = com.adjust.AdjustSdkTv;
@@ -3425,7 +3459,11 @@
34253459
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
34263460
INFOPLIST_FILE = AdjustSdkTv/Info.plist;
34273461
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
3428-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
3462+
LD_RUNPATH_SEARCH_PATHS = (
3463+
"$(inherited)",
3464+
"@executable_path/Frameworks",
3465+
"@loader_path/Frameworks",
3466+
);
34293467
MTL_ENABLE_DEBUG_INFO = NO;
34303468
ONLY_ACTIVE_ARCH = NO;
34313469
PRODUCT_BUNDLE_IDENTIFIER = com.adjust.AdjustSdkTv;

Adjust/ADJUtil.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
static NSRegularExpression *shortUniversalLinkRegex = nil;
4040
static NSRegularExpression *excludedDeeplinkRegex = nil;
4141

42-
static NSString * const kClientSdk = @"ios4.29.6";
42+
static NSString * const kClientSdk = @"ios4.29.7";
4343
static NSString * const kDeeplinkParam = @"deep_link=";
4444
static NSString * const kSchemeDelimiter = @"://";
4545
static NSString * const kDefaultScheme = @"AdjustUniversalScheme";

Adjust/Adjust.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Adjust.h
33
// Adjust SDK
44
//
5-
// V4.29.6
5+
// V4.29.7
66
// Created by Christian Wellenbrock (@wellle) on 23rd July 2013.
77
// Copyright (c) 2012-2021 Adjust GmbH. All rights reserved.
88
//
@@ -49,6 +49,8 @@ extern NSString * __nonnull const ADJAdRevenueSourceMopub;
4949
extern NSString * __nonnull const ADJAdRevenueSourceAdMob;
5050
extern NSString * __nonnull const ADJAdRevenueSourceIronSource;
5151
extern NSString * __nonnull const ADJAdRevenueSourceAdMost;
52+
extern NSString * __nonnull const ADJAdRevenueSourceUnity;
53+
extern NSString * __nonnull const ADJAdRevenueSourceHeliumChartboost;
5254

5355
/**
5456
* Constants for country app's URL strategies.

Adjust/Adjust.m

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
NSString * const ADJAdRevenueSourceAdMob = @"admob_sdk";
2727
NSString * const ADJAdRevenueSourceIronSource = @"ironsource_sdk";
2828
NSString * const ADJAdRevenueSourceAdMost = @"admost_sdk";
29+
NSString * const ADJAdRevenueSourceUnity = @"unity_sdk";
30+
NSString * const ADJAdRevenueSourceHeliumChartboost = @"helium_chartboost_sdk";
2931

3032
NSString * const ADJUrlStrategyIndia = @"UrlStrategyIndia";
3133
NSString * const ADJUrlStrategyChina = @"UrlStrategyChina";

AdjustBridge/AdjustBridgeRegister.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ + (NSString *)adjust_js {
246246
if (this.sdkPrefix) {
247247
return this.sdkPrefix;
248248
} else {
249-
return 'web-bridge4.29.6';
249+
return 'web-bridge4.29.7';
250250
}
251251
},
252252
setTestOptions: function(testOptions) {

AdjustTests/AdjustUnitTests/ADJPackageFields.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ - (id) init {
1616

1717
// default values
1818
self.appToken = @"qwerty123456";
19-
self.clientSdk = @"ios4.29.6";
19+
self.clientSdk = @"ios4.29.7";
2020
self.suffix = @"";
2121
self.environment = @"sandbox";
2222

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
### Version 4.29.7 (8th February 2022)
2+
#### Added
3+
- Added support for `Unity` ad revenue tracking.
4+
- Added support for `Helium Chartboost` ad revenue tracking.
5+
6+
#### Changed
7+
- Updated iOS deployment target to `9.0`.
8+
9+
---
10+
111
### Version 4.29.6 (13th September 2021)
212
#### Added
313
- Added support for AdMost ad revenue source.

MIT-LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2012-2017 adjust GmbH,
1+
Copyright (c) 2012-Present Adjust GmbH,
22
http://www.adjust.com
33

44
Permission is hereby granted, free of charge, to any person obtaining

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,13 @@ We will describe the steps to integrate the Adjust SDK into your iOS project. We
9494
If you're using [CocoaPods][cocoapods], you can add the following line to your `Podfile` and continue from [this step](#sdk-integrate):
9595

9696
```ruby
97-
pod 'Adjust', '~> 4.29.6'
97+
pod 'Adjust', '~> 4.29.7'
9898
```
9999

100100
or:
101101

102102
```ruby
103-
pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.29.6'
103+
pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.29.7'
104104
```
105105

106106
---
@@ -1342,7 +1342,7 @@ If you are seing any value in the dashboard other than what you expected to be t
13421342

13431343
The Adjust SDK is licensed under the MIT License.
13441344

1345-
Copyright (c) 2012-2021 Adjust GmbH, http://www.adjust.com
1345+
Copyright (c) 2012-Present Adjust GmbH, http://www.adjust.com
13461346

13471347
Permission is hereby granted, free of charge, to any person obtaining a copy of
13481348
this software and associated documentation files (the "Software"), to deal in

0 commit comments

Comments
 (0)