Merge pull request #165 from odk-x/demo

2.1.9 release

build.gradle

@@ -2,21 +2,21 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
-        classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.9.8"
-        classpath 'com.google.gms:google-services:4.3.5'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.2'
+        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.23.4'
+        classpath 'com.google.gms:google-services:4.3.10'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1'
     }
 
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         ivy {
             url 'http://cwe.cs.washington.edu:8082/artifactory/libs-demo/'
         }

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

settings.gradle

@@ -1,16 +1,8 @@
-gradle.ext.gradleConfigVersion = 150
-
-if ( !gradle.ext.has('workspacePath') ) {
-	def env = System.getProperties();
-	logger.warn("survey/settings.gradle System.getProperties().stringPropertyNames(): " + env.stringPropertyNames());
-    def path = System.getProperty('com.android.studio.gradle.project.path');
-    if ( path != null ) {
-        logger.warn("survey/settings.gradle Found value for System.getProperty('com.android.studio.gradle.project.path')");
-        gradle.ext.workspacePath = (new File(path)).getParentFile().getAbsolutePath();
-    } else {
-        logger.warn("survey/settings.gradle No value found for System.getProperty('com.android.studio.gradle.project.path')");
-        gradle.ext.workspacePath = new File("..").getAbsolutePath();
-    }
+gradle.ext.gradleConfigVersion = 155
+
+if (!gradle.ext.has('workspacePath')) {
+    logger.warn("rootDir: " + rootDir.getAbsolutePath());
+    gradle.ext.workspacePath = rootDir.getParentFile().getAbsolutePath();
 }
 
 logger.warn('survey/settings.gradle -- gradle.ext.workspacePath: ' + gradle.ext.workspacePath)

survey_app/build.gradle

@@ -26,7 +26,6 @@ android {
         versionCode(releaseVersionCode)
         versionName(versionCodeName)
         testInstrumentationRunner(instrumentationRunner)
-        multiDexEnabled true
     }
 
     flavorDimensions "stage", "testing"
@@ -113,15 +112,13 @@ allprojects {
 dependencies {
     implementation 'androidx.annotation:annotation:1.2.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'androidx.preference:preference:1.1.1'
-    implementation 'androidx.fragment:fragment:1.3.2'
-    implementation 'com.google.android.material:material:1.3.0'
+    implementation 'androidx.fragment:fragment:1.3.6'
+    implementation 'com.google.android.material:material:1.4.0'
 
-    implementation 'com.google.firebase:firebase-analytics:18.0.2'
-    implementation 'com.google.firebase:firebase-crashlytics:17.4.1'
-
-    implementation 'androidx.multidex:multidex:2.0.1'
+    implementation 'com.google.firebase:firebase-analytics:19.0.2'
+    implementation 'com.google.firebase:firebase-crashlytics:18.2.3'
 
     if (libraryProjectPath.exists() && gradle.useLocal) { // Local project is favoured
         implementation project(libraryProjectName)
@@ -148,8 +145,8 @@ dependencies {
     // Testing dependencies
     testImplementation 'junit:junit:4.13.1'
 
-    androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation 'androidx.test:rules:1.3.0'
+    androidTestImplementation 'androidx.test:runner:1.4.0'
+    androidTestImplementation 'androidx.test:rules:1.4.0'
     androidTestImplementation 'androidx.annotation:annotation:1.2.0'
 
 }

survey_app/src/main/java/org/opendatakit/survey/application/Survey.java

@@ -15,8 +15,6 @@
 
 import android.content.Context;
 
-import androidx.multidex.MultiDex;
-
 import android.annotation.SuppressLint;
 import com.google.firebase.analytics.FirebaseAnalytics;
 import org.opendatakit.application.CommonApplication;
@@ -39,12 +37,6 @@ public static Survey getInstance() {
     return singleton;
   }
 
-  @Override
-  protected void attachBaseContext(Context base) {
-    super.attachBaseContext(base);
-    MultiDex.install(this);
-  }
-
   @SuppressLint("NewApi")
   @Override
   public void onCreate() {