Commit efb33417 authored by Eugene Shapovalov's avatar Eugene Shapovalov 💬

Merge remote-tracking branch 'remotes/origin/develop' into feature/project_file_details

# Conflicts:
#	build.gradle.kts
#	gradle/wrapper/gradle-wrapper.properties
parents 14e92c0c 8ae1dd7c
......@@ -126,8 +126,8 @@ dependencies {
implementation("com.squareup.okhttp3:logging-interceptor:3.11.0")
implementation("com.squareup.retrofit2:adapter-rxjava2:$retrofitVersion")
//RxJava
implementation("io.reactivex.rxjava2:rxandroid:2.1.0")
implementation("io.reactivex.rxjava2:rxjava:2.2.3")
implementation("io.reactivex.rxjava2:rxandroid:2.1.1")
implementation("io.reactivex.rxjava2:rxjava:2.2.6")
implementation("com.jakewharton.rxrelay2:rxrelay:2.1.0")
//Adapter simplify
implementation("com.hannesdorfmann:adapterdelegates3:3.1.0")
......@@ -147,9 +147,9 @@ dependencies {
//FlexBox Layout
implementation("com.google.android:flexbox:1.0.0")
//Firebase
implementation("com.google.firebase:firebase-core:16.0.6")
implementation("com.google.firebase:firebase-core:16.0.9")
//Crashlytics
implementation("com.crashlytics.sdk.android:crashlytics:2.9.8")
implementation("com.crashlytics.sdk.android:crashlytics:2.10.0")
//JUnit
testImplementation("junit:junit:4.12")
......
......@@ -5,15 +5,15 @@ buildscript {
maven { url = uri("https://maven.fabric.io/public") }
}
dependencies {
classpath("com.android.tools.build:gradle:3.4.0-alpha04")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.11")
classpath("com.android.tools.build:gradle:3.4.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.31")
classpath("com.google.gms:google-services:4.2.0")
classpath("io.fabric.tools:gradle:1.26.1")
classpath("io.fabric.tools:gradle:1.29.0")
}
}
allprojects {
extra["kotlinVersion"] = "1.3.11"
extra["kotlinVersion"] = "1.3.31"
repositories {
google()
jcenter()
......
#Mon Nov 12 22:43:29 MSK 2018
#Thu Dec 13 22:32:24 MSK 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-milestone-1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment