Skip to content

Commit 77b294f

Browse files
authored
Merge pull request #38 from segment-integrations/wenxi/bump-up-mixpanel-version
bump up mixpanel version to 7.0.1
2 parents 974df4b + 2e24df2 commit 77b294f

File tree

5 files changed

+15
-8
lines changed

5 files changed

+15
-8
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
Version 3.2.3 (30th September, 2022)
2+
==================================
3+
*(Supports Mixpanel 7.0.1)*
4+
5+
* Bumps Mixpanel version to 7.0.1
6+
17
Version 3.2.2 (14th June, 2022)
28
==================================
39
*(Supports Mixpanel 5.8.7)*

build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,14 @@ android {
4444
}
4545

4646
dependencies {
47+
testImplementation project(path: ':')
4748
repositories {
4849
mavenCentral()
4950
google()
5051
}
5152

5253
api 'com.segment.analytics.android:analytics:4.10.4'
53-
api 'com.mixpanel.android:mixpanel-android:5.8.7'
54+
api 'com.mixpanel.android:mixpanel-android:7.0.1'
5455

5556
testImplementation 'com.segment.analytics.android:analytics-tests:4.3.1'
5657
testImplementation 'junit:junit:4.13.2'

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
GROUP=com.segment.analytics.android.integrations
22

3-
VERSION=3.2.3-SNAPSHOT
3+
VERSION=3.2.4-SNAPSHOT
44

55
POM_ARTIFACT_ID=mixpanel
66
POM_PACKAGING=aar

src/main/java/com/segment/analytics/android/integrations/mixpanel/MixpanelIntegration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public Integration<?> create(ValueMap settings, Analytics analytics) {
4444
Set<String> superProperties = getStringSet(settings, "superProperties");
4545

4646
Logger logger = analytics.logger(MIXPANEL_KEY);
47-
MixpanelAPI mixpanel = MixpanelAPI.getInstance(analytics.getApplication(), token);
47+
MixpanelAPI mixpanel = MixpanelAPI.getInstance(analytics.getApplication(), token, false);
4848
logger.verbose("MixpanelAPI.getInstance(context, %s);", token);
4949

5050
MixpanelAPI.People people;
@@ -158,7 +158,7 @@ public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
158158
// This is needed to trigger a call to #checkIntentForInboundAppLink.
159159
// From Mixpanel's source, this won't trigger a creation of another instance. It caches
160160
// instances by the application context and token, both of which remain the same.
161-
MixpanelAPI.getInstance(activity, token);
161+
MixpanelAPI.getInstance(activity, token, false);
162162
}
163163

164164
@Override

src/test/java/com/segment/analytics/android/integrations/mixpanel/MixpanelTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
initMocks(this);
7070
mockStatic(MixpanelAPI.class);
7171
Logger logger = Logger.with(Analytics.LogLevel.DEBUG);
72-
when(MixpanelAPI.getInstance(context, "foo")).thenReturn(mixpanel);
72+
when(MixpanelAPI.getInstance(context, "foo", false)).thenReturn(mixpanel);
7373
when(mixpanel.getPeople()).thenReturn(mixpanelPeople);
7474
when(analytics.logger("Mixpanel")).thenReturn(logger);
7575
when(analytics.getApplication()).thenReturn(context);
@@ -89,7 +89,7 @@
8989
MixpanelIntegration integration =
9090
(MixpanelIntegration) MixpanelIntegration.FACTORY.create(settings, analytics);
9191

92-
MixpanelAPI.getInstance(context, "foo");
92+
MixpanelAPI.getInstance(context, "foo", false);
9393
verify(mixpanel, never()).getPeople();
9494

9595
assertThat(integration.token).isEqualTo("foo");
@@ -111,7 +111,7 @@
111111
MixpanelIntegration integration =
112112
(MixpanelIntegration) MixpanelIntegration.FACTORY.create(settings, analytics);
113113

114-
MixpanelAPI.getInstance(context, "foo");
114+
MixpanelAPI.getInstance(context, "foo", false);
115115
verify(mixpanel).getPeople();
116116
assertThat(integration.token).isEqualTo("foo");
117117
assertThat(integration.trackAllPages).isTrue();
@@ -126,7 +126,7 @@
126126
Activity activity = mock(Activity.class);
127127
Bundle bundle = mock(Bundle.class);
128128
integration.onActivityCreated(activity, bundle);
129-
MixpanelAPI.getInstance(activity, "foo");
129+
MixpanelAPI.getInstance(activity, "foo", false);
130130
verifyNoMoreInteractions(mixpanel);
131131
}
132132

0 commit comments

Comments
 (0)