From 964bf160c5393a809f44f66c14b8614e3750b43e Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Wed, 26 Apr 2017 13:30:27 +0200 Subject: [PATCH] add special build variant for amazon --- Habitica/build.gradle | 13 +++++++++---- .../android/habitica/HabiticaBaseApplication.java | 3 +++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Habitica/build.gradle b/Habitica/build.gradle index f17f14154..90d18be15 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -117,13 +117,13 @@ dependencies { compile 'io.reactivex:rxjava:1.2.0' //Analytics - compile 'com.amplitude:android-sdk:2.13.1' + compile 'com.amplitude:android-sdk:2.13.3' // Fresco Image Management Library - compile('com.facebook.fresco:fresco:1.0.1') { + compile('com.facebook.fresco:fresco:1.3.0') { exclude module: 'bolts-android' } - compile('com.facebook.fresco:animated-gif:1.0.1') { + compile('com.facebook.fresco:animated-gif:1.3.0') { exclude module: 'bolts-android' } //Tests @@ -162,6 +162,7 @@ android { defaultConfig { applicationId "com.habitrpg.android.habitica" vectorDrawables.useSupportLibrary = true + buildConfigField "String", "STORE", "\"google\"" } lintOptions { @@ -198,6 +199,10 @@ android { prod { } + + amazon { + buildConfigField "String", "STORE", "\"amazon\"" + } } sourceSets { @@ -294,7 +299,7 @@ if (HRPG_RES_FILE.canRead()) { } tasks.whenTaskAdded { task -> - if (task.name.equals("lint")) { + if (task.name == "lint") { task.enabled = false } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java index 608a41388..30538c961 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java @@ -18,6 +18,7 @@ import android.support.multidex.MultiDexApplication; import android.util.Log; import com.amplitude.api.Amplitude; +import com.amplitude.api.Identify; import com.facebook.FacebookSdk; import com.facebook.drawee.backends.pipeline.Fresco; import com.habitrpg.android.habitica.components.AppComponent; @@ -140,6 +141,8 @@ public abstract class HabiticaBaseApplication extends MultiDexApplication { if (!BuildConfig.DEBUG) { try { Amplitude.getInstance().initialize(this, getString(R.string.amplitude_app_id)).enableForegroundTracking(this); + Identify identify = new Identify().setOnce("androidStore", BuildConfig.STORE); + Amplitude.getInstance().identify(identify); } catch (Resources.NotFoundException e) { //pass }