From 79fd03ba8b153de40bf7a81f46234233cef986fb Mon Sep 17 00:00:00 2001 From: Joshua Liu Date: Mon, 8 Jul 2019 13:07:57 -0700 Subject: [PATCH] Fix build by adding placeholder config values and removing Crashlytics --- README.md | 4 --- app/build.gradle | 26 ++++++++++--------- app/src/main/AndroidManifest.xml | 4 --- .../molemapper/MoleMapperApplication.java | 7 ----- build.gradle | 3 --- 5 files changed, 14 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index 57de979..7621de8 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,3 @@ pl.charmas.android:android-reactive-location
com.google.android.gms:play-services-location
- 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. - -com.crashlytics.sdk.android:crashlytics - -- Crash / Logging library being used during the QA period. This library will be removed at v1.0 release. diff --git a/app/build.gradle b/app/build.gradle index cf30568..05ac013 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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 @@ -26,16 +25,19 @@ 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 { @@ -43,16 +45,19 @@ 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', 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\"" } } @@ -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; - } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5e9aa5d..3f00bb2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -142,10 +142,6 @@ - - diff --git a/app/src/main/java/org/researchstack/molemapper/MoleMapperApplication.java b/app/src/main/java/org/researchstack/molemapper/MoleMapperApplication.java index 43efd15..3f93628 100644 --- a/app/src/main/java/org/researchstack/molemapper/MoleMapperApplication.java +++ b/app/src/main/java/org/researchstack/molemapper/MoleMapperApplication.java @@ -3,12 +3,8 @@ 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 @@ -16,10 +12,7 @@ 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()); } - } diff --git a/build.gradle b/build.gradle index 0201370..0711865 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,6 @@ buildscript { mavenCentral() mavenLocal() jcenter() - maven { url 'https://maven.fabric.io/public' } } dependencies { @@ -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 @@ -26,7 +24,6 @@ allprojects { jcenter() mavenLocal() maven { url "https://jitpack.io" } - maven { url 'https://maven.fabric.io/public' } } }