Update fork with upstream master

Analytics.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name             = "Analytics"
   s.module_name      = "Segment"
-  s.version          = "4.1.3"
+  s.version          = "4.1.4"
   s.summary          = "The hassle-free way to add analytics to your iOS app."
 
   s.description      = <<-DESC
@@ -19,8 +19,6 @@ Pod::Spec.new do |s|
   s.tvos.deployment_target = '10.0'
   s.osx.deployment_target = '10.13'
 
-  s.static_framework = true  
-
   s.source_files = [
     'Segment/Classes/**/*.{h,m}',
     'Segment/Internal/**/*.{h,m}'

CHANGELOG.md

@@ -1,5 +1,10 @@
 Change Log
 ==========
+Version 4.1.4 *(3 May, 2021)*
+-----------------------------
+* [Fix](https://github.com/segmentio/analytics-ios/pull/994) Add missing import in Segment.h for Xcode 12.5
+* [Fix](https://github.com/segmentio/analytics-ios/pull/995) Revert static lib podspec change.
+
 Version 4.1.3 *(27 January, 2021)*
 -----------------------------
 * [Fix](https://github.com/segmentio/analytics-ios/pull/982) Pull IDFA if it has changed and rebuild context if necessary.

README.md

@@ -1,3 +1,9 @@
+## Developer Feedback Requested: Analytics-Swift Pilot
+
+**A pilot release of the new Analytics-Swift library is available at the [Analytics-Swift repository](https://github.com/segmentio/analytics-swift). This library is governed by [Segment’s First-Access and Beta terms](https://segment.com/legal/first-access-beta-preview/), and should not be used in production scenarios.**
+
+During the pilot phase, Segment wants your feedback, contributions, and ideas. If you have requirements or ideas for features for Analytics-Swift and Segment's integration with the Apple platform, let us know.
+
 # Analytics
 [![Circle CI](https://circleci.com/gh/segmentio/analytics-ios.svg?style=shield&circle-token=31c5b3e5edeb404b30141ead9dcef3eb37d16d4d)](https://circleci.com/gh/segmentio/analytics-ios)
 [![Version](https://img.shields.io/cocoapods/v/Analytics.svg?style=flat)](https://cocoapods.org//pods/Analytics)
@@ -69,6 +75,39 @@ Note: Segment _strongly_ recommends that you use a dynamic framework to manage y
 github "segmentio/analytics-ios"
 ```
 
+### Swift Package Manager (SPM)
+
+To add analytics-ios via Swift Package Mangaer, it is possible to add it one of two ways:
+
+#### Xcode
+![Xcode Add SPM Package](https://user-images.githubusercontent.com/917994/119199146-69765200-ba3f-11eb-9173-93cfb5f3cabd.png)
+
+![ChoosePackageRepository](https://user-images.githubusercontent.com/917994/119199143-68ddbb80-ba3f-11eb-9bf2-5dc11c208abd.png)
+
+![ChoosePackageOptions](https://user-images.githubusercontent.com/917994/119199139-67ac8e80-ba3f-11eb-9941-fc541030f3df.png)
+
+
+#### Package.swift
+```
+import PackageDescription
+
+let package = Package(
+    name: "MyApplication",
+    dependencies: [
+        // Add a package containing Analytics as the name along with the git url
+        .package(
+            name: "Segment",
+            url: "git@github.com:segmentio/analytics-ios.git"
+        )
+    ],
+    targets: [
+        name: "MyApplication",
+        dependencies: ["Segment"] // Add Analytics as a dependency of your application
+    ]
+)
+```
+Note: Segment recommends that you use Xcode to add your package.
+
 ## Quickstart
 
 Refer to the Quickstart documentation at [https://segment.com/docs/libraries/ios/quickstart](https://segment.com/docs/libraries/ios/quickstart/).

Segment.xcodeproj/project.pbxproj

@@ -24,7 +24,7 @@
 		EA88A5981DED7608009FB66A /* SEGSerializableValue.h in Headers */ = {isa = PBXBuildFile; fileRef = EA88A5971DED7608009FB66A /* SEGSerializableValue.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		EA8F09741E24C5C600B8B93F /* MiddlewareTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA8F09731E24C5C600B8B93F /* MiddlewareTests.swift */; };
 		EAA542771EB4035400945DA7 /* TrackingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAA542761EB4035400945DA7 /* TrackingTests.swift */; };
-		EAA5427D1EB42B8C00945DA7 /* SEGReachability.h in Headers */ = {isa = PBXBuildFile; fileRef = EAA5427B1EB42B8C00945DA7 /* SEGReachability.h */; };
+		EAA5427D1EB42B8C00945DA7 /* SEGReachability.h in Headers */ = {isa = PBXBuildFile; fileRef = EAA5427B1EB42B8C00945DA7 /* SEGReachability.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		EAA5427E1EB42B8C00945DA7 /* SEGReachability.m in Sources */ = {isa = PBXBuildFile; fileRef = EAA5427C1EB42B8C00945DA7 /* SEGReachability.m */; };
 		EAA542801EB4382100945DA7 /* StoreKitTrackerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAA5427F1EB4382100945DA7 /* StoreKitTrackerTests.swift */; };
 		EADEB8601DECD080005322DA /* Segment.h in Headers */ = {isa = PBXBuildFile; fileRef = EADEB85E1DECD080005322DA /* Segment.h */; settings = {ATTRIBUTES = (Public, ); }; };

Segment/Classes/SEGAnalytics.m

@@ -549,7 +549,7 @@ + (NSString *)version
 {
     // this has to match the actual version, NOT what's in info.plist
     // because Apple only accepts X.X.X as versions in the review process.
-    return @"4.1.3";
+    return @"4.1.4";
 }
 
 #pragma mark - Helpers

Segment/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.1.3</string>
+	<string>4.1.4</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

Segment/Internal/SEGIntegrationsManager.h

@@ -36,7 +36,7 @@ NS_SWIFT_NAME(IntegrationsManager)
 
 // @Deprecated - Exposing for backward API compat reasons only
 - (NSString *_Nonnull)getAnonymousId;
-- (void)saveAnonymousId:(NSString *)anonymousId;
+- (void)saveAnonymousId:(NSString *_Nonnull)anonymousId;
 
 @end