Merge pull request #169 from odk-x/demo

release 2.1.7
odk-x · Dec 29, 2020 · ed04ea0 · ed04ea0
2 parents d1b97d3 + b6e9212
commit ed04ea0
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 40 deletions.
diff --git a/build.gradle b/build.gradle
@@ -4,25 +4,19 @@ buildscript {
         google()
         jcenter()
         mavenCentral()
-        maven {
-            url 'https://maven.fabric.io/public'
-        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
-        classpath 'io.fabric.tools:gradle:1.31.0'
+        classpath 'com.android.tools.build:gradle:4.1.0'
         classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.9.8'
-        classpath 'com.google.gms:google-services:4.3.3'
+        classpath 'com.google.gms:google-services:4.3.4'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0'
     }
 }
 
 allprojects {
     repositories {
         google()
         jcenter()
-        maven {
-            url 'https://maven.fabric.io/public'
-        }
         maven {
             url "https://jitpack.io"
         }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Aug 27 13:23:47 PDT 2019
+#Thu Oct 29 14:28:12 PDT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
diff --git a/settings.gradle b/settings.gradle
@@ -1,4 +1,4 @@
-gradle.ext.gradleConfigVersion = 141
+gradle.ext.gradleConfigVersion = 146
 
 if ( !gradle.ext.has('workspacePath') ) {
 	def env = System.getProperties();

diff --git a/tables_app/build.gradle b/tables_app/build.gradle
@@ -13,7 +13,8 @@ applicationScripts.each {
 }
 
 apply plugin: 'com.android.application'
-apply plugin: 'io.fabric'
+apply plugin: 'com.google.gms.google-services'
+apply plugin: 'com.google.firebase.crashlytics'
 
 android {
     // The following are set in the common.gradle file
@@ -125,16 +126,15 @@ allprojects {
 dependencies {
     implementation 'androidx.annotation:annotation:1.1.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.fragment:fragment:1.1.0'
-    implementation 'androidx.preference:preference:1.1.0'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.fragment:fragment:1.2.5'
+    implementation 'androidx.preference:preference:1.1.1'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'androidx.fragment:fragment:1.2.0-rc04'
+    implementation 'androidx.fragment:fragment:1.3.0-beta01'
     implementation 'com.github.wbrunette:ProgressWheel:3.4'
-    implementation 'com.google.firebase:firebase-core:17.2.1'
-    implementation ('com.crashlytics.sdk.android:crashlytics:2.10.1@aar') {
-        transitive =true;
-    }
+
+    implementation 'com.google.firebase:firebase-analytics:18.0.0'
+    implementation 'com.google.firebase:firebase-crashlytics:17.2.2'
 
     implementation 'androidx.multidex:multidex:2.0.1'
 
@@ -163,12 +163,12 @@ dependencies {
     implementation 'com.google.android.gms:play-services-maps:17.0.0'
 
     //for Espresso
-    androidTestUitestImplementation 'androidx.test:runner:1.2.0'
-    androidTestUitestImplementation 'androidx.test:rules:1.2.0'
-    androidTestUitestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    androidTestUitestImplementation 'androidx.test.espresso:espresso-intents:3.2.0'
-    androidTestUitestImplementation 'androidx.test.espresso:espresso-web:3.2.0'
-    androidTestUitestImplementation 'androidx.test.espresso:espresso-contrib:3.2.0'
+    androidTestUitestImplementation 'androidx.test:runner:1.3.0'
+    androidTestUitestImplementation 'androidx.test:rules:1.3.0'
+    androidTestUitestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestUitestImplementation 'androidx.test.espresso:espresso-intents:3.3.0'
+    androidTestUitestImplementation 'androidx.test.espresso:espresso-web:3.3.0'
+    androidTestUitestImplementation 'androidx.test.espresso:espresso-contrib:3.3.0'
     androidTestUitestImplementation 'androidx.annotation:annotation:1.1.0'
 
     //for UI Automator
@@ -181,4 +181,5 @@ task grantPermissionForODKApp {
     dependsOn grantServicesWriteExternalStoragePermission
 }
 
-apply plugin: 'com.google.gms.google-services'
+
+
diff --git a/tables_app/google-services.json b/tables_app/google-services.json
@@ -1,24 +1,21 @@
 {
   "project_info": {
-    "project_number": "322300403941",
-    "firebase_url": "https://api-project-322300403941.firebaseio.com",
-    "project_id": "api-project-322300403941",
-    "storage_bucket": "api-project-322300403941.appspot.com"
+    "project_number": "876360963794",
+    "firebase_url": "https://odk-x-97b95.firebaseio.com",
+    "project_id": "odk-x-97b95",
+    "storage_bucket": "odk-x-97b95.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:322300403941:android:bc82ad1b2d50e3bc",
+        "mobilesdk_app_id": "1:876360963794:android:98706b15d2122f52f5bf0b",
         "android_client_info": {
           "package_name": "org.opendatakit.tables"
         }
       },
       "api_key": [
         {
-          "current_key": "AIzaSyDzdzuFvfI_BgaMAbIOBpfrVG3AIwhGIP8"
-        },
-        {
-          "current_key": "AIzaSyBNMza9CWEOq6kLIYp6UtpQJu7dPdMUgkE"
+          "current_key": "AIzaSyBsjcNb77BHWv81ubNn2hwW_D20hjsC_qM"
         }
       ],
       "services": {

diff --git a/tables_app/src/main/AndroidManifest.xml b/tables_app/src/main/AndroidManifest.xml
@@ -3,7 +3,9 @@
           xmlns:tools="http://schemas.android.com/tools"
           package="org.opendatakit.tables">
 
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
@@ -36,6 +38,7 @@
             android:largeHeap="true"
             android:installLocation="auto"
             android:networkSecurityConfig="@xml/network_security_config"
+            android:requestLegacyExternalStorage="true"
             android:hardwareAccelerated="true">
         <meta-data
                 android:name="com.google.android.maps.v2.API_KEY"

diff --git a/tables_app/src/main/java/org/opendatakit/tables/application/Tables.java b/tables_app/src/main/java/org/opendatakit/tables/application/Tables.java
@@ -18,9 +18,7 @@
 
 import androidx.multidex.MultiDex;
 
-import com.crashlytics.android.Crashlytics;
 import com.google.firebase.analytics.FirebaseAnalytics;
-import io.fabric.sdk.android.Fabric;
 import org.opendatakit.application.CommonApplication;
 import org.opendatakit.tables.R;
 
@@ -80,7 +78,6 @@ public void onCreate() {
     ref = new WeakReference<>(this);
     super.onCreate();
 
-    Fabric.with(this, new Crashlytics());
     analytics = FirebaseAnalytics.getInstance(this);
     analytics.logEvent(FirebaseAnalytics.Event.APP_OPEN, null);
   }

diff --git a/tables_app/src/main/res/raw/configzip b/tables_app/src/main/res/raw/configzip
diff --git a/tables_app/src/main/res/raw/systemzip b/tables_app/src/main/res/raw/systemzip