Merge pull request #106 from wbrunette/bldupg

upgrade dependencies
odk-x · Mar 15, 2019 · 8339807 · 8339807
2 parents 028d81c + faaace8
commit 8339807
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -9,10 +9,10 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.2'
         classpath 'io.fabric.tools:gradle:1.26.0'
-        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.7.0'
-        classpath 'com.google.gms:google-services:4.1.0'
+        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.9.3'
+        classpath 'com.google.gms:google-services:4.2.0'
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Sep 27 16:21:07 PDT 2018
+#Thu Mar 14 14:13:31 PDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
diff --git a/settings.gradle b/settings.gradle
@@ -1,4 +1,4 @@
-gradle.ext.gradleConfigVersion = 117
+gradle.ext.gradleConfigVersion = 118
 
 if ( !gradle.ext.has('workspacePath') ) {
 	def env = System.getProperties();

diff --git a/tables_app/build.gradle b/tables_app/build.gradle
@@ -123,8 +123,8 @@ dependencies {
     implementation 'com.android.support:support-fragment:28.0.0'
     implementation 'com.android.support:preference-v7:28.0.0'
     implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.github.Todd-Davies:ProgressWheel:1.2'
-    implementation 'com.google.firebase:firebase-core:16.0.3'
+    implementation 'com.github.wbrunette:ProgressWheel:2.0'
+    implementation 'com.google.firebase:firebase-core:16.0.7'
     implementation ('com.crashlytics.sdk.android:crashlytics:2.9.5@aar') {
         transitive =true;
     }
@@ -151,7 +151,7 @@ dependencies {
                 classifier: snapshotRelease, version: latestVersion, ext: 'aar')
     }
 
-    implementation 'com.google.android.gms:play-services-maps:15.0.1'
+    implementation 'com.google.android.gms:play-services-maps:16.1.0'
 
     //for Espresso
     androidTestUitestImplementation 'com.android.support.test:runner:1.0.2'