Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Kotlin to 1.4.20, also bump Coroutines, RxJava3 and AGP #568

Merged
merged 2 commits into from
Dec 8, 2020
Merged

Update Kotlin to 1.4.20, also bump Coroutines, RxJava3 and AGP #568

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3c4b3d
Update Kotlin to 1.4.20, also bump Coroutines, RxJava3 and AGP
Nov 27, 2020
0abe8b6
Merge branch 'master' into update-Kotlin-to-1.4.20
Dec 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions includedBuild/dependencies/src/main/kotlin/com/badoo/reaktive/dependencies/Deps.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package com.badoo.reaktive.dependencies

object Deps {

private const val kotlinVersion = "1.4.10"
private const val coroutinesVersion = "1.4.0"
private const val kotlinVersion = "1.4.20"
private const val coroutinesVersion = "1.4.2"
private const val detektVersion = "1.9.1"
private const val asmVersion = "6.0"

Expand All @@ -14,7 +14,7 @@ object Deps {
val detekt = Detekt
val asm = Asm()
val rxjava2 = "io.reactivex.rxjava2:rxjava:2.2.7"
val rxjava3 = "io.reactivex.rxjava3:rxjava:3.0.0-RC3"
val rxjava3 = "io.reactivex.rxjava3:rxjava:3.0.7"
val picasso = "com.squareup.picasso:picasso:2.71828"
val bintray = "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4"
val shadow = "com.github.jengelman.gradle.plugins:shadow:5.1.0"
Expand Down Expand Up @@ -70,7 +70,7 @@ object Deps {
}

object Android {
const val plugin = "com.android.tools.build:gradle:3.4.1"
const val plugin = "com.android.tools.build:gradle:4.1.0"
val androidx = Androidx

object Androidx {
Expand Down