diff --git a/CHANGELOG.md b/CHANGELOG.md index b445331..a6d7678 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ Change Log ========== + +Version 3.2.3 *(29th October, 2020) +------------------------------------- +* Fix a bug with import headers support new namespacing introduced in v4.x + Version 3.2.2 *(14th October, 2020) ------------------------------------- * Update SEGAnalytics imports to support new namespacing introduced in v4.x diff --git a/Cartfile.resolved b/Cartfile.resolved index b443cc4..d54bfe8 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,2 +1,2 @@ github "amplitude/Amplitude-iOS" "v5.3.0" -github "segmentio/analytics-ios" "4.0.5" +github "segmentio/analytics-ios" "4.1.1" diff --git a/CarthageExample/AppDelegate.m b/CarthageExample/AppDelegate.m index e1b4e41..f2119a5 100644 --- a/CarthageExample/AppDelegate.m +++ b/CarthageExample/AppDelegate.m @@ -13,7 +13,7 @@ @import Analytics; #else @import Segment; -#endifs +#endif @import Amplitude; @import Segment_Amplitude; diff --git a/Pod/Classes/SEGAmplitudeIntegration.m b/Pod/Classes/SEGAmplitudeIntegration.m index 6f1a0cb..8544565 100644 --- a/Pod/Classes/SEGAmplitudeIntegration.m +++ b/Pod/Classes/SEGAmplitudeIntegration.m @@ -2,6 +2,7 @@ #if defined(__has_include) && __has_include() #import #else +#import #import #endif diff --git a/Pod/Classes/SEGAmplitudeIntegrationFactory.h b/Pod/Classes/SEGAmplitudeIntegrationFactory.h index 877abbb..1aded8c 100644 --- a/Pod/Classes/SEGAmplitudeIntegrationFactory.h +++ b/Pod/Classes/SEGAmplitudeIntegrationFactory.h @@ -3,7 +3,7 @@ #if defined(__has_include) && __has_include() #import #else -#import +#import #endif #import "SEGAmplitudeIntegration.h" diff --git a/Segment-Amplitude.podspec b/Segment-Amplitude.podspec index 276b41e..f5d2289 100644 --- a/Segment-Amplitude.podspec +++ b/Segment-Amplitude.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Segment-Amplitude" - s.version = "3.2.2" + s.version = "3.2.3" s.summary = "Amplitude Integration for Segment's analytics-ios library." s.description = <<-DESC diff --git a/Segment-Amplitude.xcodeproj/project.pbxproj b/Segment-Amplitude.xcodeproj/project.pbxproj index 1be9ac6..6b11578 100644 --- a/Segment-Amplitude.xcodeproj/project.pbxproj +++ b/Segment-Amplitude.xcodeproj/project.pbxproj @@ -11,7 +11,6 @@ A38344272400A4100007ECCD /* SEGAmplitudeIntegrationFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = A38344232400A4100007ECCD /* SEGAmplitudeIntegrationFactory.h */; platformFilter = ios; settings = {ATTRIBUTES = (Public, ); }; }; A38344282400A4100007ECCD /* SEGAmplitudeIntegrationFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = A38344242400A4100007ECCD /* SEGAmplitudeIntegrationFactory.m */; }; A38344292400A4100007ECCD /* SEGAmplitudeIntegration.m in Sources */ = {isa = PBXBuildFile; fileRef = A38344252400A4100007ECCD /* SEGAmplitudeIntegration.m */; }; - A383442D2400AE2E0007ECCD /* Analytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A383442C2400AE2E0007ECCD /* Analytics.framework */; platformFilter = ios; }; A383442F2400AE310007ECCD /* Amplitude.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A383442E2400AE310007ECCD /* Amplitude.framework */; platformFilter = ios; }; A38344382400AFF60007ECCD /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A38344372400AFF60007ECCD /* AppDelegate.m */; }; A383443B2400AFF60007ECCD /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A383443A2400AFF60007ECCD /* SceneDelegate.m */; }; @@ -22,10 +21,9 @@ A38344492400AFF80007ECCD /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = A38344482400AFF80007ECCD /* main.m */; }; A383444D2400B0110007ECCD /* Segment_Amplitude.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A38344172400A3CB0007ECCD /* Segment_Amplitude.framework */; }; A383444E2400B03A0007ECCD /* Amplitude.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A383442E2400AE310007ECCD /* Amplitude.framework */; }; - A383444F2400B03E0007ECCD /* Analytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A383442C2400AE2E0007ECCD /* Analytics.framework */; }; A38344512400B2CD0007ECCD /* Segment_Amplitude.h in Headers */ = {isa = PBXBuildFile; fileRef = A383441A2400A3CB0007ECCD /* Segment_Amplitude.h */; settings = {ATTRIBUTES = (Public, ); }; }; A38344542400B67B0007ECCD /* Amplitude.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = A38344532400B67B0007ECCD /* Amplitude.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - A38344562400B6880007ECCD /* Analytics.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = A38344552400B6870007ECCD /* Analytics.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + EA0E73CE254B761A00349B58 /* Segment.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA0E73CB254B75DF00349B58 /* Segment.framework */; platformFilter = ios; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -46,7 +44,6 @@ dstSubfolderSpec = 10; files = ( A38344542400B67B0007ECCD /* Amplitude.framework in CopyFiles */, - A38344562400B6880007ECCD /* Analytics.framework in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -75,7 +72,7 @@ A38344472400AFF80007ECCD /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; A38344482400AFF80007ECCD /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; A38344532400B67B0007ECCD /* Amplitude.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Amplitude.framework; path = Carthage/Build/iOS/Amplitude.framework; sourceTree = ""; }; - A38344552400B6870007ECCD /* Analytics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Analytics.framework; path = Carthage/Build/iOS/Analytics.framework; sourceTree = ""; }; + EA0E73CB254B75DF00349B58 /* Segment.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Segment.framework; path = Carthage/Build/iOS/Segment.framework; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -83,7 +80,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A383442D2400AE2E0007ECCD /* Analytics.framework in Frameworks */, + EA0E73CE254B761A00349B58 /* Segment.framework in Frameworks */, A383442F2400AE310007ECCD /* Amplitude.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -94,7 +91,6 @@ files = ( A383444D2400B0110007ECCD /* Segment_Amplitude.framework in Frameworks */, A383444E2400B03A0007ECCD /* Amplitude.framework in Frameworks */, - A383444F2400B03E0007ECCD /* Analytics.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -104,7 +100,6 @@ A383440D2400A3CB0007ECCD = { isa = PBXGroup; children = ( - A38344552400B6870007ECCD /* Analytics.framework */, A38344532400B67B0007ECCD /* Amplitude.framework */, A38344192400A3CB0007ECCD /* Segment-Amplitude */, A38344352400AFF60007ECCD /* CarthageExample */, @@ -138,6 +133,7 @@ A383442B2400AE2E0007ECCD /* Frameworks */ = { isa = PBXGroup; children = ( + EA0E73CB254B75DF00349B58 /* Segment.framework */, A383442E2400AE310007ECCD /* Amplitude.framework */, A383442C2400AE2E0007ECCD /* Analytics.framework */, ); @@ -472,6 +468,7 @@ FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/iOS/**", + "$(PROJECT_DIR)/Carthage/Build/iOS", ); INFOPLIST_FILE = "Segment-Amplitude/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -498,6 +495,7 @@ FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/iOS/**", + "$(PROJECT_DIR)/Carthage/Build/iOS", ); INFOPLIST_FILE = "Segment-Amplitude/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";