From 9b7d98d5fd259577a843362bac5d3db59ce4a2c1 Mon Sep 17 00:00:00 2001 From: wbrunette Date: Wed, 1 Jan 2020 16:54:43 -0800 Subject: [PATCH 1/5] update version --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index f206e2da0..51dbc6bf4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,4 @@ -gradle.ext.gradleConfigVersion = 141 +gradle.ext.gradleConfigVersion = 142 if (!gradle.ext.has('workspacePath')) { From b3d97c79787556ebf1840a074c0d38207f56ae95 Mon Sep 17 00:00:00 2001 From: wbrunette Date: Mon, 12 Oct 2020 18:54:48 -0700 Subject: [PATCH 2/5] stage 1 - upgrade dependencies and remove fabric --- build.gradle | 12 +++-------- services_app/build.gradle | 20 +++++++++---------- .../services/application/Services.java | 4 ---- settings.gradle | 2 +- 4 files changed, 13 insertions(+), 25 deletions(-) diff --git a/build.gradle b/build.gradle index 36b5c67c2..c76f47002 100644 --- a/build.gradle +++ b/build.gradle @@ -3,15 +3,12 @@ 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:3.5.4' 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' } } @@ -19,9 +16,6 @@ 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/services_app/build.gradle b/services_app/build.gradle index 368f75eaf..c1246cd38 100644 --- a/services_app/build.gradle +++ b/services_app/build.gradle @@ -13,7 +13,6 @@ applicationScripts.each { } apply plugin: 'com.android.application' -apply plugin: 'io.fabric' android { // The following are set in the common.gradle file @@ -118,16 +117,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:17.5.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 +141,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' @@ -159,4 +156,5 @@ task grantPermissionForODKApp { } apply plugin: 'com.google.gms.google-services' +apply plugin: 'com.google.firebase.crashlytics' 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 index 4037f7651..e221b85cc 100644 --- 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 index 51dbc6bf4..54d4be078 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,4 @@ -gradle.ext.gradleConfigVersion = 142 +gradle.ext.gradleConfigVersion = 143 if (!gradle.ext.has('workspacePath')) { From 36547e1da2119d0ae38fafee83935a5f86ada186 Mon Sep 17 00:00:00 2001 From: wbrunette Date: Thu, 29 Oct 2020 17:48:45 -0700 Subject: [PATCH 3/5] upgrade android gradle plugin --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- settings.gradle | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index c76f47002..6df6bd339 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.4' + 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.4' classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index dfde60afd..d1b3a547e 100644 --- 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/settings.gradle b/settings.gradle index 54d4be078..202a8f1e5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,4 @@ -gradle.ext.gradleConfigVersion = 143 +gradle.ext.gradleConfigVersion = 144 if (!gradle.ext.has('workspacePath')) { From 2ecaff4b40813ba06060d336da687aaeca43978b Mon Sep 17 00:00:00 2001 From: wbrunette Date: Mon, 9 Nov 2020 13:23:55 -0800 Subject: [PATCH 4/5] add legacyExternalStorage flag and change firebase --- services_app/build.gradle | 8 +++----- services_app/google-services.json | 20 ++++++++------------ services_app/src/main/AndroidManifest.xml | 4 ++++ 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/services_app/build.gradle b/services_app/build.gradle index c1246cd38..9956c133d 100644 --- a/services_app/build.gradle +++ b/services_app/build.gradle @@ -13,6 +13,8 @@ applicationScripts.each { } apply plugin: 'com.android.application' +apply plugin: 'com.google.gms.google-services' +apply plugin: 'com.google.firebase.crashlytics' android { // The following are set in the common.gradle file @@ -120,7 +122,7 @@ dependencies { 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:17.5.0' + 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' @@ -154,7 +156,3 @@ task grantPermissionForODKApp { dependsOn grantServicesReadExternalStoragePermission dependsOn grantServicesWriteExternalStoragePermission } - -apply plugin: 'com.google.gms.google-services' -apply plugin: 'com.google.firebase.crashlytics' - diff --git a/services_app/google-services.json b/services_app/google-services.json index bd7038ff2..45e3537bc 100644 --- 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" } \ No newline at end of file diff --git a/services_app/src/main/AndroidManifest.xml b/services_app/src/main/AndroidManifest.xml index 9fd86ce71..6983aad35 100644 --- a/services_app/src/main/AndroidManifest.xml +++ b/services_app/src/main/AndroidManifest.xml @@ -1,7 +1,10 @@ + + + @@ -47,6 +50,7 @@ Date: Mon, 7 Dec 2020 13:04:57 -0800 Subject: [PATCH 5/5] update gradle config version --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 202a8f1e5..34ef67941 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,4 @@ -gradle.ext.gradleConfigVersion = 144 +gradle.ext.gradleConfigVersion = 145 if (!gradle.ext.has('workspacePath')) {