Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync with upstream repo #5

Closed
wants to merge 33 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
262c32c
Migrate Kit to Button Merchant Library
ecgreb Jun 5, 2019
e41a7f1
Add support annotations dependency
willpassidomo Jul 1, 2019
074b150
Update for Mockito
willpassidomo Sep 5, 2019
8c2b640
Integrate with TravisCI
willpassidomo Sep 20, 2019
94912a6
Make sample project independent
willpassidomo Sep 24, 2019
a7b5397
Bump button-merchant from 1.0.0 to 1.1.1
dependabot-preview[bot] Sep 27, 2019
173c817
Bump assertj-android from 1.1.1 to 1.2.0
dependabot-preview[bot] Sep 27, 2019
94eaf2a
update travis config
willpassidomo Jan 17, 2020
0e04839
Create Dependabot config file
dependabot-preview[bot] Jun 18, 2020
1060756
Bump button-merchant from 1.1.1 to 1.1.2
dependabot-preview[bot] Apr 15, 2020
8077de4
Added info on how to build locally
najmsheikh Aug 30, 2018
f9cbdee
Added tests + reverted to static versioning for the merchant library
najmsheikh Sep 11, 2018
f576a3d
Matches reporting behavior from previous ButtonKit version
Sep 12, 2018
7561232
Add sample app
Sep 12, 2018
e789fe3
Allow clearing Merchant Library data
najmsheikh Aug 19, 2020
77d26ff
Track commerce activity via the Merchant Library
najmsheikh Aug 19, 2020
0a70ef1
Update demo app
najmsheikh Aug 19, 2020
71921ee
Add commerce activity testing to demo app
najmsheikh Aug 19, 2020
a7b5a90
Update Button Merchant Library to 1.3.0
najmsheikh Aug 20, 2020
2618a18
Clear data on Identity logout
najmsheikh Aug 25, 2020
341aadd
upgrade to AndroidX
willpassidomo Oct 12, 2020
4c67136
Update Core Callbacks
willpassidomo Nov 2, 2020
64c9130
Remove Travis config
willpassidomo Dec 18, 2020
acac166
Update Common Kit files
willpassidomo Dec 18, 2020
48c32cf
Update Button SDK dependency to latest
willpassidomo Dec 23, 2020
6cad1c4
Bump constraint-layout from 1.1.3 to 2.0.4
dependabot[bot] Oct 30, 2020
cdc2570
Bump annotation from 1.0.0 to 1.1.0
dependabot[bot] Dec 23, 2020
c67ebee
Bump button-merchant from 1.4.3 to 1.4.4
dependabot[bot] Mar 4, 2021
ca4ba48
Bump button-merchant from 1.4.4 to 1.4.5
dependabot[bot] Mar 19, 2021
a178556
Bump annotation from 1.1.0 to 1.2.0
dependabot[bot] Mar 25, 2021
23b7df3
Update tests based on Kit Options changes
willpassidomo May 21, 2021
c47f0a1
Bump button-merchant from 1.4.5 to 1.4.6
dependabot-preview[bot] Jul 14, 2021
7d6d358
ci: Migrate Dependabot to Github native
willpassidomo Jul 22, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added tests + reverted to static versioning for the merchant library
  • Loading branch information
najmsheikh authored and willpassidomo committed Sep 25, 2020
commit f9cbdee7afa5db558de7e5f869b9dd9b655863de
13 changes: 13 additions & 0 deletions src/main/java/com/mparticle/kits/MParticleWrapper.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.mparticle.kits;

import com.mparticle.MParticle;

/**
* Wrapper class for {@link MParticle} to allow for testing static methods
*/
public class MParticleWrapper {

public boolean isDebuggingEnvironment() {
return MParticle.getInstance().getEnvironment() == MParticle.Environment.Development;
}
}