Skip to content

Commit 6b757b2

Browse files
committed
Merge pull request #134 from adjust/tvos_criteo
Tvos criteo
2 parents 16c645c + e884138 commit 6b757b2

File tree

8 files changed

+13
-11
lines changed

8 files changed

+13
-11
lines changed

Adjust.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
Pod::Spec.new do |s|
22
s.name = "Adjust"
3-
s.version = "4.4.0"
3+
s.version = "4.4.1"
44
s.summary = "This is the iOS SDK of adjust. You can read more about it at http://adjust.com."
55
s.homepage = "http://adjust.com"
66
s.license = { :type => 'MIT', :file => 'MIT-LICENSE' }
77
s.author = { "Christian Wellenbrock" => "[email protected]" }
8-
s.source = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.4.0" }
8+
s.source = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.4.1" }
99
s.ios.deployment_target = '5.0'
1010
s.tvos.deployment_target = '9.0'
1111
s.framework = 'SystemConfiguration'

Adjust.xcodeproj/project.pbxproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@
9191
96E5E3B818BBB49E008E7B30 /* NSURLConnection+NSURLConnectionSynchronousLoadingMocking.m in Sources */ = {isa = PBXBuildFile; fileRef = 96E5E3AD18BBB49E008E7B30 /* NSURLConnection+NSURLConnectionSynchronousLoadingMocking.m */; };
9292
96ED00391A38A4CD00209110 /* ADJAttributionHandlerMock.m in Sources */ = {isa = PBXBuildFile; fileRef = 96ED00381A38A4CD00209110 /* ADJAttributionHandlerMock.m */; };
9393
96ED003E1A38A98C00209110 /* ADJDelegateTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 96ED003D1A38A98C00209110 /* ADJDelegateTest.m */; };
94+
9D363AC31BDA50FA00B47FE9 /* ADJLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 96E5E37318BBB48A008E7B30 /* ADJLogger.h */; settings = {ATTRIBUTES = (Public, ); }; };
9495
9DE7C8FD1AE688DA001556E5 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9DE7C8FC1AE688DA001556E5 /* UIKit.framework */; };
9596
/* End PBXBuildFile section */
9697

@@ -404,6 +405,7 @@
404405
96BCFBCD1AC99231005A65C5 /* Adjust.h in Headers */,
405406
96BCFBCE1AC99235005A65C5 /* ADJEvent.h in Headers */,
406407
96BCFBD11AC99246005A65C5 /* ADJAttribution.h in Headers */,
408+
9D363AC31BDA50FA00B47FE9 /* ADJLogger.h in Headers */,
407409
96BCFBD01AC9923F005A65C5 /* ADJConfig.h in Headers */,
408410
96BCFBD91AC9934E005A65C5 /* ADJAdjustFactory.h in Headers */,
409411
96BCFBD81AC9934B005A65C5 /* ADJActivityState.h in Headers */,
@@ -477,7 +479,7 @@
477479
};
478480
};
479481
};
480-
buildConfigurationList = 9679920818BBAE2800394606 /* Build configuration list for PBXProject "adjust" */;
482+
buildConfigurationList = 9679920818BBAE2800394606 /* Build configuration list for PBXProject "Adjust" */;
481483
compatibilityVersion = "Xcode 3.2";
482484
developmentRegion = English;
483485
hasScannedForEncodings = 0;
@@ -812,7 +814,7 @@
812814
/* End XCBuildConfiguration section */
813815

814816
/* Begin XCConfigurationList section */
815-
9679920818BBAE2800394606 /* Build configuration list for PBXProject "adjust" */ = {
817+
9679920818BBAE2800394606 /* Build configuration list for PBXProject "Adjust" */ = {
816818
isa = XCConfigurationList;
817819
buildConfigurations = (
818820
9679922E18BBAE2800394606 /* Debug */,

Adjust/ADJUtil.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <sys/xattr.h>
1717

1818
static NSString * const kBaseUrl = @"https://app.adjust.com";
19-
static NSString * const kClientSdk = @"ios4.4.0";
19+
static NSString * const kClientSdk = @"ios4.4.1";
2020

2121
static NSString * const kDateFormat = @"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'Z";
2222
static NSDateFormatter *dateFormat;

AdjustTests/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 = @"123456789012";
19-
self.clientSdk = @"ios4.4.0";
19+
self.clientSdk = @"ios4.4.1";
2020
self.suffix = @"";
2121
self.environment = @"sandbox";
2222

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ If you're using [CocoaPods][cocoapods] for `iOs` or `tvOS`, you can add the foll
1818
`Podfile` and continue with [step 4](#step4):
1919

2020
```ruby
21-
pod 'Adjust', :git => 'git://github.com/adjust/ios_sdk.git', :tag => 'v4.4.0'
21+
pod 'Adjust', :git => 'git://github.com/adjust/ios_sdk.git', :tag => 'v4.4.1'
2222
```
2323

2424
### 1. Get the SDK

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.4.0
1+
4.4.1

doc/migrate.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Migrate your adjust SDK for iOS to v4.4.0 from v3.4.0
1+
## Migrate your adjust SDK for iOS to v4.4.1 from v3.4.0
22

33
### Initial setup
44

plugin/Criteo/ADJCriteo.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ + (NSString*) createCriteoVBFromProducts:(NSArray*) products
242242
[criteoVBValue appendString:@","];
243243
}
244244
[criteoVBValue appendString:@"]"];
245-
return [criteoVBValue stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
245+
return [criteoVBValue stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
246246
}
247247

248248
+ (NSString*) createCriteoVLFromProducts:(NSArray*) productIds
@@ -285,7 +285,7 @@ + (NSString*) createCriteoVLFromProducts:(NSArray*) productIds
285285
}
286286

287287
[criteoVLValue appendString:@"]"];
288-
return [criteoVLValue stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
288+
return [criteoVLValue stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
289289
}
290290

291291
@end

0 commit comments

Comments
 (0)