Skip to content

Fix build by adding placeholder config values and removing Crashlytics #6

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,3 @@ pl.charmas.android:android-reactive-location<br />
com.google.android.gms:play-services-location<br />
</b>
- play-services-location allows the app to get the user's location while being conscious of battery life. Android-reactive-location library wraps the location services API’s in Rx Observables.

<b>com.crashlytics.sdk.android:crashlytics</b>

- Crash / Logging library being used during the QA period. This library will be removed at v1.0 release.
26 changes: 14 additions & 12 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
apply plugin: 'com.android.application'
apply plugin: 'me.tatarka.retrolambda'
apply plugin: 'com.neenbedankt.android-apt'
apply plugin: 'io.fabric'

android {
compileSdkVersion 23
Expand All @@ -26,33 +25,39 @@ android {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
buildConfigField 'String', 'STUDY_BASE_URL', "\"https://webservices.sagebridge.org/\""

// Define STUDY_ID, STUDY_NAME, STUDY_PEM can be defined here or in your local.properties
// file. These variables are needed for upload to properly work.
// RELEASE_STUDY_ID is of type String (e.g. "id-mole-mapper-study")
// RELEASE_STUDY_NAME is of type String (e.g. "MoleMapper Study")
// RELEASE_STUDY_PEM_FILE_NAME is of type String, (e.g. "molemapper"). The pem file should
// be located at the root directory of your assets folder.
buildConfigField 'String', 'STUDY_ID', RELEASE_STUDY_ID
buildConfigField 'String', 'STUDY_NAME', RELEASE_STUDY_NAME
buildConfigField 'String', 'STUDY_PEM', RELEASE_STUDY_PEM_FILE_NAME
buildConfigField 'String', 'STUDY_ID',
project.hasProperty('RELEASE_STUDY_ID') ? project.get('RELEASE_STUDY_ID') : "\"placeholder\""
buildConfigField 'String', 'STUDY_NAME',
project.hasProperty('RELEASE_STUDY_NAME') ? project.get('RELEASE_STUDY_NAME') : "\"placeholder\""
buildConfigField 'String', 'STUDY_PEM',
project.hasProperty('RELEASE_STUDY_PEM_FILE_NAME') ? project.get('RELEASE_STUDY_PEM_FILE_NAME') : "\"placeholder\""
}

debug {
debuggable true
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
buildConfigField 'String', 'STUDY_BASE_URL', "\"https://webservices.sagebridge.org/\""

// Define STUDY_ID, STUDY_NAME, STUDY_PEM can be defined here or in your local.properties
// file. These variables are needed for upload to properly work.
// RELEASE_STUDY_ID is of type String (e.g. "id-mole-mapper-study")
// RELEASE_STUDY_NAME is of type String (e.g. "MoleMapper Study")
// RELEASE_STUDY_PEM_FILE_NAME is of type String, (e.g. "molemapper"). The pem file should
// be located at the root directory of your assets folder.
buildConfigField 'String', 'STUDY_ID', DEBUG_STUDY_ID
buildConfigField 'String', 'STUDY_NAME', DEBUG_STUDY_NAME
buildConfigField 'String', 'STUDY_PEM', DEBUG_STUDY_PEM_FILE_NAME
buildConfigField 'String', 'STUDY_ID',
project.hasProperty('DEBUG_STUDY_ID') ? project.get('DEBUG_STUDY_ID') : "\"placeholder\""
buildConfigField 'String', 'STUDY_NAME',
project.hasProperty('DEBUG_STUDY_NAME') ? project.get('DEBUG_STUDY_NAME') : "\"placeholder\""
buildConfigField 'String', 'STUDY_PEM',
project.hasProperty('DEBUG_STUDY_PEM_FILE_NAME') ? project.get('DEBUG_STUDY_PEM_FILE_NAME') : "\"placeholder\""
}
}

Expand Down Expand Up @@ -87,7 +92,4 @@ dependencies {
compile 'com.madgag.spongycastle:pkix:1.54.0.0'
compile 'pl.charmas.android:android-reactive-location:0.8@aar'
compile 'com.google.android.gms:play-services-location:8.4.0'
compile('com.crashlytics.sdk.android:crashlytics:2.5.5@aar') {
transitive = true;
}
}
4 changes: 0 additions & 4 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,6 @@
<action android:name="org.researchstack.skin.notification.ALERT_DELETE_ALL"/>
</intent-filter>
</receiver>

<meta-data
android:name="io.fabric.ApiKey"
android:value="XXXXXXXXXXXXXX"/>
</application>

</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,16 @@
import android.app.Application;
import android.support.multidex.MultiDex;

import com.crashlytics.android.Crashlytics;

import org.researchstack.skin.ResearchStack;

import io.fabric.sdk.android.Fabric;

public class MoleMapperApplication extends Application
{
@Override
public void onCreate()
{
super.onCreate();
MultiDex.install(this);
// TODO remove Fabric/Crashlytics after QA process
Fabric.with(this, new Crashlytics());

ResearchStack.init(this, new MoleMapperResearchStack());
}

}
3 changes: 0 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ buildscript {
mavenCentral()
mavenLocal()
jcenter()
maven { url 'https://maven.fabric.io/public' }
}

dependencies {
Expand All @@ -14,7 +13,6 @@ buildscript {
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
classpath 'me.tatarka:gradle-retrolambda:3.2.3'
classpath "com.neenbedankt.gradle.plugins:android-apt:1.4"
classpath 'io.fabric.tools:gradle:1.+'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -26,7 +24,6 @@ allprojects {
jcenter()
mavenLocal()
maven { url "https://jitpack.io" }
maven { url 'https://maven.fabric.io/public' }
}
}

Expand Down