Skip to content

Static library, Sociomantic #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Mar 31, 2015
Merged

Static library, Sociomantic #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
9799816
Adds Sociomantic Plugin.
nicolas-brugneaux-sociomantic Mar 30, 2015
953d432
Add adjust logger
nonelse Mar 31, 2015
18a88c1
Changed signature of injectTransactionIntoEvent
nicolas-brugneaux-sociomantic Mar 31, 2015
f55213c
Added Sociomantic Plugin documentation.
nicolas-brugneaux-sociomantic Mar 31, 2015
8d238dc
Merge branch 'master' of https://github.com/nicolas-brugneaux-socioma…
nonelse Mar 31, 2015
a9e08d5
Doc sociomantic remove extra line
nonelse Mar 31, 2015
0146276
Fix the shape of the to object for sales
nicolas-brugneaux-sociomantic Mar 31, 2015
aef8239
Added lead event
nicolas-brugneaux-sociomantic Mar 31, 2015
3aebd81
Updated doc with lead event
nicolas-brugneaux-sociomantic Mar 31, 2015
d055c3e
Merge branch 'master' of https://github.com/nicolas-brugneaux-socioma…
nonelse Mar 31, 2015
9da226d
Clean up doc/sociomantic_plugin.md
wellle Mar 31, 2015
f8a592d
New framework target
nonelse Mar 30, 2015
f17aa90
New adjust framework
nonelse Mar 30, 2015
d98e0b2
Default xcode configuration
nonelse Mar 31, 2015
c2c54c2
Remove unnecessary
nonelse Mar 31, 2015
43e97a5
Move framework to release page
nonelse Mar 31, 2015
38dfd6f
New version 4.1.1
nonelse Mar 31, 2015
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
4 changes: 2 additions & 2 deletions Adjust.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Pod::Spec.new do |s|
s.name = "Adjust"
s.version = "4.1.0"
s.version = "4.1.1"
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.1.0" }
s.source = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.1.1" }
s.platform = :ios, '4.3'
s.framework = 'SystemConfiguration'
s.weak_framework = 'AdSupport', 'iAd'
Expand Down
152 changes: 146 additions & 6 deletions Adjust.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Adjust/ADJUtil.m
View file
Open in desktop
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.1.0";
static NSString * const kClientSdk = @"ios4.1.1";

static NSString * const kDateFormat = @"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'Z";
static NSDateFormatter *dateFormat;
Expand Down
1 change: 0 additions & 1 deletion Adjust/Adjust.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
// Copyright (c) 2012-2014 adjust GmbH. All rights reserved.
//

#import "ADJLogger.h"
#import "ADJEvent.h"
#import "ADJAttribution.h"
#import "ADJConfig.h"
Expand Down
2 changes: 1 addition & 1 deletion AdjustTests/ADJActivityHandlerTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ - (void)testFirstRun
ADJActivityPackage *activityPackage = (ADJActivityPackage *) self.packageHandlerMock.packageQueue[0];

// check the Sdk version is being tested
XCTAssertEqual(@"ios4.1.0", activityPackage.clientSdk, @"%@", activityPackage.extendedString);
XCTAssertEqual(@"ios4.1.1", activityPackage.clientSdk, @"%@", activityPackage.extendedString);

// check the server url
XCTAssertEqual(@"https://app.adjust.com", ADJUtil.baseUrl);
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ If you're using [CocoaPods][cocoapods], you can add the following line to your
`Podfile` and continue with [step 3](#step3):

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

### 1. Get the SDK
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.1.0
4.1.1
2 changes: 1 addition & 1 deletion doc/migrate.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Migrate your adjust SDK for iOS to v4.1.0 from v3.4.0
## Migrate your adjust SDK for iOS to v4.1.1 from v3.4.0

### Initial setup

Expand Down
Loading