Skip to content

Commit e777954

Browse files
uerceguerceg
committed
Merge pull request #147 from adjust/carthage
Carthage
2 parents 5bbc4eb + 7d09ec3 commit e777954

File tree

39 files changed

+1465
-213
lines changed

39 files changed

+1465
-213
lines changed

‎Adjust.podspec‎

Lines changed: 3 additions & 3 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.4.5"
3+
s.version = "4.5.0"
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.5" }
9-
s.ios.deployment_target = '5.0'
8+
s.source = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.5.0" }
9+
s.ios.deployment_target = '6.0'
1010
s.tvos.deployment_target = '9.0'
1111
s.framework = 'SystemConfiguration'
1212
s.ios.weak_framework = 'AdSupport', 'iAd'

‎Adjust.xcodeproj/project.pbxproj‎

Lines changed: 350 additions & 9 deletions
Large diffs are not rendered by default.

‎Adjust.xcodeproj/project.xcworkspace/xcshareddata/Adjust.xcscmblueprint‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "5D3A06A058226D065739B53871A0207A1C3022C2",
3+
"DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
4+
5+
},
6+
"DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
7+
"5D3A06A058226D065739B53871A0207A1C3022C2" : 0,
8+
"F7C6F209B1DCA446C89CD9019B5C206C0685236A" : 0
9+
},
10+
"DVTSourceControlWorkspaceBlueprintIdentifierKey" : "39D3F7B5-32C4-4987-9F89-1A4B49A266EA",
11+
"DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
12+
"5D3A06A058226D065739B53871A0207A1C3022C2" : "ios_sdk\/",
13+
"F7C6F209B1DCA446C89CD9019B5C206C0685236A" : "cordova_sdk\/"
14+
},
15+
"DVTSourceControlWorkspaceBlueprintNameKey" : "Adjust",
16+
"DVTSourceControlWorkspaceBlueprintVersion" : 204,
17+
"DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "Adjust.xcodeproj",
18+
"DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
19+
{
20+
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:adjust\/ios_sdk.git",
21+
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
22+
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "5D3A06A058226D065739B53871A0207A1C3022C2"
23+
},
24+
{
25+
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:adjust\/cordova_sdk.git",
26+
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
27+
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "F7C6F209B1DCA446C89CD9019B5C206C0685236A"
28+
}
29+
]
30+
}

‎Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdk.xcscheme‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0710"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "9DFA37AC1C0F219400782607"
18+
BuildableName = "AdjustSdk.framework"
19+
BlueprintName = "AdjustSdk"
20+
ReferencedContainer = "container:Adjust.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
<AdditionalOptions>
33+
</AdditionalOptions>
34+
</TestAction>
35+
<LaunchAction
36+
buildConfiguration = "Release"
37+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
38+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
39+
launchStyle = "0"
40+
useCustomWorkingDirectory = "NO"
41+
ignoresPersistentStateOnLaunch = "NO"
42+
debugDocumentVersioning = "YES"
43+
debugServiceExtension = "internal"
44+
allowLocationSimulation = "YES">
45+
<MacroExpansion>
46+
<BuildableReference
47+
BuildableIdentifier = "primary"
48+
BlueprintIdentifier = "9DFA37AC1C0F219400782607"
49+
BuildableName = "AdjustSdk.framework"
50+
BlueprintName = "AdjustSdk"
51+
ReferencedContainer = "container:Adjust.xcodeproj">
52+
</BuildableReference>
53+
</MacroExpansion>
54+
<AdditionalOptions>
55+
</AdditionalOptions>
56+
</LaunchAction>
57+
<ProfileAction
58+
buildConfiguration = "Release"
59+
shouldUseLaunchSchemeArgsEnv = "YES"
60+
savedToolIdentifier = ""
61+
useCustomWorkingDirectory = "NO"
62+
debugDocumentVersioning = "YES">
63+
<MacroExpansion>
64+
<BuildableReference
65+
BuildableIdentifier = "primary"
66+
BlueprintIdentifier = "9DFA37AC1C0F219400782607"
67+
BuildableName = "AdjustSdk.framework"
68+
BlueprintName = "AdjustSdk"
69+
ReferencedContainer = "container:Adjust.xcodeproj">
70+
</BuildableReference>
71+
</MacroExpansion>
72+
</ProfileAction>
73+
<AnalyzeAction
74+
buildConfiguration = "Debug">
75+
</AnalyzeAction>
76+
<ArchiveAction
77+
buildConfiguration = "Release"
78+
revealArchiveInOrganizer = "YES">
79+
</ArchiveAction>
80+
</Scheme>

‎Adjust/ADJActivityHandler.m‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ - (void)setIadDetails:(NSDictionary *)attributionDetails
255255
retriesLeft:(int)retriesLeft
256256
{
257257
if (![ADJUtil isNull:error]) {
258-
[self.logger error:@"iAd details error (%s)", [error description]];
258+
[self.logger warn:@"Unable to read iAd details"];
259259

260260
if (retriesLeft < 0) {
261261
[self.logger error:@"Reached limit number of retry for iAd"];
@@ -267,7 +267,6 @@ - (void)setIadDetails:(NSDictionary *)attributionDetails
267267
}
268268

269269
if (error.code == AdjADClientErrorUnknown) {
270-
271270
dispatch_time_t retryTime = dispatch_time(DISPATCH_TIME_NOW, kDelayRetryIad);
272271
dispatch_after(retryTime, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
273272
[[UIDevice currentDevice] adjSetIad:self triesV3Left:retriesLeft];

‎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.5";
19+
static NSString * const kClientSdk = @"ios4.5.0";
2020

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

‎Adjust/Info.plist‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>en</string>
7+
<key>CFBundleExecutable</key>
8+
<string>$(EXECUTABLE_NAME)</string>
9+
<key>CFBundleIdentifier</key>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
11+
<key>CFBundleInfoDictionaryVersion</key>
12+
<string>6.0</string>
13+
<key>CFBundleName</key>
14+
<string>$(PRODUCT_NAME)</string>
15+
<key>CFBundlePackageType</key>
16+
<string>FMWK</string>
17+
<key>CFBundleShortVersionString</key>
18+
<string>1.0</string>
19+
<key>CFBundleSignature</key>
20+
<string>????</string>
21+
<key>CFBundleVersion</key>
22+
<string>$(CURRENT_PROJECT_VERSION)</string>
23+
<key>NSPrincipalClass</key>
24+
<string></string>
25+
</dict>
26+
</plist>

‎AdjustSdk/AdjustSdk.h‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
//
2+
// AdjustSdk.h
3+
// AdjustSdk
4+
//
5+
// Created by Uglješa Erceg on 02/12/15.
6+
// Copyright © 2015 adjust GmbH. All rights reserved.
7+
//
8+
9+
#import <UIKit/UIKit.h>
10+
11+
//! Project version number for AdjustSdk.
12+
FOUNDATION_EXPORT double AdjustSdkVersionNumber;
13+
14+
//! Project version string for AdjustSdk.
15+
FOUNDATION_EXPORT const unsigned char AdjustSdkVersionString[];
16+
17+
// In this header, you should import all the public headers of your framework using statements like #import <AdjustSdk/PublicHeader.h>
18+
19+
#import <AdjustSdk/Adjust.h>
20+
#import <AdjustSdk/ADJEvent.h>
21+
#import <AdjustSdk/ADJConfig.h>
22+
#import <AdjustSdk/ADJLogger.h>
23+
#import <AdjustSdk/ADJAttribution.h>

‎AdjustSdk/Info.plist‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>en</string>
7+
<key>CFBundleExecutable</key>
8+
<string>$(EXECUTABLE_NAME)</string>
9+
<key>CFBundleIdentifier</key>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
11+
<key>CFBundleInfoDictionaryVersion</key>
12+
<string>6.0</string>
13+
<key>CFBundleName</key>
14+
<string>$(PRODUCT_NAME)</string>
15+
<key>CFBundlePackageType</key>
16+
<string>FMWK</string>
17+
<key>CFBundleShortVersionString</key>
18+
<string>1.0</string>
19+
<key>CFBundleSignature</key>
20+
<string>????</string>
21+
<key>CFBundleVersion</key>
22+
<string>$(CURRENT_PROJECT_VERSION)</string>
23+
<key>NSPrincipalClass</key>
24+
<string></string>
25+
</dict>
26+
</plist>

‎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.5";
19+
self.clientSdk = @"ios4.5.0";
2020
self.suffix = @"";
2121
self.environment = @"sandbox";
2222

0 commit comments

Comments
 (0)