[STRATCONN-434] Update Headers for iOS 14 work (#85)

* Run pod install * Update podfile to use cocoapods 1.10.0.rc.1 * Update import headers * remove output file from build phases * Show env vars in build log * Update build for storyboard and update simulator * Tried deintegrate/install and pin to 7.0.1 to reset to a legit state Co-authored-by: Brandon Sneed <brandon.sneed@segment.com>
segment-integrations · Oct 14, 2020 · 33d03fc · 33d03fc
1 parent 3b7fbdc
commit 33d03fc
Show file tree

Hide file tree

Showing 8 changed files with 90 additions and 66 deletions.
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -5,8 +5,8 @@ PODS:
   - OCHamcrest (7.1.2)
   - OCMockito (5.1.3):
     - OCHamcrest (~> 7.0)
-  - Segment-Amplitude (3.2.0):
-    - Amplitude
+  - Segment-Amplitude (3.2.1):
+    - Amplitude (~> 7.0.1)
     - Analytics
   - Specta (1.0.7)
 
@@ -35,9 +35,9 @@ SPEC CHECKSUMS:
   Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5
   OCHamcrest: b284c9592c28c1e4025a8542e67ea41a635d0d73
   OCMockito: 677cbb4a18fd492b5a4fb10144dada4de5ddb877
-  Segment-Amplitude: 300e2888691b75b8364389b2c242f6b953932945
+  Segment-Amplitude: 42876f7adc8544948e876770e8d839b462f3c51b
   Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66
 
 PODFILE CHECKSUM: a7bf6ef16f54033a66dc8c09524260667af4e881
 
-COCOAPODS: 1.10.0.rc.1
+COCOAPODS: 1.9.3
diff --git a/Example/Segment-Amplitude.xcodeproj/project.pbxproj b/Example/Segment-Amplitude.xcodeproj/project.pbxproj
diff --git a/Example/Segment-Amplitude/Main.storyboard b/Example/Segment-Amplitude/Main.storyboard
@@ -1,8 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="whP-gf-Uak">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="whP-gf-Uak">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <deployment version="4352" identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -14,14 +16,14 @@
                         <viewControllerLayoutGuide type="bottom" id="Mvr-aV-6Um"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="TpU-gO-2f1">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="tc2-Qw-aMS" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="305" y="433"/>
+            <point key="canvasLocation" x="-14" y="75"/>
         </scene>
     </scenes>
 </document>
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 SDK ?= "iphonesimulator"
-DESTINATION ?= "platform=iOS Simulator,name=iPhone 8"
+DESTINATION ?= "platform=iOS Simulator,name=iPhone 11"
 PROJECT := Segment-Amplitude
 XC_ARGS := -scheme $(PROJECT)_Example -workspace Example/$(PROJECT).xcworkspace -sdk $(SDK) -destination $(DESTINATION) ONLY_ACTIVE_ARCH=NO
 

diff --git a/Pod/Classes/SEGAmplitudeIntegration.h b/Pod/Classes/SEGAmplitudeIntegration.h
@@ -1,5 +1,10 @@
 #import <Foundation/Foundation.h>
+
+#if defined(__has_include) && __has_include(<Analytics/Analytics.h>)
 #import <Analytics/Analytics.h>
+#else
+#import <Segment/Analytics.h>
+#endif
 
 #if defined(__has_include) && __has_include(<Amplitude_iOS/Amplitude.h>)
 #import <Amplitude_iOS/Amplitude.h>

diff --git a/Pod/Classes/SEGAmplitudeIntegration.m b/Pod/Classes/SEGAmplitudeIntegration.m
@@ -1,5 +1,9 @@
 #import "SEGAmplitudeIntegration.h"
+#if defined(__has_include) && __has_include(<Analytics/Analytics.h>)
 #import <Analytics/Analytics.h>
+#else
+#import <Segment/Analytics.h>
+#endif
 
 
 @implementation SEGAmplitudeIntegration

diff --git a/Pod/Classes/SEGAmplitudeIntegrationFactory.h b/Pod/Classes/SEGAmplitudeIntegrationFactory.h
@@ -1,6 +1,10 @@
 #import <Foundation/Foundation.h>
-#import <Analytics/Analytics.h>
 
+#if defined(__has_include) && __has_include(<Analytics/Analytics.h>)
+#import <Analytics/Analytics.h>
+#else
+#import <Segment/Analytics.h>
+#endif
 #import "SEGAmplitudeIntegration.h"
 
 

diff --git a/Segment-Amplitude.podspec b/Segment-Amplitude.podspec
@@ -22,5 +22,5 @@ Pod::Spec.new do |s|
   s.source_files = 'Pod/Classes/**/*'
 
   s.dependency 'Analytics'
-  s.dependency 'Amplitude'
+  s.dependency 'Amplitude', '~> 7.0.1'
 end