From f38af131e35ec578987f46b692cd78344a1a430a Mon Sep 17 00:00:00 2001 From: Olla Ashour Date: Wed, 18 Dec 2019 02:23:39 +0200 Subject: [PATCH 01/10] DAND-61-Update Mixpanel, Analytics versions, use older version of OCMOckito to avoid pod dependency issue. --- Example/Podfile | 2 +- Example/Podfile.lock | 34 +++++++++++++++++----------------- Segment-Mixpanel.podspec | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Example/Podfile b/Example/Podfile index f965c80..608a150 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -10,7 +10,7 @@ end target 'Segment-Mixpanel_Tests' do pod "Segment-Mixpanel", :path => "../" - pod 'OCMockito' + pod 'OCMockito', '~> 3.0' pod 'Specta' pod 'Expecta' end diff --git a/Example/Podfile.lock b/Example/Podfile.lock index df5434d..97fbd9d 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,23 +1,23 @@ PODS: - - Analytics (3.2.6) - - Expecta (1.0.3) - - Mixpanel (3.4.9) - - OCHamcrest (5.2.0) - - OCMockito (3.0.1): + - Analytics (3.7.0) + - Expecta (1.0.6) + - Mixpanel (3.5.0) + - OCHamcrest (5.4.0) + - OCMockito (3.0.2): - OCHamcrest (~> 5.1) - - Segment-Mixpanel (1.3.0): + - Segment-Mixpanel (1.4.0): - Analytics (~> 3.0) - - Mixpanel (~> 3.4.7) + - Mixpanel (~> 3.5) - Specta (1.0.7) DEPENDENCIES: - Expecta - - OCMockito + - OCMockito (~> 3.0) - Segment-Mixpanel (from `../`) - Specta SPEC REPOS: - https://github.com/cocoapods/specs.git: + https://github.com/CocoaPods/Specs.git: - Analytics - Expecta - Mixpanel @@ -30,14 +30,14 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - Analytics: ad1c5bdc169866d72afdbc918084d0695010e35a - Expecta: 9d1bff6c8b0eeee73a166a2ee898892478927a15 - Mixpanel: 5aca6e506b34650b96dc759a208513d86650fac7 - OCHamcrest: 218dc4022a5e928a275771da70c5dbea9f859287 - OCMockito: 9eee3c61e42f7cb8aa015d66f8cc16849701d973 - Segment-Mixpanel: 4ff970648d9c49ee0a62a32eec777346316ee7ea + Analytics: 77fd5fb102a4a5eedafa2c2b0245ceb7b7c15e45 + Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5 + Mixpanel: 399997670f5452de026449f9e9ecd52eccbb9ff7 + OCHamcrest: 5c1d441c5a82fb18ac17c2aeb52ec1a99edb971b + OCMockito: 2cb6c2267cbc76537be56281cd47cdb5a7c27541 + Segment-Mixpanel: 625bb010c65f66acdd976d9db240a420aa67b132 Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66 -PODFILE CHECKSUM: 507a152874203f544f8656b6532dd0f45dd3c57d +PODFILE CHECKSUM: 6ff827a80dc2a21042246602306af45cb1c9f2a8 -COCOAPODS: 1.7.5 +COCOAPODS: 1.8.4 diff --git a/Segment-Mixpanel.podspec b/Segment-Mixpanel.podspec index faf0e17..156ee2f 100644 --- a/Segment-Mixpanel.podspec +++ b/Segment-Mixpanel.podspec @@ -22,5 +22,5 @@ Pod::Spec.new do |s| s.source_files = 'Pod/Classes/**/*' s.dependency 'Analytics', '~> 3.0' - s.dependency 'Mixpanel', '~> 3.4.7' + s.dependency 'Mixpanel', '~> 3.5' end From f9392c2399eaad65ec45fc62c20d41120d3d357e Mon Sep 17 00:00:00 2001 From: Olla Ashour Date: Wed, 18 Dec 2019 02:24:30 +0200 Subject: [PATCH 02/10] DAND-61- Add support for groups with and without names and setOnce traits --- Pod/Classes/SEGMixpanelIntegration.m | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/Pod/Classes/SEGMixpanelIntegration.m b/Pod/Classes/SEGMixpanelIntegration.m index 4a4b57b..8ba83ca 100644 --- a/Pod/Classes/SEGMixpanelIntegration.m +++ b/Pod/Classes/SEGMixpanelIntegration.m @@ -1,5 +1,6 @@ #import "SEGMixpanelIntegration.h" #import +#import @implementation SEGMixpanelIntegration @@ -139,6 +140,26 @@ - (void)screen:(SEGScreenPayload *)payload } } + +- (void) group:(SEGGroupPayload *)payload { + + NSString *groupID = payload.groupId; + NSDictionary *traits = [payload traits]; + NSString *groupName = traits[@"name"]; + + if(groupName == nil || groupName.length == 0) { + groupName = @"[Segment] Group"; + } + + if(traits != nil || traits.count != 0){ + [[self.mixpanel getGroup:groupName groupID: groupID] setOnce:traits]; + } + + [self.mixpanel setGroup:groupName groupID:groupID]; + SEGLog(@"[Mixpanel setGroup:%@ groupID:%@]", groupName, groupID); + +} + + (NSNumber *)extractRevenue:(NSDictionary *)dictionary withKey:(NSString *)revenueKey { id revenueProperty = nil; From cb02270750844182ac05a51a07bccdb2ed618849 Mon Sep 17 00:00:00 2001 From: Olla Ashour Date: Wed, 18 Dec 2019 02:24:58 +0200 Subject: [PATCH 03/10] DAND-61-Update tests to include groups --- Example/Tests/SEGPayloadBuilder.h | 2 ++ Example/Tests/SEGPayloadBuilder.m | 5 +++++ Example/Tests/Tests.m | 35 ++++++++++++++++++++++++++++++- 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/Example/Tests/SEGPayloadBuilder.h b/Example/Tests/SEGPayloadBuilder.h index fb19744..5518e3c 100644 --- a/Example/Tests/SEGPayloadBuilder.h +++ b/Example/Tests/SEGPayloadBuilder.h @@ -23,4 +23,6 @@ + (SEGAliasPayload *)alias:(NSString *)newId; ++ (SEGGroupPayload *)group:(NSString *) groupId withTraits:(NSDictionary *)traits; + @end diff --git a/Example/Tests/SEGPayloadBuilder.m b/Example/Tests/SEGPayloadBuilder.m index 8b6a7ad..df1c95e 100644 --- a/Example/Tests/SEGPayloadBuilder.m +++ b/Example/Tests/SEGPayloadBuilder.m @@ -41,4 +41,9 @@ + (SEGAliasPayload *)alias:(NSString *)newId return [[SEGAliasPayload alloc] initWithNewId:newId context:@{} integrations:@{}]; } ++ (SEGGroupPayload *)group:(NSString *)groupId withTraits:(NSDictionary *)traits +{ + return [[SEGGroupPayload alloc] initWithGroupId:groupId traits:traits context:@{} integrations:@{}]; +} + @end diff --git a/Example/Tests/Tests.m b/Example/Tests/Tests.m index dc2d15a..459cad0 100644 --- a/Example/Tests/Tests.m +++ b/Example/Tests/Tests.m @@ -9,6 +9,7 @@ // https://github.com/Specta/Specta #import "SEGPayloadBuilder.h" +#import SpecBegin(InitialSpecs) @@ -16,12 +17,15 @@ __block SEGMixpanelIntegration *integration; __block Mixpanel *mixpanel; __block MixpanelPeople *mixpanelPeople; + __block MixpanelGroup *mixpanelGroup; beforeEach(^{ mixpanel = mock([Mixpanel class]); mixpanelPeople = mock([MixpanelPeople class]); [given([mixpanel people]) willReturn:mixpanelPeople]; - + + mixpanelGroup = mock([MixpanelGroup class]); + integration = [[SEGMixpanelIntegration alloc] initWithSettings:@{ @"trackAllPages" : @1, @"setAllTraitsByDefault" : @1 @@ -118,7 +122,36 @@ @"age" : @24 }]; }); + + + it(@"simple group", ^{ + NSDictionary *groupTraits = @{ + @"groupCity" : @"Cairo", + @"name" : @"mixPanelTest1Group" + }; + [integration group:[SEGPayloadBuilder group:@"groupTest1" withTraits:groupTraits]]; + [verify(mixpanel) getGroup:@"mixPanelTest1Group" groupID:@"groupTest1"]; + }); + it(@"simple group without name", ^{ + NSDictionary *groupTraits = @{ + @"groupCity" : @"Cairo" + }; + [integration group:[SEGPayloadBuilder group:@"groupTest2" withTraits:groupTraits]]; + [verify(mixpanel) getGroup:@"[Segment] Group" groupID:@"groupTest2"]; + }); + + it(@"simple group setOnce traits", ^{ + [given([mixpanel getGroup:@"[Segment] Group" groupID:@"groupTest2"]) willReturn:mixpanelGroup]; + NSDictionary *groupTraits = @{ + @"groupCity" : @"Cairo", + @"groupCount" : @"20" + }; + [integration group:[SEGPayloadBuilder group:@"groupTest2" withTraits:groupTraits]]; + [verify(mixpanelGroup) setOnce:groupTraits]; + [verify(mixpanel) getGroup:@"[Segment] Group" groupID:@"groupTest2"]; + }); + it(@"alias", ^{ [given([mixpanel distinctId]) willReturn:@"123456"]; [integration alias:[SEGPayloadBuilder alias:@"prateek"]]; From 46bf0a8a1879732058b04dd31ed7760973830836 Mon Sep 17 00:00:00 2001 From: Olla Ashour Date: Wed, 18 Dec 2019 02:27:12 +0200 Subject: [PATCH 04/10] Add support for example usage of analytics, and mixpanel usage, with identify and use group in app delegate of example project. --- Example/Segment-Mixpanel/SEGAppDelegate.m | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/Example/Segment-Mixpanel/SEGAppDelegate.m b/Example/Segment-Mixpanel/SEGAppDelegate.m index 6fcc467..2af4841 100644 --- a/Example/Segment-Mixpanel/SEGAppDelegate.m +++ b/Example/Segment-Mixpanel/SEGAppDelegate.m @@ -7,13 +7,30 @@ // #import "SEGAppDelegate.h" - +#import +#import @implementation SEGAppDelegate - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { // Override point for customization after application launch. + + // Override point for customization after application launch. + [SEGAnalytics debug:YES]; + SEGAnalyticsConfiguration *config = [SEGAnalyticsConfiguration configurationWithWriteKey:@"gnjyuUpq7mZYtLM76mwltoiZcDsFpnfY"]; + + // Add any of your bundled integrations. + [config use:[SEGMixpanelIntegrationFactory instance]]; + + [SEGAnalytics setupWithConfiguration:config]; + + [[SEGAnalytics sharedAnalytics] identify:@"segment-fake-tester-Mixpanel" + traits:@{ @"email": @"tool@fake-segment-tester.com" }]; + + [[SEGAnalytics sharedAnalytics] group:@"testversion1" traits:@{ @"name": @"test group"}]; + + return YES; } From 472ff7a3c7cde2d1ceab6e024a63c18bff21197c Mon Sep 17 00:00:00 2001 From: Olla Ashour Date: Wed, 18 Dec 2019 02:34:15 +0200 Subject: [PATCH 05/10] DAND-61-Update changelod and update podspec version for release --- CHANGELOG.md | 9 +++++++++ Segment-Mixpanel.podspec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14c1769..f24aabc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,15 @@ Change Log ========== +Version 1.5.0 *(17th Dec, 2019)* +------------------------------------------- +*(Upgrade Segment-Mixpanel to 3.5)* + + * [New](https://github.com/segment-integrations/analytics-ios-integration-mixpanel/pull/47): Upgrade Segment-Mixpanel to 3.5.0. + + * [New] Add support for groups + + Version 1.4.0 *(12th September, 2019)* ------------------------------------------- *(Upgrade Segment-Mixpanel to 3.4.7)* diff --git a/Segment-Mixpanel.podspec b/Segment-Mixpanel.podspec index 156ee2f..48da034 100644 --- a/Segment-Mixpanel.podspec +++ b/Segment-Mixpanel.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Segment-Mixpanel" - s.version = "1.4.0" + s.version = "1.5.0" s.summary = "Mixpanel Integration for Segment's analytics-ios library." s.description = <<-DESC From cba32070e2a78b38110c3d93b21a85bbdfe81009 Mon Sep 17 00:00:00 2001 From: Olla Ashour Date: Wed, 8 Jan 2020 00:36:28 +0200 Subject: [PATCH 06/10] DAND-61- Remove specific write key and add more group properties in tests --- Example/Segment-Mixpanel/SEGAppDelegate.m | 2 +- Example/Tests/Tests.m | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Example/Segment-Mixpanel/SEGAppDelegate.m b/Example/Segment-Mixpanel/SEGAppDelegate.m index 2af4841..ffbaf97 100644 --- a/Example/Segment-Mixpanel/SEGAppDelegate.m +++ b/Example/Segment-Mixpanel/SEGAppDelegate.m @@ -18,7 +18,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( // Override point for customization after application launch. [SEGAnalytics debug:YES]; - SEGAnalyticsConfiguration *config = [SEGAnalyticsConfiguration configurationWithWriteKey:@"gnjyuUpq7mZYtLM76mwltoiZcDsFpnfY"]; + SEGAnalyticsConfiguration *config = [SEGAnalyticsConfiguration configurationWithWriteKey:@"YOUR_WRITE_KEY_HERE"]; // Add any of your bundled integrations. [config use:[SEGMixpanelIntegrationFactory instance]]; diff --git a/Example/Tests/Tests.m b/Example/Tests/Tests.m index 459cad0..7d4ecd7 100644 --- a/Example/Tests/Tests.m +++ b/Example/Tests/Tests.m @@ -132,6 +132,18 @@ [integration group:[SEGPayloadBuilder group:@"groupTest1" withTraits:groupTraits]]; [verify(mixpanel) getGroup:@"mixPanelTest1Group" groupID:@"groupTest1"]; }); + + it(@"complex group", ^{ + NSDictionary *groupTraits = @{ + @"groupCity" : @"Alexandria", + @"name" : @"mixPanelTest1Group", + @"address": @{@"city": @"Alexandria", @"postalCode": @"22314", @"state":@"Virginia", @"street": @"105 N Union St" }, + @"description": @"Art Center", + @"avatar" : @"https://gravatar.com/avatar/f8b72def445675a558fe68b1cb651da1?s=400&d=robohash&r=x" + }; + [integration group:[SEGPayloadBuilder group:@"groupTest1" withTraits:groupTraits]]; + [verify(mixpanel) getGroup:@"mixPanelTest1Group" groupID:@"groupTest1"]; + }); it(@"simple group without name", ^{ NSDictionary *groupTraits = @{ From e76a94a3827190bcfd6fdba6984c145bf4d04e60 Mon Sep 17 00:00:00 2001 From: Olla Ashour Date: Wed, 8 Jan 2020 02:32:02 +0200 Subject: [PATCH 07/10] DAND-61-Add groupIdentifierTraits settings check and handling. Updated tests accordingly. --- Example/Tests/Tests.m | 3 ++- Pod/Classes/SEGMixpanelIntegration.m | 16 +++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Example/Tests/Tests.m b/Example/Tests/Tests.m index 7d4ecd7..ec05993 100644 --- a/Example/Tests/Tests.m +++ b/Example/Tests/Tests.m @@ -28,7 +28,8 @@ integration = [[SEGMixpanelIntegration alloc] initWithSettings:@{ @"trackAllPages" : @1, - @"setAllTraitsByDefault" : @1 + @"setAllTraitsByDefault" : @1, + @"groupIdentifierTraits" : @[@"group_id",@"group_name",@"group_idtest2"] } andMixpanel:mixpanel]; }); diff --git a/Pod/Classes/SEGMixpanelIntegration.m b/Pod/Classes/SEGMixpanelIntegration.m index 8ba83ca..3850c6c 100644 --- a/Pod/Classes/SEGMixpanelIntegration.m +++ b/Pod/Classes/SEGMixpanelIntegration.m @@ -147,16 +147,22 @@ - (void) group:(SEGGroupPayload *)payload { NSDictionary *traits = [payload traits]; NSString *groupName = traits[@"name"]; - if(groupName == nil || groupName.length == 0) { - groupName = @"[Segment] Group"; + NSArray *groupIdentifierProperties = [self.settings objectForKey:@"groupIdentifierTraits"]; + + if(groupName == nil || groupName.length == 0 || groupIdentifierProperties.count == 0) { + return; } if(traits != nil || traits.count != 0){ - [[self.mixpanel getGroup:groupName groupID: groupID] setOnce:traits]; + for (NSString *groupIdentiferProperty in groupIdentifierProperties) { + [[self.mixpanel getGroup:groupIdentiferProperty groupID:groupID ] setOnce:traits]; + } } - [self.mixpanel setGroup:groupName groupID:groupID]; - SEGLog(@"[Mixpanel setGroup:%@ groupID:%@]", groupName, groupID); + for (NSString *groupIdentiferProperty in groupIdentifierProperties) { + [self.mixpanel setGroup:groupIdentiferProperty groupID:groupID]; + SEGLog(@"[Mixpanel setGroup:%@ groupID:%@]", groupIdentiferProperty, groupID); + } } From fa2c103690049a09a2538fc375c957d884ffdeaf Mon Sep 17 00:00:00 2001 From: Olla Ashour Date: Thu, 9 Jan 2020 00:16:53 +0200 Subject: [PATCH 08/10] DAND-61- Remove check on group name, and set group with identifier value. --- Pod/Classes/SEGMixpanelIntegration.m | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Pod/Classes/SEGMixpanelIntegration.m b/Pod/Classes/SEGMixpanelIntegration.m index 3850c6c..65ed545 100644 --- a/Pod/Classes/SEGMixpanelIntegration.m +++ b/Pod/Classes/SEGMixpanelIntegration.m @@ -145,22 +145,21 @@ - (void) group:(SEGGroupPayload *)payload { NSString *groupID = payload.groupId; NSDictionary *traits = [payload traits]; - NSString *groupName = traits[@"name"]; NSArray *groupIdentifierProperties = [self.settings objectForKey:@"groupIdentifierTraits"]; - if(groupName == nil || groupName.length == 0 || groupIdentifierProperties.count == 0) { + if(!groupID || groupID.length == 0 || groupIdentifierProperties.count == 0) { return; } if(traits != nil || traits.count != 0){ for (NSString *groupIdentiferProperty in groupIdentifierProperties) { - [[self.mixpanel getGroup:groupIdentiferProperty groupID:groupID ] setOnce:traits]; + [[self.mixpanel getGroup:traits[groupIdentiferProperty] groupID:groupID ] setOnce:traits]; } } for (NSString *groupIdentiferProperty in groupIdentifierProperties) { - [self.mixpanel setGroup:groupIdentiferProperty groupID:groupID]; + [self.mixpanel setGroup:traits[groupIdentiferProperty] groupID:groupID]; SEGLog(@"[Mixpanel setGroup:%@ groupID:%@]", groupIdentiferProperty, groupID); } From 06790dfcd77eaf276eee5c0a8e40c7912e995f15 Mon Sep 17 00:00:00 2001 From: Olla Ashour Date: Thu, 9 Jan 2020 00:17:34 +0200 Subject: [PATCH 09/10] DAND-61-Update test to verify groupIdentifierTraits --- Example/Tests/Tests.m | 45 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 8 deletions(-) diff --git a/Example/Tests/Tests.m b/Example/Tests/Tests.m index ec05993..70efc35 100644 --- a/Example/Tests/Tests.m +++ b/Example/Tests/Tests.m @@ -29,7 +29,7 @@ integration = [[SEGMixpanelIntegration alloc] initWithSettings:@{ @"trackAllPages" : @1, @"setAllTraitsByDefault" : @1, - @"groupIdentifierTraits" : @[@"group_id",@"group_name",@"group_idtest2"] + @"groupIdentifierTraits" : @[@"group_id", @"group_name", @"group_idtest2"] } andMixpanel:mixpanel]; }); @@ -128,10 +128,20 @@ it(@"simple group", ^{ NSDictionary *groupTraits = @{ @"groupCity" : @"Cairo", - @"name" : @"mixPanelTest1Group" + @"group_name" : @"mixPanelTest1Group" }; [integration group:[SEGPayloadBuilder group:@"groupTest1" withTraits:groupTraits]]; - [verify(mixpanel) getGroup:@"mixPanelTest1Group" groupID:@"groupTest1"]; + + NSDictionary *groupIdentifierTraits = integration.settings[@"groupIdentifierTraits"]; + + for (NSString *identifierTrait in groupIdentifierTraits) { + NSString *groupIdentifierVal = groupTraits[identifierTrait]; + if (groupIdentifierVal) { + [verify(mixpanel) getGroup:groupIdentifierVal groupID:@"groupTest1"]; + } + + } + }); it(@"complex group", ^{ @@ -143,7 +153,17 @@ @"avatar" : @"https://gravatar.com/avatar/f8b72def445675a558fe68b1cb651da1?s=400&d=robohash&r=x" }; [integration group:[SEGPayloadBuilder group:@"groupTest1" withTraits:groupTraits]]; - [verify(mixpanel) getGroup:@"mixPanelTest1Group" groupID:@"groupTest1"]; + + NSDictionary *groupIdentifierTraits = integration.settings[@"groupIdentifierTraits"]; + + for (NSString *identifierTrait in groupIdentifierTraits) { + NSString *groupIdentifierVal = groupTraits[identifierTrait]; + if (groupIdentifierVal) { + [verify(mixpanel) getGroup:groupIdentifierVal groupID:@"groupTest1"]; + } + + } + }); it(@"simple group without name", ^{ @@ -151,18 +171,27 @@ @"groupCity" : @"Cairo" }; [integration group:[SEGPayloadBuilder group:@"groupTest2" withTraits:groupTraits]]; - [verify(mixpanel) getGroup:@"[Segment] Group" groupID:@"groupTest2"]; + + NSDictionary *groupIdentifierTraits = integration.settings[@"groupIdentifierTraits"]; + + for (NSString *identifierTrait in groupIdentifierTraits) { + NSString *groupIdentifierVal = groupTraits[identifierTrait]; + [given([mixpanel getGroup:groupIdentifierVal groupID:@"groupTest2"]) willReturn:nil]; + + } }); it(@"simple group setOnce traits", ^{ - [given([mixpanel getGroup:@"[Segment] Group" groupID:@"groupTest2"]) willReturn:mixpanelGroup]; + [given([mixpanel getGroup:@"test1" groupID:@"groupTest2"]) willReturn:mixpanelGroup]; NSDictionary *groupTraits = @{ @"groupCity" : @"Cairo", - @"groupCount" : @"20" + @"groupCount" : @"20", + @"group_id" : @"test1" }; [integration group:[SEGPayloadBuilder group:@"groupTest2" withTraits:groupTraits]]; + [verify(mixpanelGroup) setOnce:groupTraits]; - [verify(mixpanel) getGroup:@"[Segment] Group" groupID:@"groupTest2"]; + [verify(mixpanel) getGroup:@"test1" groupID:@"groupTest2"]; }); it(@"alias", ^{ From ff9511c699288fdc935e9c9d1ba2facda18d8176 Mon Sep 17 00:00:00 2001 From: Olla Ashour Date: Thu, 9 Jan 2020 20:41:24 +0200 Subject: [PATCH 10/10] DAND-61-Revert the version update in CHANGELOG and podspec --- CHANGELOG.md | 9 --------- Segment-Mixpanel.podspec | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f24aabc..14c1769 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,6 @@ Change Log ========== -Version 1.5.0 *(17th Dec, 2019)* -------------------------------------------- -*(Upgrade Segment-Mixpanel to 3.5)* - - * [New](https://github.com/segment-integrations/analytics-ios-integration-mixpanel/pull/47): Upgrade Segment-Mixpanel to 3.5.0. - - * [New] Add support for groups - - Version 1.4.0 *(12th September, 2019)* ------------------------------------------- *(Upgrade Segment-Mixpanel to 3.4.7)* diff --git a/Segment-Mixpanel.podspec b/Segment-Mixpanel.podspec index 48da034..156ee2f 100644 --- a/Segment-Mixpanel.podspec +++ b/Segment-Mixpanel.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Segment-Mixpanel" - s.version = "1.5.0" + s.version = "1.4.0" s.summary = "Mixpanel Integration for Segment's analytics-ios library." s.description = <<-DESC