Skip to content

Commit

Permalink
Merge pull request #137 from snowplow/release/0.3.1
Browse files Browse the repository at this point in the history
Release/0.3.1
  • Loading branch information
alexanderdean committed Feb 17, 2015
2 parents 1e061f7 + f20be3a commit 3c8ddc1
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 39 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
Version 0.3.1 (2015-02-17)
--------------------------
Replaced SnowplowRequest.h with SnowplowEmitter.h as a public header, thanks @hamidp! (#133)
Excluded CoreTelephony dependency for OS X, thanks @duncan! (#134)
Removed AFNetworking dependency from podspec, thanks @duncan! (#136)
Adjusted logging to emit debug logs for Snowplow collector only when SNOWPLOW_DEBUG defined, thanks @atdrendel! (#131)

Version 0.3.0 (2015-02-15)
--------------------------
Reverted from AFnetworking to standard NSURLSession, thanks @atdrendel and @duncan! (#88)
Expand Down
13 changes: 0 additions & 13 deletions Snowplow-OSX/Snowplow_OSX.h

This file was deleted.

13 changes: 0 additions & 13 deletions Snowplow-OSX/Snowplow_OSX.m

This file was deleted.

2 changes: 1 addition & 1 deletion Snowplow/Snowplow-Prefix.pch
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#import <Foundation/Foundation.h>
#endif

#ifdef DEBUG
#ifdef SNOWPLOW_DEBUG
# define DLog(...) NSLog(__VA_ARGS__)
#else
# define DLog(...)
Expand Down
6 changes: 3 additions & 3 deletions Snowplow/SnowplowEmitter.m
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ - (void) flushBuffer {
}

} else {
DLog(@"Invalid httpMethod provided. Use \"POST\" or \"GET\".");
NSLog(@"Invalid httpMethod provided. Use \"POST\" or \"GET\".");
}
[_buffer removeAllObjects];
}
Expand All @@ -181,7 +181,7 @@ - (void) sendPostData:(NSDictionary *)postData withDbIndexArray:(NSMutableArray
NSError *error) {
if (error)
{
DLog(@"Error: %@", error);
NSLog(@"Error: %@", error);
for (int i=0; i < dbIndexArray.count; i++) {
[_db removePendingWithId:(long long int)dbIndexArray[i]];
}
Expand Down Expand Up @@ -220,7 +220,7 @@ - (void) sendGetData:(NSDictionary *)getData withDbIndexArray:(NSMutableArray *)
NSURLResponse *response,
NSError *error) {
if (error) {
DLog(@"Error: %@", error);
NSLog(@"Error: %@", error);
for (int i=0; i < dbIndexArray.count; i++) {
[_db removePendingWithId:(long long int)dbIndexArray[i]];
}
Expand Down
2 changes: 1 addition & 1 deletion Snowplow/SnowplowEventStore.m
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ - (long long int) insertDicitionaryData:(NSDictionary *)dict {

- (BOOL) removeEventWithId:(long long int)id_ {
if([_db open]) {
NSLog(@"Removing %lld from database now.", id_);
DLog(@"Removing %lld from database now.", id_);
return [_db executeUpdate:_queryDeleteId, [NSNumber numberWithLongLong:id_]];
} else {
return false;
Expand Down
4 changes: 2 additions & 2 deletions Snowplow/SnowplowTracker.m
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ @implementation SnowplowTracker {
Boolean const kDefaultEncodeBase64 = true;

#if TARGET_OS_IPHONE
NSString * const kVersion = @"ios-0.3.0";
NSString * const kVersion = @"ios-0.3.1";
#else
NSString * const kVersion = @"osx-0.3.0";
NSString * const kVersion = @"osx-0.3.1";
#endif

@synthesize collector;
Expand Down
10 changes: 5 additions & 5 deletions SnowplowTracker.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "SnowplowTracker"
s.version = "0.3.0"
s.version = "0.3.1"
s.summary = "Snowplow event tracker for iOS 7+. Add analytics to your iOS apps and games."
s.description = <<-DESC
Snowplow is a mobile and event analytics platform with a difference: rather than tell our users how they should analyze their data, we deliver their event-level data in their own data warehouse, on their own Amazon Redshift or Postgres database, so they can analyze it any way they choose. Snowplow mobile is used by data-savvy games companies and app developers to better understand their users and how they engage with their games and applications. Snowplow is open source using the business-friendly Apache License, Version 2.0 and scales horizontally to many billions of events.
Expand All @@ -20,14 +20,14 @@ Pod::Spec.new do |s|

s.source_files = 'Snowplow/*.{m,h}'

s.public_header_files = ['Snowplow/SnowplowTracker.h', 'Snowplow/SnowplowPayload.h', 'Snowplow/SnowplowRequest.h']
s.public_header_files = ['Snowplow/SnowplowTracker.h', 'Snowplow/SnowplowPayload.h', 'Snowplow/SnowplowEmitter.h']

s.frameworks = 'CoreTelephony', 'UIKit', 'Foundation'
s.ios.frameworks = 'CoreTelephony', 'UIKit', 'Foundation'
s.osx.frameworks = 'AppKit', 'Foundation'
s.dependency 'FMDB', '~> 2.3'
s.dependency 'AFNetworking', '~> 2.0'

s.prefix_header_contents = <<-EOS
#ifdef DEBUG
#ifdef SNOWPLOW_DEBUG
# define DLog(...) NSLog(__VA_ARGS__)
#else
# define DLog(...)
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.3.0
0.3.1

0 comments on commit 3c8ddc1

Please sign in to comment.