caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse source 
* origin/dev:
  gradle update to 3.5.0
This commit is contained in:
Johannes Mockenhaupt 2019-08-21 14:00:30 +02:00
parent 0bdaa17082 2f3a2116fb
commit 6586c3e52a
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/build.gradle
View file

@ -54,7 +54,7 @@ def generateGitBuild = { ->
}
def generateGitRemote = { ->
StringBuilder stringBuilder = new StringBuilder();
StringBuilder stringBuilder = new StringBuilder()
try {
def stdout = new ByteArrayOutputStream()
exec {
@ -70,7 +70,7 @@ def generateGitRemote = { ->
}
def generateDate = { ->
StringBuilder stringBuilder = new StringBuilder();
StringBuilder stringBuilder = new StringBuilder()
stringBuilder.append((new Date()).format('yyyy.MM.dd-HH:mm'))
return stringBuilder.toString()
}
@ -80,7 +80,7 @@ def isMaster = { ->
}
def allCommited = { ->
StringBuilder stringBuilder = new StringBuilder();
StringBuilder stringBuilder = new StringBuilder()
try {
def stdout = new ByteArrayOutputStream()
exec {
@ -90,7 +90,7 @@ def allCommited = { ->
String commitObject = stdout.toString().trim()
stringBuilder.append(commitObject)
} catch (ignored) {
return false; // NoGitSystemAvailable
return false // NoGitSystemAvailable
}
return stringBuilder.toString().isEmpty()
@ -225,7 +225,7 @@ dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.google.android.gms:play-services-wearable:17.0.0'
implementation 'com.google.firebase:firebase-core:17.0.1'
implementation 'com.google.firebase:firebase-core:17.1.0'
implementation("com.crashlytics.sdk.android:crashlytics:2.9.9@aar") {
transitive = true;
}

2
build.gradle
View file

@ -10,7 +10,7 @@ buildscript {
maven { url 'https://maven.fabric.io/public' }
}
dependencies {
classpath 'com.android.tools.build:gradle:3.4.2'
classpath 'com.android.tools.build:gradle:3.5.0'
classpath 'com.google.gms:google-services:4.3.0'
classpath 'io.fabric.tools:gradle:1.31.0'

4
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
#Mon Apr 02 11:30:12 CEST 2018
#Wed Aug 21 10:14:00 CEST 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