Skip to content

Commit

Permalink
switch version checking to use CFBundleShortVersionString,
Browse files Browse the repository at this point in the history
changed from FlurryAnalytics to Flurry
  • Loading branch information
Gary Morris committed Sep 25, 2014
1 parent 8a024dd commit d81bb11
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Utils/Utilities.h
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ void listFiles(NSString* directory, NSString* indent);
BOOL isFileInDocuments(NSURL* fileURL);

//----------------------------------------------------------------------
// logs the event to the FlurryAnalytics.h or
// logs the event to the Flurry.h or
// logs to NSLog (if FLURRYAPI is not defined)
//----------------------------------------------------------------------
void logEvent(NSString* description);
Expand Down
10 changes: 5 additions & 5 deletions Utils/Utilities.m
Original file line number Diff line number Diff line change
Expand Up @@ -478,13 +478,13 @@ BOOL isFileInDocuments(NSURL* fileURL)
}

//----------------------------------------------------------------------
// logs the event to the FlurryAnalytics.h
// logs the event to the Flurry.h
// (or to NSLog if in development)
//----------------------------------------------------------------------
void logEvent(NSString* description)
{
#if defined(FLURRYAPI) && !(TARGET_IPHONE_SIMULATOR)
// count/log events using the FlurryAnalytics.h
// count/log events using the Flurry.h
[Flurry logEvent:description];
#else
NSLog(@"logEvent: %@", description);
Expand All @@ -501,7 +501,7 @@ void logError(NSString* error, NSString* format, ...)
va_end (args);

#if defined(FLURRYAPI) && !(TARGET_IPHONE_SIMULATOR)
// count/log events using the FlurryAnalytics.h
// count/log events using the Flurry.h
[Flurry logError:error message:message exception:NULL];
#endif
NSLog(@"ERROR: %@ %@", error, message);
Expand All @@ -519,7 +519,7 @@ void logException(NSException* exc, NSString* format, ...)
va_end (args);

#if defined(FLURRYAPI) && !(TARGET_IPHONE_SIMULATOR)
// count/log events using the FlurryAnalytics.h
// count/log events using the Flurry.h
[Flurry logError:@"exception" message:message exception:exc];
#endif
NSLog(@"ERROR: %@, %@, %@", exc.name, exc.reason, message);
Expand Down Expand Up @@ -589,7 +589,7 @@ +(BOOL)isCompatibleWithMinReqdVersion:(NSString*)minReqdVersion
if (minReqdVersion==nil) return YES; // no requirement

NSDictionary* infoDict = [[NSBundle mainBundle] infoDictionary];
NSString* runningVersion = [infoDict objectForKey:@"CFBundleVersion"];
NSString* runningVersion = [infoDict objectForKey:@"CFBundleShortVersionString"];

NSArray* minReqdArray = [minReqdVersion componentsSeparatedByString:@"."];
NSArray* runningArray = [runningVersion componentsSeparatedByString:@"."];
Expand Down

0 comments on commit d81bb11

Please sign in to comment.