Change return type of init methods to instancetype instead of id

orta · Jun 23, 2016 · 8ec6a28 · 8ec6a28
1 parent 27db3ac
commit 8ec6a28
Show file tree

Hide file tree

Showing 47 changed files with 62 additions and 60 deletions.
diff --git a/ARAnalyticalProvider.h b/ARAnalyticalProvider.h
@@ -6,7 +6,7 @@ extern NSString *const ARAnalyticalProviderNewPageViewEventScreenPropertyKey;
 @interface ARAnalyticalProvider : NSObject
 
 /// Init
-- (id)initWithIdentifier:(NSString *)identifier;
+- (instancetype)initWithIdentifier:(NSString *)identifier;
 
 /// Set a per user property
 - (void)setUserProperty:(NSString *)property toValue:(id)value;

diff --git a/ARAnalyticalProvider.m b/ARAnalyticalProvider.m
@@ -18,7 +18,7 @@ @interface ARAnalyticalProvider () {
 
 @implementation ARAnalyticalProvider
 
-- (id)initWithIdentifier:(NSString *)identifier {
+- (instancetype)initWithIdentifier:(NSString *)identifier {
     return [super init];
 }
 

diff --git a/Providers/AdjustProvider.m b/Providers/AdjustProvider.m
@@ -11,7 +11,7 @@
 
 @implementation AdjustProvider
 
-- (id)initWithIdentifier:(NSString *)identifier {
+- (instancetype)initWithIdentifier:(NSString *)identifier {
     return [self initWithIdentifier:identifier andConfigurationDelegate:nil];
 }
 

diff --git a/Providers/AdobeProvider.h b/Providers/AdobeProvider.h
@@ -4,7 +4,7 @@ extern NSString const *AdobeProviderCallsTrackStateForPageViewsWithProperties;
 
 @interface AdobeProvider : ARAnalyticalProvider
 
-- (id)initWithData:(NSDictionary *)additionalData;
-- (id)initWithData:(NSDictionary *)additionalData settings:(NSDictionary*)settings;
+- (instancetype)initWithData:(NSDictionary *)additionalData;
+- (instancetype)initWithData:(NSDictionary *)additionalData settings:(NSDictionary*)settings;
 
 @end
diff --git a/Providers/AdobeProvider.m b/Providers/AdobeProvider.m
@@ -18,11 +18,11 @@ @interface AdobeProvider ()
 @implementation AdobeProvider
 #ifdef AR_ADOBE_EXISTS
 
-- (id)initWithData:(NSDictionary *)additionalData {
+- (instancetype)initWithData:(NSDictionary *)additionalData {
     return [self initWithData:additionalData settings:nil];
 }
 
-- (id)initWithData:(NSDictionary *)additionalData settings:(NSDictionary*)settings {
+- (instancetype)initWithData:(NSDictionary *)additionalData settings:(NSDictionary*)settings {
     NSAssert([ADBMobile class], @"Adobe is not included");
     if(additionalData) {
         [ADBMobile collectLifecycleDataWithAdditionalData:additionalData];
@@ -37,7 +37,7 @@ - (id)initWithData:(NSDictionary *)additionalData settings:(NSDictionary*)settin
     return self;
 }
 
-- (id)initWithIdentifier:(NSString *)identifier
+- (instancetype)initWithIdentifier:(NSString *)identifier
 {
 	return [self initWithData:nil];
 }

diff --git a/Providers/AmplitudeProvider.m b/Providers/AmplitudeProvider.m
@@ -4,7 +4,7 @@
 @implementation AmplitudeProvider
 #ifdef AR_AMPLITUDE_EXISTS
 
--(id)initWithIdentifier:(NSString *)identifier {
+-(instancetype)initWithIdentifier:(NSString *)identifier {
     NSAssert([Amplitude class], @"Amplitude is not included");
     [[Amplitude instance] initializeApiKey:identifier];
 

diff --git a/Providers/AppsFlyerProvider.m b/Providers/AppsFlyerProvider.m
@@ -7,7 +7,7 @@
 @implementation AppsFlyerProvider
 #ifdef AR_APPSFLYER_EXISTS
 
-- (id)initWithIdentifier:(NSString *)identifier {
+- (instancetype)initWithIdentifier:(NSString *)identifier {
     NSLog(@"Use -[AppsFlyerProvider initWithAppID:devKey:] instead of %s", __PRETTY_FUNCTION__);
     [self doesNotRecognizeSelector:_cmd];
     return nil;

diff --git a/Providers/AppseeProvider.m b/Providers/AppseeProvider.m
@@ -4,7 +4,7 @@
 @implementation AppseeProvider
 #ifdef AR_APPSEE_EXISTS
 
--(id)initWithIdentifier:(NSString *)identifier {
+-(instancetype)initWithIdentifier:(NSString *)identifier {
     NSAssert([Appsee class], @"Appsee is not included");
     [Appsee start:identifier];
 

diff --git a/Providers/BranchProvider.h b/Providers/BranchProvider.h
@@ -7,6 +7,6 @@
 
 @interface BranchProvider : ARAnalyticalProvider
 
-- (id)initWithAPIKey:(NSString *)key;
+- (instancetype)initWithAPIKey:(NSString *)key;
 
 @end
diff --git a/Providers/BranchProvider.m b/Providers/BranchProvider.m
@@ -9,7 +9,7 @@
 @implementation BranchProvider
 
 #ifdef AR_BRANCH_EXISTS
-- (id)initWithAPIKey:(NSString *)key {
+- (instancetype)initWithAPIKey:(NSString *)key {
     NSAssert([Branch class], @"Branch is not included");
     [Branch getInstance:key];
     return [super init];

diff --git a/Providers/BugsnagProvider.m b/Providers/BugsnagProvider.m
@@ -4,7 +4,7 @@
 @implementation BugsnagProvider
 #ifdef AR_BUGSNAP_EXISTS
 
-- (id)initWithIdentifier:(NSString *)identifier {
+- (instancetype)initWithIdentifier:(NSString *)identifier {
     NSAssert([Bugsnag class], @"Bugsnag is not included");
     [Bugsnag startBugsnagWithApiKey:identifier];
 

diff --git a/Providers/ChartbeatProvider.m b/Providers/ChartbeatProvider.m
@@ -15,7 +15,7 @@ @interface ChartbeatProvider ()
 @implementation ChartbeatProvider
 #ifdef AR_CHARTBEAT_EXISTS
 
-- (id)initWithIdentifier:(NSString *)identifier
+- (instancetype)initWithIdentifier:(NSString *)identifier
 {
     [[CBTracker sharedTracker] startTrackerWithAccountID:identifier.intValue];
     return self;

diff --git a/Providers/CountlyProvider.h b/Providers/CountlyProvider.h
@@ -1,5 +1,7 @@
 #import "ARAnalyticalProvider.h"
 
 @interface CountlyProvider : ARAnalyticalProvider
-- (id)initWithAppKey:(NSString *)appKey andHost:(NSString *)host;
+
+- (instancetype)initWithAppKey:(NSString *)appKey andHost:(NSString *)host;
+
 @end
diff --git a/Providers/CountlyProvider.m b/Providers/CountlyProvider.m
@@ -3,7 +3,7 @@
 
 @implementation CountlyProvider
 
-- (id)initWithAppKey:(NSString *)appKey andHost:(NSString *)host {
+- (instancetype)initWithAppKey:(NSString *)appKey andHost:(NSString *)host {
 #ifdef AR_COUNTLY_EXISTS
     NSAssert([Countly class], @"Countly is not included");
     if (host) {

diff --git a/Providers/CrashlyticsProvider.m b/Providers/CrashlyticsProvider.m
@@ -4,7 +4,7 @@
 @implementation CrashlyticsProvider
 #ifdef AR_CRASHLYTICS_EXISTS
 
-- (id)initWithIdentifier:(NSString *)identifier {
+- (instancetype)initWithIdentifier:(NSString *)identifier {
     NSAssert([Crashlytics class], @"Crashlytics is not included");
     NSAssert([[Crashlytics class] respondsToSelector:@selector(version)], @"Crashlytics library not installed correctly.");
     [Crashlytics startWithAPIKey:identifier];

diff --git a/Providers/CrittercismProvider.m b/Providers/CrittercismProvider.m
@@ -4,7 +4,7 @@
 @implementation CrittercismProvider
 #ifdef AR_CRITTERCISM_EXISTS
 
-- (id)initWithIdentifier:(NSString *)identifier {
+- (instancetype)initWithIdentifier:(NSString *)identifier {
     NSAssert([Crittercism class], @"Crittercism is not included");
     [Crittercism enableWithAppID:identifier];
 

diff --git a/Providers/FabricProvider.h b/Providers/FabricProvider.h
@@ -16,5 +16,5 @@ OBJC_EXTERN void CLSLog(NSString *format, ...) NS_FORMAT_FUNCTION(1,2);
 
 
 @interface FabricProvider : ARAnalyticalProvider
-- (id)initWithKits:(NSArray *)kits;
+- (instancetype)initWithKits:(NSArray *)kits;
 @end
diff --git a/Providers/FabricProvider.m b/Providers/FabricProvider.m
@@ -54,7 +54,7 @@ + (void)logCustomEventWithName:(NSString *)eventName
 @implementation FabricProvider
 #ifdef AR_FABRIC_EXISTS
 
-- (id)initWithKits:(NSArray *)kits {
+- (instancetype)initWithKits:(NSArray *)kits {
 
     NSAssert([Fabric class], @"Fabric is not included");
     NSAssert([[Fabric class] respondsToSelector:@selector(sharedSDK)], @"Fabric library not installed correctly.");

diff --git a/Providers/FirebaseProvider.m b/Providers/FirebaseProvider.m
@@ -5,7 +5,7 @@
 @implementation FirebaseProvider
 #ifdef AR_FIREBASE_EXISTS
 
-- (id)initWithIdentifier:(NSString *)identifier {
+- (instancetype)initWithIdentifier:(NSString *)identifier {
     NSAssert([FIRApp class], @"Firebase SDK is not included");
     NSAssert([FIRAnalytics class], @"Firebase SDK is not included");
 

diff --git a/Providers/FlurryProvider.m b/Providers/FlurryProvider.m
@@ -5,7 +5,7 @@
 @implementation FlurryProvider
 #ifdef AR_FLURRY_EXISTS
 
-- (id)initWithIdentifier:(NSString *)identifier {
+- (instancetype)initWithIdentifier:(NSString *)identifier {
     NSAssert([Flurry class], @"Flurry is not included");
     [Flurry startSession:identifier];
 

diff --git a/Providers/GoogleAnalyticsProvider.m b/Providers/GoogleAnalyticsProvider.m
@@ -16,7 +16,7 @@ - (void) dispatchGA;
 @implementation GoogleAnalyticsProvider
 #ifdef AR_GOOGLEANALYTICS_EXISTS
 
-- (id)initWithIdentifier:(NSString *)identifier {
+- (instancetype)initWithIdentifier:(NSString *)identifier {
     NSAssert([GAI class], @"Google Analytics SDK is not included");
 
     if ((self = [super init])) {

diff --git a/Providers/HeapAnalyticsProvider.m b/Providers/HeapAnalyticsProvider.m
@@ -5,7 +5,7 @@ @implementation HeapAnalyticsProvider
 
 #ifdef AR_HEAPANALYTICS_EXISTS
 
--(id)initWithIdentifier:(id)identifier {
+-(instancetype)initWithIdentifier:(id)identifier {
     NSAssert([Heap class], @"Heap is not included");
     [Heap setAppId:identifier];
 

diff --git a/Providers/HelpshiftProvider.h b/Providers/HelpshiftProvider.h
@@ -9,7 +9,7 @@
 
 @interface HelpshiftProvider : ARAnalyticalProvider
 
-- (id)initWithAppID:(NSString *)appID domainName:(NSString *)domainName apiKey:(NSString *)apiKey;
+- (instancetype)initWithAppID:(NSString *)appID domainName:(NSString *)domainName apiKey:(NSString *)apiKey;
 
 @end
 
diff --git a/Providers/HelpshiftProvider.m b/Providers/HelpshiftProvider.m
@@ -12,7 +12,7 @@
 @implementation HelpshiftProvider
 #ifdef AR_HELPSHIFT_EXISTS
 
-- (id)initWithAppID:(NSString *)appID domainName:(NSString *)domainName apiKey:(NSString *)apiKey {
+- (instancetype)initWithAppID:(NSString *)appID domainName:(NSString *)domainName apiKey:(NSString *)apiKey {
     NSAssert([Helpshift class], @"Helpshift is not included");
 
     [Helpshift installForApiKey:apiKey domainName:domainName appID:appID withOptions:nil];

diff --git a/Providers/HockeyAppOSXProvider.m b/Providers/HockeyAppOSXProvider.m
@@ -34,7 +34,7 @@ @interface HockeyAppOSXProvider () <BITHockeyManagerDelegate, BITCrashManagerDel
 
 @implementation HockeyAppOSXProvider
 
--(id)initWithIdentifier:(NSString *)identifier {
+-(instancetype)initWithIdentifier:(NSString *)identifier {
     self = [super init];
     if (!self) return nil;
 

diff --git a/Providers/HockeyAppProvider.h b/Providers/HockeyAppProvider.h
@@ -1,5 +1,5 @@
 #import "ARAnalyticalProvider.h"
 
 @interface HockeyAppProvider : ARAnalyticalProvider
--(id)initWithBetaIdentifier:(NSString *)betaIdentifier liveIdentifier:(NSString *)liveIdentfier;
+-(instancetype)initWithBetaIdentifier:(NSString *)betaIdentifier liveIdentifier:(NSString *)liveIdentfier;
 @end
diff --git a/Providers/HockeyAppProvider.m b/Providers/HockeyAppProvider.m
@@ -43,11 +43,11 @@ @interface HockeyAppProvider () <BITHockeyManagerDelegate, BITUpdateManagerDeleg
 
 @implementation HockeyAppProvider
 
--(id)initWithIdentifier:(NSString *)identifier {
+-(instancetype)initWithIdentifier:(NSString *)identifier {
     return [self initWithBetaIdentifier:identifier liveIdentifier:nil];
 }
 
--(id)initWithBetaIdentifier:(NSString *)betaIdentifier liveIdentifier:(NSString *)liveIdentfier {
+-(instancetype)initWithBetaIdentifier:(NSString *)betaIdentifier liveIdentifier:(NSString *)liveIdentfier {
     self = [super init];
     if (!self) return nil;
 

diff --git a/Providers/InstallTrackerProvider.m b/Providers/InstallTrackerProvider.m
@@ -5,7 +5,7 @@
 @implementation InstallTrackerProvider
 #ifdef AR_INSTALLTRACKER_EXISTS
 
-- (id)initWithIdentifier:(NSString *)identifier {
+- (instancetype)initWithIdentifier:(NSString *)identifier {
     NSAssert([InstallTracker class], @"InstallTracker is not included");
     [InstallTracker setApplicationID:identifier];
 

diff --git a/Providers/KISSMetricsProvider.m b/Providers/KISSMetricsProvider.m
@@ -4,7 +4,7 @@
 @implementation KISSMetricsProvider
 #ifdef AR_KISSMETRICS_EXISTS
 
-- (id)initWithIdentifier:(NSString *)identifier {
+- (instancetype)initWithIdentifier:(NSString *)identifier {
     NSAssert([KISSMetricsAPI class], @"KISSMetrics is not included");
     [KISSMetricsAPI sharedAPIWithKey:identifier];
 

diff --git a/Providers/LaunchKitProvider.m b/Providers/LaunchKitProvider.m
@@ -4,7 +4,7 @@
 @implementation LaunchKitProvider
 #ifdef AR_LAUNCHKIT_EXISTS
 
--(id)initWithIdentifier:(NSString *)identifier {
+-(instancetype)initWithIdentifier:(NSString *)identifier {
     NSAssert([LaunchKit class], @"LaunchKit is not included");
     [LaunchKit launchWithToken:identifier];
 

diff --git a/Providers/LeanplumProvider.h b/Providers/LeanplumProvider.h
@@ -2,7 +2,7 @@
 
 @interface LeanplumProvider : ARAnalyticalProvider
 
-- (id)initWithIdentifier:(NSString *)identifier NS_UNAVAILABLE;
+- (instancetype)initWithIdentifier:(NSString *)identifier NS_UNAVAILABLE;
 
 /**
  * Initializes an instance of LeanplumProvider with the given parameters.

diff --git a/Providers/LocalyticsProvider.m b/Providers/LocalyticsProvider.m
@@ -13,7 +13,7 @@ - (void) stopLocalytics;
 @implementation LocalyticsProvider
 #ifdef AR_LOCALYTICS_EXISTS
 
-- (id)initWithIdentifier:(NSString *)identifier {
+- (instancetype)initWithIdentifier:(NSString *)identifier {
     NSAssert([Localytics class], @"Localytics is not included");
 
     if( ( self = [super init] ) ) {

diff --git a/Providers/MixpanelProvider.h b/Providers/MixpanelProvider.h
@@ -1,7 +1,7 @@
 #import "ARAnalyticalProvider.h"
 
 @interface MixpanelProvider : ARAnalyticalProvider
-- (id)initWithIdentifier:(NSString *)identifier andHost:(NSString *)host;
+- (instancetype)initWithIdentifier:(NSString *)identifier andHost:(NSString *)host;
 - (void)createAlias:(NSString *)alias;
 - (void)registerSuperProperties:(NSDictionary *)properties;
 - (void)addPushDeviceToken:(NSData *)deviceToken;

diff --git a/Providers/MixpanelProvider.m b/Providers/MixpanelProvider.m
@@ -10,11 +10,11 @@ @interface MixpanelProvider()
 
 @implementation MixpanelProvider
 
-- (id)initWithIdentifier:(NSString *)identifier {
+- (instancetype)initWithIdentifier:(NSString *)identifier {
     return [self initWithIdentifier:identifier andHost:nil];
 }
 
-- (id)initWithIdentifier:(NSString *)identifier andHost:(NSString *)host {
+- (instancetype)initWithIdentifier:(NSString *)identifier andHost:(NSString *)host {
 #ifdef AR_MIXPANEL_EXISTS
 
     NSAssert([Mixpanel class], @"Mixpanel is not included");

diff --git a/Providers/NewRelicProvider.m b/Providers/NewRelicProvider.m
@@ -3,7 +3,7 @@
 
 @implementation NewRelicProvider
 
-- (id)initWithIdentifier:(NSString *)identifier {
+- (instancetype)initWithIdentifier:(NSString *)identifier {
     NSAssert([NewRelic class], @"NewRelic is not included");
     [NewRelic startWithApplicationToken:identifier];
 

diff --git a/Providers/SegmentioProvider.h b/Providers/SegmentioProvider.h
@@ -6,5 +6,5 @@
 #import "ARAnalyticalProvider.h"
 
 @interface SegmentioProvider : ARAnalyticalProvider
-- (id)initWithIdentifier:(NSString *)identifier integrations:(NSArray *)integrations;
+- (instancetype)initWithIdentifier:(NSString *)identifier integrations:(NSArray *)integrations;
 @end
diff --git a/Providers/SegmentioProvider.m b/Providers/SegmentioProvider.m
@@ -18,10 +18,10 @@ @interface SegmentioProvider ()
 @implementation SegmentioProvider
 
 #ifdef AR_SEGMENTIO_EXISTS
-- (id)initWithIdentifier:(NSString *)identifier {
+- (instancetype)initWithIdentifier:(NSString *)identifier {
 	return [self initWithIdentifier:identifier integrations:nil];
 }
-- (id)initWithIdentifier:(NSString *)identifier integrations:(NSArray *)integrations {
+- (instancetype)initWithIdentifier:(NSString *)identifier integrations:(NSArray *)integrations {
     if ((self = [super initWithIdentifier:identifier])) {
 		SEGAnalyticsConfiguration *config = [SEGAnalyticsConfiguration configurationWithWriteKey:identifier];
 		for (id integration in integrations) {

diff --git a/Providers/SentryProvider.m b/Providers/SentryProvider.m
@@ -13,7 +13,7 @@
 
 @implementation SentryProvider
 
-- (id)initWithIdentifier:(NSString *)identifier {
+- (instancetype)initWithIdentifier:(NSString *)identifier {
     NSAssert([RavenClient class], @"Raven is not included");
     NSAssert([[RavenClient class] respondsToSelector:@selector(sharedClient)], @"Raven-ios library not installed correctly.");
     [RavenClient setSharedClient:[RavenClient clientWithDSN:identifier]];

diff --git a/Providers/SnowPlowProvider.h b/Providers/SnowPlowProvider.h
@@ -8,8 +8,8 @@
 @class SnowplowEmitter;
 @interface SnowplowProvider : ARAnalyticalProvider
 
-- (id)initWithAddress:(NSString *)address;
-- (id)initWithAddress:(NSString *)address appID:(NSString *)appID namespace:(NSString *)namespace;
-- (id)initWithEmitter:(SnowplowEmitter *)emitter appID:(NSString *)appID namespace:(NSString *)namespace;
+- (instancetype)initWithAddress:(NSString *)address;
+- (instancetype)initWithAddress:(NSString *)address appID:(NSString *)appID namespace:(NSString *)namespace;
+- (instancetype)initWithEmitter:(SnowplowEmitter *)emitter appID:(NSString *)appID namespace:(NSString *)namespace;
 
 @end
diff --git a/Providers/SnowPlowProvider.m b/Providers/SnowPlowProvider.m
@@ -15,19 +15,19 @@ @interface SnowplowProvider ()
 
 @implementation SnowplowProvider
 
-- (id)initWithAddress:(NSString *)address
+- (instancetype)initWithAddress:(NSString *)address
 {
     NSString *bundleID  = [[NSBundle mainBundle] bundleIdentifier];
     return [self initWithAddress:address appID:bundleID namespace:nil];
 }
 
-- (id)initWithAddress:(NSString *)address appID:(NSString *)appID namespace:(NSString *)namespace
+- (instancetype)initWithAddress:(NSString *)address appID:(NSString *)appID namespace:(NSString *)namespace
 {
     SnowplowEmitter *emitter = [[SnowplowEmitter alloc] initWithURLRequest:[NSURL URLWithString:address]];
     return [self initWithEmitter:emitter appID:appID namespace:namespace];
 }
 
-- (id)initWithEmitter:(SnowplowEmitter *)emitter appID:(NSString *)appID namespace:(NSString *)namespace
+- (instancetype)initWithEmitter:(SnowplowEmitter *)emitter appID:(NSString *)appID namespace:(NSString *)namespace
 {
     self = [super initWithIdentifier:appID];
     if (!self) return nil;