Update import statement for iOS 14 support.

.circleci/config.yml

@@ -3,31 +3,25 @@ version: 2
 jobs:
   build_and_test:
     macos:
-      xcode: "9.4.1"
+      xcode: "11.0"
     steps:
       - checkout
       - run: xcrun simctl list
       - run:
           name: Install build dependencies
           command: |
             sudo gem install xcpretty
-            sudo gem install cocoapods -v 1.6.1
-      # - run:
-      #     name: Fetch Cocoapods specs
-      #     command: curl https://cocoapods-specs.circleci.com/fetch-cocoapods-repo-from-s3.sh | bash -s cf
-
+            sudo gem install cocoapods -v 1.8.4
+      - run:
+          name: Fetch Cocoapods specs
+          command: curl https://cocoapods-specs.circleci.com/fetch-cocoapods-repo-from-s3.sh | bash -s cf
       - run: make install
       - run: make build
       - run: make test
       - run: make lint
 
- # - store_test_results:
- #          # relies on xcpretty --report junit
- #          path: build/reports
- #      - run: bash <(curl -s https://codecov.io/bash)
-
 workflows:
   version: 2
   build_and_test:
     jobs:
-      - build_and_test
+      - build_and_test 

Example/Podfile.lock

@@ -1,12 +1,12 @@
 PODS:
-  - Analytics (3.7.0)
+  - Analytics (4.0.5)
   - Expecta (1.0.6)
-  - Mixpanel (3.5.0)
+  - Mixpanel (3.6.0)
   - OCHamcrest (5.4.0)
   - OCMockito (3.0.2):
     - OCHamcrest (~> 5.1)
-  - Segment-Mixpanel (1.4.0):
-    - Analytics (~> 3.0)
+  - Segment-Mixpanel (1.6.1):
+    - Analytics
     - Mixpanel (~> 3.5)
   - Specta (1.0.7)
 
@@ -30,12 +30,12 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  Analytics: 77fd5fb102a4a5eedafa2c2b0245ceb7b7c15e45
+  Analytics: 4bcf052c91e1f3339219e83d6a036fb2bd7c218d
   Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5
-  Mixpanel: 399997670f5452de026449f9e9ecd52eccbb9ff7
+  Mixpanel: 446b6e7713aa34a9a3516ff7648d56551384fc94
   OCHamcrest: 5c1d441c5a82fb18ac17c2aeb52ec1a99edb971b
   OCMockito: 2cb6c2267cbc76537be56281cd47cdb5a7c27541
-  Segment-Mixpanel: 625bb010c65f66acdd976d9db240a420aa67b132
+  Segment-Mixpanel: 05d5021ffa0edc37642980ef44e03748ceb804da
   Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66
 
 PODFILE CHECKSUM: 6ff827a80dc2a21042246602306af45cb1c9f2a8

Makefile

@@ -1,5 +1,5 @@
 SDK ?= "iphonesimulator"
-DESTINATION ?= "platform=iOS Simulator,name=iPhone 7"
+DESTINATION ?= "platform=iOS Simulator,name=iPhone 8"
 PROJECT := Segment-Mixpanel
 XC_ARGS := -scheme $(PROJECT)-Example -workspace Example/$(PROJECT).xcworkspace -sdk $(SDK) -destination $(DESTINATION) ONLY_ACTIVE_ARCH=NO
 

Pod/Classes/SEGMixpanelIntegration.h

@@ -1,7 +1,12 @@
 #import <Foundation/Foundation.h>
-#import <Analytics/SEGIntegration.h>
 #import <Mixpanel/Mixpanel.h>
 
+#if defined(__has_include) && __has_include(<Analytics/SEGAnalytics.h>)
+#import <Analytics/SEGIntegration.h>
+#else
+#import <Segment/SEGIntegration.h>
+#endif
+
 
 @interface SEGMixpanelIntegration : NSObject <SEGIntegration>
 

Pod/Classes/SEGMixpanelIntegration.m

@@ -1,7 +1,11 @@
 #import "SEGMixpanelIntegration.h"
-#import <Analytics/SEGAnalyticsUtils.h>
 #import "MixpanelGroup.h"
 
+#if defined(__has_include) && __has_include(<Analytics/SEGAnalytics.h>)
+#import <Analytics/SEGAnalyticsUtils.h>
+#else
+#import <Segment/SEGAnalyticsUtils.h>
+#endif
 
 @implementation SEGMixpanelIntegration
 

Pod/Classes/SEGMixpanelIntegrationFactory.h

@@ -1,5 +1,10 @@
 #import <Foundation/Foundation.h>
+
+#if defined(__has_include) && __has_include(<Analytics/SEGAnalytics.h>)
 #import <Analytics/SEGIntegrationFactory.h>
+#else
+#import <Segment/SEGIntegrationFactory.h>
+#endif
 
 @interface SEGMixpanelIntegrationFactory : NSObject <SEGIntegrationFactory>