Merge pull request #229 from Countly/linter_changes

linter fixes for pods

Author: ArtursKadikis

Countly.xcodeproj/project.pbxproj

@@ -48,8 +48,8 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		1A3A576229ED47A20041B7BE /* CountlyServerConfig.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CountlyServerConfig.m; sourceTree = "<group>"; };
-		1A3A576429ED47B50041B7BE /* CountlyServerConfig.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CountlyServerConfig.h; sourceTree = "<group>"; };
+		1A3A576229ED47A20041B7BE /* CountlyServerConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CountlyServerConfig.m; sourceTree = "<group>"; };
+		1A3A576429ED47B50041B7BE /* CountlyServerConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CountlyServerConfig.h; sourceTree = "<group>"; };
 		3B20A9822245225A00E3D7AE /* Countly.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Countly.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		3B20A9852245225A00E3D7AE /* Countly.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Countly.h; sourceTree = "<group>"; };
 		3B20A9862245225A00E3D7AE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -211,7 +211,7 @@
 		3B20A9792245225A00E3D7AE /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1340;
+				LastUpgradeCheck = 1410;
 				ORGANIZATIONNAME = "Alin Radut";
 				TargetAttributes = {
 					3B20A9812245225A00E3D7AE = {

Countly.xcodeproj/xcshareddata/xcschemes/Countly.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1340"
+   LastUpgradeVersion = "1410"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

CountlyCommon.h

@@ -6,6 +6,7 @@
 
 #import <Foundation/Foundation.h>
 #import "Countly.h"
+#import "CountlyServerConfig.h"
 #import "CountlyPersistency.h"
 #import "CountlyConnectionManager.h"
 #import "CountlyEvent.h"
@@ -22,7 +23,6 @@
 #import "CountlyLocationManager.h"
 #import "CountlyRemoteConfig.h"
 #import "CountlyPerformanceMonitoring.h"
-#import "CountlyServerConfig.h"
 
 #define CLY_LOG_E(fmt, ...) CountlyInternalLog(CLYInternalLogLevelError, fmt, ##__VA_ARGS__)
 #define CLY_LOG_W(fmt, ...) CountlyInternalLog(CLYInternalLogLevelWarning, fmt, ##__VA_ARGS__)

CountlyServerConfig.h

@@ -6,14 +6,15 @@
 
 #import <Foundation/Foundation.h>
 
+extern NSString* const kCountlySCKeySC;
+
 @interface CountlyServerConfig : NSObject
-#if (TARGET_OS_IOS)
 + (instancetype)sharedInstance;
 
 - (void)fetchServerConfig;
 
-@property (nonatomic) BOOL trackingEnabled;
-@property (nonatomic) BOOL networkingEnabled;
-#endif
+- (BOOL)trackingEnabled;
+- (BOOL)networkingEnabled;
+
 @end
 

CountlyServerConfig.m

@@ -5,18 +5,16 @@
 // Please visit www.count.ly for more information.
 
 #import "CountlyCommon.h"
-#if (TARGET_OS_IOS)
-#import <WebKit/WebKit.h>
-#endif
 
-NSString* const kCountlySCKeySC             = @"sc";
+@interface CountlyServerConfig ()
+@property (nonatomic) BOOL trackingEnabled;
+@property (nonatomic) BOOL networkingEnabled;
+@end
 
-@implementation CountlyServerConfig
+NSString* const kCountlySCKeySC = @"sc";
 
-@synthesize trackingEnabled = _trackingEnabled;
-@synthesize networkingEnabled = _networkingEnabled;
+@implementation CountlyServerConfig
 
-#if (TARGET_OS_IOS)
 + (instancetype)sharedInstance
 {
     if (!CountlyCommon.sharedInstance.hasStarted)
@@ -155,5 +153,4 @@ - (NSURLRequest *)serverConfigRequest
     CLY_LOG_D(@"serverConfigRequest URL :%@", URL);
 }
 
-#endif
 @end