Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Adjust.podspec
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Pod::Spec.new do |s|
s.name = "Adjust"
s.version = "4.4.5"
s.version = "4.5.0"
s.summary = "This is the iOS SDK of adjust. You can read more about it at http://adjust.com."
s.homepage = "http://adjust.com"
s.license = { :type => 'MIT', :file => 'MIT-LICENSE' }
s.author = { "Christian Wellenbrock" => "welle@adjust.com" }
s.source = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.4.5" }
s.ios.deployment_target = '5.0'
s.source = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.5.0" }
s.ios.deployment_target = '6.0'
s.tvos.deployment_target = '9.0'
s.framework = 'SystemConfiguration'
s.ios.weak_framework = 'AdSupport', 'iAd'
Expand Down
359 changes: 350 additions & 9 deletions Adjust.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "5D3A06A058226D065739B53871A0207A1C3022C2",
"DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {

},
"DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
"5D3A06A058226D065739B53871A0207A1C3022C2" : 0,
"F7C6F209B1DCA446C89CD9019B5C206C0685236A" : 0
},
"DVTSourceControlWorkspaceBlueprintIdentifierKey" : "39D3F7B5-32C4-4987-9F89-1A4B49A266EA",
"DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
"5D3A06A058226D065739B53871A0207A1C3022C2" : "ios_sdk\/",
"F7C6F209B1DCA446C89CD9019B5C206C0685236A" : "cordova_sdk\/"
},
"DVTSourceControlWorkspaceBlueprintNameKey" : "Adjust",
"DVTSourceControlWorkspaceBlueprintVersion" : 204,
"DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "Adjust.xcodeproj",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:adjust\/ios_sdk.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "5D3A06A058226D065739B53871A0207A1C3022C2"
},
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:adjust\/cordova_sdk.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "F7C6F209B1DCA446C89CD9019B5C206C0685236A"
}
]
}
80 changes: 80 additions & 0 deletions Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdk.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0710"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "9DFA37AC1C0F219400782607"
BuildableName = "AdjustSdk.framework"
BlueprintName = "AdjustSdk"
ReferencedContainer = "container:Adjust.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Release"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "9DFA37AC1C0F219400782607"
BuildableName = "AdjustSdk.framework"
BlueprintName = "AdjustSdk"
ReferencedContainer = "container:Adjust.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "9DFA37AC1C0F219400782607"
BuildableName = "AdjustSdk.framework"
BlueprintName = "AdjustSdk"
ReferencedContainer = "container:Adjust.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
3 changes: 1 addition & 2 deletions Adjust/ADJActivityHandler.m
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ - (void)setIadDetails:(NSDictionary *)attributionDetails
retriesLeft:(int)retriesLeft
{
if (![ADJUtil isNull:error]) {
[self.logger error:@"iAd details error (%s)", [error description]];
[self.logger warn:@"Unable to read iAd details"];

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

if (error.code == AdjADClientErrorUnknown) {

dispatch_time_t retryTime = dispatch_time(DISPATCH_TIME_NOW, kDelayRetryIad);
dispatch_after(retryTime, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
[[UIDevice currentDevice] adjSetIad:self triesV3Left:retriesLeft];
Expand Down
2 changes: 1 addition & 1 deletion Adjust/ADJUtil.m
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <sys/xattr.h>

static NSString * const kBaseUrl = @"https://app.adjust.com";
static NSString * const kClientSdk = @"ios4.4.5";
static NSString * const kClientSdk = @"ios4.5.0";

static NSString * const kDateFormat = @"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'Z";
static NSDateFormatter *dateFormat;
Expand Down
26 changes: 26 additions & 0 deletions Adjust/Info.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>
23 changes: 23 additions & 0 deletions AdjustSdk/AdjustSdk.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
//
// AdjustSdk.h
// AdjustSdk
//
// Created by Uglješa Erceg on 02/12/15.
// Copyright © 2015 adjust GmbH. All rights reserved.
//

#import <UIKit/UIKit.h>

//! Project version number for AdjustSdk.
FOUNDATION_EXPORT double AdjustSdkVersionNumber;

//! Project version string for AdjustSdk.
FOUNDATION_EXPORT const unsigned char AdjustSdkVersionString[];

// In this header, you should import all the public headers of your framework using statements like #import <AdjustSdk/PublicHeader.h>

#import <AdjustSdk/Adjust.h>
#import <AdjustSdk/ADJEvent.h>
#import <AdjustSdk/ADJConfig.h>
#import <AdjustSdk/ADJLogger.h>
#import <AdjustSdk/ADJAttribution.h>
26 changes: 26 additions & 0 deletions AdjustSdk/Info.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion AdjustTests/ADJPackageFields.m
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ - (id) init {

// default values
self.appToken = @"123456789012";
self.clientSdk = @"ios4.4.5";
self.clientSdk = @"ios4.5.0";
self.suffix = @"";
self.environment = @"sandbox";

Expand Down
46 changes: 42 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,28 @@ If you're using [CocoaPods][cocoapods] for `iOs` or `tvOS`, you can add the foll
`Podfile` and continue with [step 4](#step4):

```ruby
pod 'Adjust', :git => 'git://github.com/adjust/ios_sdk.git', :tag => 'v4.4.5'
pod 'Adjust', :git => 'git://github.com/adjust/ios_sdk.git', :tag => 'v4.5.0'
```

If you're using [Carthage][carthage], you can add following line to your `Cartfile`
and continue with [step 3](#step3):

```ruby
github "adjust/ios_sdk"
```

You can also choose to integrate the adjust SDK by adding it to your project as a framework.
On the [releases page][releases] you can find two archives:

* `AdjustSdkStatic.framework.zip`
* `AdjustSdkDynamic.framework.zip`

Since the release of iOS 8, Apple has introduced dynamic frameworks (also known as embedded frameworks).
If your app is targeting iOS 8 or higher, you can use the adjust SDK dynamic framework.
Choose which framework you want to use – static or dynamic – and add it to your project
before continuing with [step 3](#step3).


### 1. Get the SDK

Download the latest version from our [releases page][releases]. Extract the
Expand All @@ -40,7 +59,7 @@ groups`.

![][add]

### 3. Add the AdSupport and iAd framework
### <a id="step3"></a>3. Add the AdSupport and iAd framework

Select your project in the Project Navigator. In the left hand side of the main
view, select your target. In the tab `Build Phases`, expand the group `Link
Expand All @@ -53,7 +72,23 @@ steps to add the `iAd.framework`, unless you are using tvOS. Change the `Status`

### <a id="step4"></a>4. Integrate Adjust into your app

To start with, we'll set up basic session tracking.
#### Import statement

If you added the adjust SDK from the source or via a Pod repository, you should
use following import statement:

```objc
#import "Adjust.h"
```

If you added the adjust SDK as a framework or via Carthage, you should use
following import statement:

```objc
#import <AdjustSdk/Adjust.h>
```

To begin, we'll set up basic session tracking.

#### Basic Setup

Expand All @@ -64,6 +99,7 @@ method of your app delegate:

```objc
#import "Adjust.h"
// or #import <AdjustSdk/Adjust.h>
// ...
NSString *yourAppToken = @"{YourAppToken}";
NSString *environment = ADJEnvironmentSandbox;
Expand Down Expand Up @@ -297,6 +333,7 @@ policies.][attribution-data]

```objc
#import "Adjust.h"
// or #import <AdjustSdk/Adjust.h>

@interface AppDelegate : UIResponder <UIApplicationDelegate, AdjustDelegate>
```
Expand Down Expand Up @@ -384,6 +421,7 @@ You can read more about special partners and these integrations in our

[adjust.com]: http://adjust.com
[cocoapods]: http://cocoapods.org
[carthage]: https://github.com/Carthage/Carthage
[dashboard]: http://adjust.com
[examples]: http://github.com/adjust/ios_sdk/tree/master/examples
[example-ios]: http://github.com/adjust/ios_sdk/tree/master/examples/AdjustExample-iOS
Expand All @@ -405,7 +443,7 @@ You can read more about special partners and these integrations in our

## License

The adjust-SDK is licensed under the MIT License.
The adjust SDK is licensed under the MIT License.

Copyright (c) 2012-2015 adjust GmbH,
http://www.adjust.com
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.4.5
4.5.0
2 changes: 1 addition & 1 deletion doc/migrate.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Migrate your adjust SDK for iOS to v4.4.5 from v3.4.0
## Migrate your adjust SDK for iOS to v4.5.0 from v3.4.0

### Initial setup

Expand Down
Loading