Merge branch 'master' into master

This commit is contained in:
ligi 2020-03-05 01:05:20 +01:00 committed by GitHub
commit df3942c3bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions

View file

@ -112,7 +112,7 @@ dependencies {
implementation 'org.permissionsdispatcher:permissionsdispatcher:4.6.0'
kapt 'org.permissionsdispatcher:permissionsdispatcher-processor:4.6.0'
implementation "org.koin:koin-android:2.1.1"
implementation "org.koin:koin-android:2.1.2"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3"
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'

View file

@ -1,6 +1,6 @@
buildscript {
ext {
kotlin_version = '1.3.61'
kotlin_version = '1.3.70'
mockito_version = '3.2.4'
}

View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists