Merge pull request #177 from odk-x/demo

release 2.1.7
odk-x · Dec 29, 2020 · 87d4773 · 87d4773
2 parents f10c1aa + d792b77
commit 87d4773
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 42 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,25 +3,19 @@ buildscript {
     repositories {
         google()
         jcenter()
-        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'
-        }
         ivy {
             url 'http://cwe.cs.washington.edu:8082/artifactory/libs-demo/'
         }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Aug 22 15:20:05 PDT 2019
+#Thu Oct 29 13:37:47 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/services_app/build.gradle b/services_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
@@ -118,16 +119,14 @@ dependencies {
     implementation fileTree(include: '*.jar', dir: 'libs')
     implementation 'androidx.annotation:annotation:1.1.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.preference:preference:1.1.0'
-    implementation 'androidx.fragment:fragment:1.2.0-rc04'
-    implementation 'com.google.firebase:firebase-core:17.2.1'
-    implementation('com.crashlytics.sdk.android:crashlytics:2.10.1@aar') {
-        transitive = true;
-    }
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.preference:preference:1.1.1'
+    implementation 'androidx.fragment:fragment:1.3.0-beta01'
+    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'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
 
     implementation group: 'com.google.zxing', name: 'core', version: '3.3.0'
     implementation group: 'com.journeyapps', name: 'zxing-android-embedded', version: '3.5.0'
@@ -144,8 +143,8 @@ dependencies {
     }
 
     // Testing-only dependencies
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test:rules:1.2.0'
+    androidTestImplementation 'androidx.test:runner:1.3.0'
+    androidTestImplementation 'androidx.test:rules:1.3.0'
     androidTestImplementation fileTree(include: '*.jar', dir: 'libs')
     androidTestImplementation 'androidx.annotation:annotation:1.1.0'
 
@@ -157,6 +156,3 @@ task grantPermissionForODKApp {
     dependsOn grantServicesReadExternalStoragePermission
     dependsOn grantServicesWriteExternalStoragePermission
 }
-
-apply plugin: 'com.google.gms.google-services'
-
diff --git a/services_app/google-services.json b/services_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_info": {
+    "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:decf3a91261ea092",
+        "mobilesdk_app_id": "1:876360963794:android:2dfda8551d981194f5bf0b",
         "android_client_info": {
           "package_name": "org.opendatakit.services"
         }
       },
-	  "api_key": [
+      "api_key": [
         {
-          "current_key": "AIzaSyDzdzuFvfI_BgaMAbIOBpfrVG3AIwhGIP8"
-        },
-        {
-          "current_key": "AIzaSyBNMza9CWEOq6kLIYp6UtpQJu7dPdMUgkE"
+          "current_key": "AIzaSyBsjcNb77BHWv81ubNn2hwW_D20hjsC_qM"
         }
       ],
       "services": {
@@ -27,7 +24,6 @@
         }
       }
     }
-
   ],
   "configuration_version": "1"
 }
diff --git a/services_app/src/main/AndroidManifest.xml b/services_app/src/main/AndroidManifest.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.opendatakit.services">
+
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
@@ -47,6 +50,7 @@
 
     <application
         android:name="org.opendatakit.services.application.Services"
+        android:requestLegacyExternalStorage="true"
         android:usesCleartextTraffic="true"
         android:allowBackup="true"
         android:largeHeap="true"

diff --git a/services_app/src/main/java/org/opendatakit/services/application/Services.java b/services_app/src/main/java/org/opendatakit/services/application/Services.java
@@ -22,7 +22,6 @@
 
 import androidx.multidex.MultiDexApplication;
 
-import com.crashlytics.android.Crashlytics;
 import com.google.firebase.analytics.FirebaseAnalytics;
 
 import org.opendatakit.application.IToolAware;
@@ -31,8 +30,6 @@
 
 import java.lang.ref.WeakReference;
 
-import io.fabric.sdk.android.Fabric;
-
 public final class Services extends MultiDexApplication implements IToolAware {
 
   private static final String t = Services.class.getSimpleName();
@@ -49,7 +46,6 @@ public void onCreate() {
     if (singleton == null) singleton = new WeakReference<>(this);
     super.onCreate();
 
-    Fabric.with(this, new Crashlytics());
     analytics = FirebaseAnalytics.getInstance(this);
     analytics.logEvent(FirebaseAnalytics.Event.APP_OPEN, null);
   }

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')) {