Bsneed/version fixes (#966)

migs647 · Brandon Sneed · web-flow · commit 9cab0239cf80 · 2020-11-12T09:51:37.000-08:00
* Set target OS versions consistently across the board. * Fixed warning w/ shadow var * Use @import directive where possible. * Removed linked frameworks; Prefer language feature imports instead. * Fixed warning about viewDidAppear selector on macOS * Updated version numbers for all dependencies Co-authored-by: Brandon Sneed <brandon.sneed@segment.com>
diff --git a/Analytics.podspec b/Analytics.podspec
@@ -15,11 +15,9 @@ Pod::Spec.new do |s|
   s.source           = { :git => "https://github.com/segmentio/analytics-ios.git", :tag => s.version.to_s }
   s.social_media_url = 'https://twitter.com/segment'
 
-  s.ios.deployment_target = '11.0'
-  s.tvos.deployment_target = '9.0'
-
-  s.ios.frameworks = 'CoreTelephony'
-  s.frameworks = 'Security', 'StoreKit', 'SystemConfiguration', 'UIKit'
+  s.ios.deployment_target = '10.0'
+  s.tvos.deployment_target = '10.0'
+  s.osx.deployment_target = '10.13'  
 
   s.source_files = [
     'Segment/Classes/**/*.{h,m}',
diff --git a/Package.swift b/Package.swift
@@ -6,7 +6,7 @@ import PackageDescription
 let package = Package(
     name: "Segment",
     platforms: [
-        .iOS(.v12), .tvOS(.v12)
+        .iOS(.v10), .tvOS(.v10), .macOS(.v10_13)
     ],
     products: [
         // Products define the executables and libraries produced by a package, and make them visible to other packages.
@@ -31,10 +31,7 @@ let package = Package(
             cSettings: [
                 .headerSearchPath("Internal"),
                 .headerSearchPath("Classes")
-            ],
-            linkerSettings: [
-                .linkedFramework("CoreTelephony", .when(platforms: [.iOS, .macOS]))
             ]
-        ),
+        )
     ]
 )
diff --git a/Segment.xcodeproj/project.pbxproj b/Segment.xcodeproj/project.pbxproj
@@ -463,7 +463,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0810;
-				LastUpgradeCheck = 1130;
+				LastUpgradeCheck = 1200;
 				ORGANIZATIONNAME = Segment;
 				TargetAttributes = {
 					EADEB85A1DECD080005322DA = {
@@ -607,6 +607,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -634,13 +635,17 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
+				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvos appletvsimulator macosx";
 				SWIFT_VERSION = 4.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = "1,2,3";
+				TVOS_DEPLOYMENT_TARGET = 10.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
+				WATCHOS_DEPLOYMENT_TARGET = 7.0;
 			};
 			name = Debug;
 		};
@@ -669,6 +674,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -690,14 +696,18 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
+				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvos appletvsimulator macosx";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_VERSION = 4.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = "1,2,3";
+				TVOS_DEPLOYMENT_TARGET = 10.0;
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
+				WATCHOS_DEPLOYMENT_TARGET = 7.0;
 			};
 			name = Release;
 		};
@@ -722,9 +732,6 @@
 				"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
-				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvos appletvsimulator macosx";
-				TARGETED_DEVICE_FAMILY = "1,2,3";
-				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
 			name = Debug;
 		};
@@ -749,9 +756,6 @@
 				"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
-				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvos appletvsimulator macosx";
-				TARGETED_DEVICE_FAMILY = "1,2,3";
-				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
 			name = Release;
 		};
diff --git a/Segment.xcodeproj/xcshareddata/xcschemes/Segment.xcscheme b/Segment.xcodeproj/xcshareddata/xcschemes/Segment.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Segment.xcodeproj/xcshareddata/xcschemes/SegmentTests.xcscheme b/Segment.xcodeproj/xcshareddata/xcschemes/SegmentTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Segment.xcodeproj/xcshareddata/xcschemes/SegmentTestsTVOS.xcscheme b/Segment.xcodeproj/xcshareddata/xcschemes/SegmentTestsTVOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Segment/Classes/SEGAliasPayload.h b/Segment/Classes/SEGAliasPayload.h
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+@import Foundation;
 #import "SEGPayload.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Segment/Classes/SEGAnalytics.h b/Segment/Classes/SEGAnalytics.h
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+@import Foundation;
 #import "SEGIntegrationFactory.h"
 #import "SEGCrypto.h"
 #import "SEGAnalyticsConfiguration.h"
diff --git a/Segment/Classes/SEGAnalyticsConfiguration.h b/Segment/Classes/SEGAnalyticsConfiguration.h
@@ -6,12 +6,12 @@
 //  Copyright © 2016 Segment. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
+@import Foundation;
 
 #if TARGET_OS_IPHONE
-#import <UIKit/UIKit.h>
+@import UIKit;
 #elif TARGET_OS_OSX
-#import <Cocoa/Cocoa.h>
+@import Cocoa;
 #endif
 
 NS_SWIFT_NAME(ApplicationProtocol)
diff --git a/Segment/Classes/SEGAnalyticsConfiguration.m b/Segment/Classes/SEGAnalyticsConfiguration.m
@@ -11,9 +11,9 @@
 #import "SEGMiddleware.h"
 #import "SEGCrypto.h"
 #if TARGET_OS_IPHONE
-#import <UIKit/UIKit.h>
+@import UIKit;
 #elif TARGET_OS_OSX
-#import <Cocoa/Cocoa.h>
+@import Cocoa;
 #endif
 
 #if TARGET_OS_IPHONE
diff --git a/Segment/Classes/SEGAnalyticsUtils.h b/Segment/Classes/SEGAnalyticsUtils.h
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+@import Foundation;
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Segment/Classes/SEGContext.h b/Segment/Classes/SEGContext.h
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Segment. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
+@import Foundation;
 #import "SEGIntegration.h"
 
 typedef NS_ENUM(NSInteger, SEGEventType) {
diff --git a/Segment/Classes/SEGCrypto.h b/Segment/Classes/SEGCrypto.h
@@ -5,7 +5,7 @@
 //  Copyright © 2016 Segment. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
+@import Foundation;
 
 @protocol SEGCrypto <NSObject>
 
diff --git a/Segment/Classes/SEGGroupPayload.h b/Segment/Classes/SEGGroupPayload.h
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+@import Foundation;
 #import "SEGPayload.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Segment/Classes/SEGHTTPClient.h b/Segment/Classes/SEGHTTPClient.h
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+@import Foundation;
 #import "SEGAnalytics.h"
 
 // TODO: Make this configurable via SEGAnalyticsConfiguration
diff --git a/Segment/Classes/SEGIdentifyPayload.h b/Segment/Classes/SEGIdentifyPayload.h
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+@import Foundation;
 #import "SEGPayload.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Segment/Classes/SEGIntegration.h b/Segment/Classes/SEGIntegration.h
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+@import Foundation;
 #import "SEGIdentifyPayload.h"
 #import "SEGTrackPayload.h"
 #import "SEGScreenPayload.h"
diff --git a/Segment/Classes/SEGIntegrationFactory.h b/Segment/Classes/SEGIntegrationFactory.h
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+@import Foundation;
 #import "SEGIntegration.h"
 #import "SEGAnalytics.h"
 
diff --git a/Segment/Classes/SEGMiddleware.h b/Segment/Classes/SEGMiddleware.h
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Segment. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
+@import Foundation;
 #import "SEGContext.h"
 
 typedef void (^SEGMiddlewareNext)(SEGContext *_Nullable newContext);
diff --git a/Segment/Classes/SEGPayload.h b/Segment/Classes/SEGPayload.h
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+@import Foundation;
 #import "SEGSerializableValue.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Segment/Classes/SEGReachability.h b/Segment/Classes/SEGReachability.h
@@ -21,8 +21,8 @@
  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <Foundation/Foundation.h>
-#import <SystemConfiguration/SystemConfiguration.h>
+@import Foundation;
+@import SystemConfiguration;
 
 /**
  * Does ARC support GCD objects?
diff --git a/Segment/Classes/SEGScreenPayload.h b/Segment/Classes/SEGScreenPayload.h
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+@import Foundation;
 #import "SEGPayload.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Segment/Classes/SEGScreenReporting.h b/Segment/Classes/SEGScreenReporting.h
@@ -1,7 +1,7 @@
 #if TARGET_OS_IPHONE
-#import <UIKit/UIKit.h>
+@import UIKit;
 #elif TARGET_OS_OSX
-#import <Cocoa/Cocoa.h>
+@import Cocoa;
 #endif
 
 #import "SEGSerializableValue.h"
diff --git a/Segment/Classes/SEGSegmentIntegration.h b/Segment/Classes/SEGSegmentIntegration.h
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+@import Foundation;
 #import "SEGIntegration.h"
 #import "SEGHTTPClient.h"
 #import "SEGStorage.h"
diff --git a/Segment/Classes/SEGSegmentIntegration.m b/Segment/Classes/SEGSegmentIntegration.m
@@ -10,12 +10,7 @@
 #import "SEGState.h"
 
 #if TARGET_OS_IPHONE
-#import <UIKit/UIKit.h>
-#endif
-
-#if TARGET_OS_IOS
-#import <CoreTelephony/CTCarrier.h>
-#import <CoreTelephony/CTTelephonyNetworkInfo.h>
+@import UIKit;
 #endif
 
 NSString *const SEGSegmentDidSendRequestNotification = @"SegmentDidSendRequest";
diff --git a/Segment/Classes/SEGSegmentIntegrationFactory.h b/Segment/Classes/SEGSegmentIntegrationFactory.h
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+@import Foundation;
 #import "SEGIntegrationFactory.h"
 #import "SEGHTTPClient.h"
 #import "SEGStorage.h"
diff --git a/Segment/Classes/SEGSerializableValue.h b/Segment/Classes/SEGSerializableValue.h
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Segment. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
+@import Foundation;
 
 /*
  Acceptable dictionary values are
diff --git a/Segment/Classes/SEGStorage.h b/Segment/Classes/SEGStorage.h
@@ -5,7 +5,7 @@
 //  Copyright © 2016 Segment. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
+@import Foundation;
 #import "SEGCrypto.h"
 
 @protocol SEGStorage <NSObject>
diff --git a/Segment/Classes/SEGTrackPayload.h b/Segment/Classes/SEGTrackPayload.h
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+@import Foundation;
 #import "SEGPayload.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Segment/Classes/SEGWebhookIntegration.m b/Segment/Classes/SEGWebhookIntegration.m
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+@import Foundation;
 #import "SEGWebhookIntegration.h"
 #import "SEGHTTPClient.h"
 #import "SEGState.h"
diff --git a/Segment/Classes/Segment.h b/Segment/Classes/Segment.h
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Segment. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
+@import Foundation;
 
 //! Project version number for Analytics.
 FOUNDATION_EXPORT double SegmentVersionNumber;
diff --git a/Segment/Internal/NSData+SEGGZIP.h b/Segment/Internal/NSData+SEGGZIP.h
@@ -31,7 +31,7 @@
 //
 
 
-#import <Foundation/Foundation.h>
+@import Foundation;
 
 extern void *_Nullable seg_libzOpen(void);
 
diff --git a/Segment/Internal/NSViewController+SEGScreen.h b/Segment/Internal/NSViewController+SEGScreen.h
@@ -9,7 +9,7 @@
 #import "SEGSerializableValue.h"
 
 #if TARGET_OS_OSX
-#import <Cocoa/Cocoa.h>
+@import Cocoa;
 
 @interface NSViewController (SEGScreen)
 
diff --git a/Segment/Internal/NSViewController+SEGScreen.m b/Segment/Internal/NSViewController+SEGScreen.m
@@ -12,7 +12,6 @@
 #import "SEGAnalyticsUtils.h"
 #import "SEGScreenReporting.h"
 
-
 #if TARGET_OS_OSX
 @implementation NSViewController (SEGScreen)
 
@@ -22,7 +21,7 @@ + (void)seg_swizzleViewDidAppear
     dispatch_once(&onceToken, ^{
         Class class = [self class];
 
-        SEL originalSelector = @selector(viewDidAppear:);
+        SEL originalSelector = @selector(viewDidAppear);
         SEL swizzledSelector = @selector(seg_viewDidAppear:);
 
         Method originalMethod = class_getInstanceMethod(class, originalSelector);
diff --git a/Segment/Internal/SEGAES256Crypto.h b/Segment/Internal/SEGAES256Crypto.h
@@ -5,7 +5,7 @@
 //  Copyright © 2016 Segment. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
+@import Foundation;
 #import "SEGCrypto.h"
 
 
diff --git a/Segment/Internal/SEGFileStorage.h b/Segment/Internal/SEGFileStorage.h
@@ -5,7 +5,7 @@
 //  Copyright © 2016 Segment. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
+@import Foundation;
 #import "SEGStorage.h"
 
 
diff --git a/Segment/Internal/SEGIntegrationsManager.h b/Segment/Internal/SEGIntegrationsManager.h
diff --git a/Segment/Internal/SEGIntegrationsManager.m b/Segment/Internal/SEGIntegrationsManager.m
diff --git a/Segment/Internal/SEGState.h b/Segment/Internal/SEGState.h
diff --git a/Segment/Internal/SEGState.m b/Segment/Internal/SEGState.m
diff --git a/Segment/Internal/SEGStoreKitTracker.h b/Segment/Internal/SEGStoreKitTracker.h
diff --git a/Segment/Internal/SEGUserDefaultsStorage.h b/Segment/Internal/SEGUserDefaultsStorage.h
diff --git a/Segment/Internal/SEGUtils.h b/Segment/Internal/SEGUtils.h
diff --git a/Segment/Internal/SEGUtils.m b/Segment/Internal/SEGUtils.m
diff --git a/Segment/Internal/UIViewController+SEGScreen.h b/Segment/Internal/UIViewController+SEGScreen.h
diff --git a/SegmentTests/SerializationTests.m b/SegmentTests/SerializationTests.m
diff --git a/SegmentTests/Utils/NSData+SEGGUNZIPP.h b/SegmentTests/Utils/NSData+SEGGUNZIPP.h
diff --git a/SegmentTests/Utils/ObjcUtils.h b/SegmentTests/Utils/ObjcUtils.h

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#import <Foundation/Foundation.h>`
	`1`	`+@import Foundation;`
`2`	`2`	`#import "SEGPayload.h"`
`3`	`3`
`4`	`4`	`NS_ASSUME_NONNULL_BEGIN`