Task/update android sdk and tools

README.md

@@ -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.

app/build.gradle

@@ -1,16 +1,12 @@
 apply plugin: 'com.android.application'
-apply plugin: 'me.tatarka.retrolambda'
-apply plugin: 'com.neenbedankt.android-apt'
-apply plugin: 'io.fabric'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    compileSdkVersion 26
 
     defaultConfig {
         applicationId "org.researchstack.molemapper"
         minSdkVersion 16
-        targetSdkVersion 23
+        targetSdkVersion 26
         versionCode 9
         versionName "0.9.4"
         multiDexEnabled true
@@ -26,33 +22,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\""
         }
     }
 
@@ -72,22 +74,29 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.2.1'
-    compile 'com.android.support:cardview-v7:23.2.1'
-    compile 'com.android.support:support-v13:23.2.1'
-    compile 'com.android.support:design:23.2.1'
-    compile 'com.android.support:multidex:1.0.1'
-    compile 'org.researchstack:skin:1.0.0.rc3'
-    compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.4.1'
-    apt 'co.touchlab.squeaky:squeaky-processor:0.4.0.0'
-    compile 'com.madgag.spongycastle:core:1.54.0.0'
-    compile 'com.madgag.spongycastle:prov:1.54.0.0'
-    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;
-    }
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    implementation 'org.researchstack:skin:1.1.2'
+    implementation 'net.zetetic:android-database-sqlcipher:3.5.4@aar'
+
+    implementation 'com.android.support:appcompat-v7:26.1.0'
+    implementation 'com.android.support:preference-v14:26.1.0'
+    implementation 'com.android.support:cardview-v7:26.1.0'
+    implementation 'com.android.support:support-v13:26.1.0'
+    implementation 'com.android.support:design:26.1.0'
+    implementation 'com.android.support:multidex:1.0.3'
+
+    implementation 'com.google.android.gms:play-services-location:8.4.0'
+
+    implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.4.1'
+
+    annotationProcessor 'co.touchlab.squeaky:squeaky-processor:0.4.0.0'
+
+    implementation 'com.madgag.spongycastle:core:1.58.0.0'
+    implementation 'com.madgag.spongycastle:prov:1.58.0.0'
+    implementation 'com.madgag.spongycastle:pkix:1.54.0.0'
+    implementation 'pl.charmas.android:android-reactive-location:0.8@aar'
+
+    testImplementation 'junit:junit:4.12'
+
 }

app/src/main/AndroidManifest.xml

@@ -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>

app/src/main/java/org/researchstack/molemapper/MoleHistoryActivity.java

@@ -67,7 +67,7 @@ protected void onCreate(Bundle savedInstanceState)
 
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         toolbar.setBackgroundColor(ContextCompat.getColor(this, R.color.rsb_black_40));
-        toolbar.setNavigationIcon(R.drawable.abc_ic_clear_mtrl_alpha);
+        toolbar.setNavigationIcon(R.drawable.abc_ic_clear_material);
         setSupportActionBar(toolbar);
 
         ActionBar actionBar = getSupportActionBar();

app/src/main/java/org/researchstack/molemapper/MoleMapperApplication.java

@@ -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());
     }
-
 }

build.gradle

@@ -5,16 +5,13 @@ buildscript {
         mavenCentral()
         mavenLocal()
         jcenter()
-        maven { url 'https://maven.fabric.io/public' }
+        google()
     }
 
     dependencies {
         // change this to 1.5.x if you're not on Android Studio 2.0.0 beta
-        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.android.tools.build:gradle:3.4.1'
         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
@@ -24,9 +21,9 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
         mavenLocal()
         maven { url "https://jitpack.io" }
-        maven { url 'https://maven.fabric.io/public' }
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Mar 01 15:33:12 EST 2016
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+#Mon Jul 08 13:12:03 PDT 2019
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip