Skip to content

Commit

Permalink
Merge pull request #133 from wbrunette/threefive
Browse files Browse the repository at this point in the history
update android DSL and tools
  • Loading branch information
linl33 authored Aug 28, 2019
2 parents 3ee74fc + b9cf865 commit 5162115
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ buildscript {
}
}
dependencies {
classpath 'com.android.tools.build:gradle:3.4.2'
classpath 'com.android.tools.build:gradle:3.5.0'
classpath 'io.fabric.tools:gradle:1.31.0'
classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.9.3'
classpath 'com.google.gms:google-services:4.3.0'
classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.9.8'
classpath 'com.google.gms:google-services:4.3.1'
}
}

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Jul 19 12:01:18 PDT 2019
#Tue Aug 27 13:23:47 PDT 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
gradle.ext.gradleConfigVersion = 132
gradle.ext.gradleConfigVersion = 133

if ( !gradle.ext.has('workspacePath') ) {
def env = System.getProperties();
Expand Down
4 changes: 2 additions & 2 deletions tables_app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ dependencies {
implementation 'androidx.preference:preference:1.0.0'
implementation 'androidx.appcompat:appcompat:1.0.2'
implementation 'androidx.recyclerview:recyclerview:1.0.0'
implementation 'com.github.wbrunette:ProgressWheel:2.0'
implementation 'com.google.firebase:firebase-core:17.0.1'
implementation 'com.github.wbrunette:ProgressWheel:3.4'
implementation 'com.google.firebase:firebase-core:17.1.0'
implementation ('com.crashlytics.sdk.android:crashlytics:2.10.1@aar') {
transitive =true;
}
Expand Down

0 comments on commit 5162115

Please sign in to comment.