Skip to content
This repository has been archived by the owner on Nov 12, 2024. It is now read-only.

Commit

Permalink
Merge pull request #576 from chrisbanes/cb/dependency-updates
Browse files Browse the repository at this point in the history 
Dependency updates
  • Loading branch information
@github-actions
github-actions[bot] authored Mar 28, 2020
2 parents 845a6c3 + 497056d commit e0d694f
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 29 deletions.
11 changes: 5 additions & 6 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ buildscript {
google()
mavenCentral()
maven { url 'https://maven.fabric.io/public' }
maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }

jcenter()
}
Expand All @@ -52,7 +51,7 @@ buildscript {
}

plugins {
id 'com.diffplug.gradle.spotless' version '3.27.1'
id 'com.diffplug.gradle.spotless' version '3.28.0'
id 'com.github.ben-manes.versions' version '0.28.0'
}

Expand Down Expand Up @@ -84,10 +83,10 @@ subprojects {
allWarningsAsErrors = true

// Enable experimental coroutines APIs, including Flow
freeCompilerArgs += "-Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi"
freeCompilerArgs += "-Xuse-experimental=kotlinx.coroutines.FlowPreview"
freeCompilerArgs += "-Xuse-experimental=kotlinx.coroutines.FlowPreview"
freeCompilerArgs += "-Xuse-experimental=kotlin.Experimental"
freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.FlowPreview"
freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.FlowPreview"
freeCompilerArgs += "-Xopt-in=kotlin.Experimental"

// Set JVM target to 1.8
jvmTarget = "1.8"
Expand Down
35 changes: 15 additions & 20 deletions buildSrc/src/main/java/app/tivi/buildsrc/dependencies.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,20 @@ object Versions {
object Libs {
const val androidGradlePlugin = "com.android.tools.build:gradle:4.1.0-alpha04"
const val dexcountGradlePlugin = "com.getkeepsafe.dexcount:dexcount-gradle-plugin:1.0.2"
const val playPublisherPlugin = "com.github.triplet.gradle:play-publisher:2.7.1"
const val playPublisherPlugin = "com.github.triplet.gradle:play-publisher:2.7.3"

const val mvRx = "com.airbnb.android:mvrx:1.3.0"

const val threeTenBp = "org.threeten:threetenbp:1.4.1"
const val threeTenBp = "org.threeten:threetenbp:1.4.2"
const val threeTenBpNoTzdb = "$threeTenBp:no-tzdb"
const val threeTenAbp = "com.jakewharton.threetenabp:threetenabp:1.2.2"
const val threeTenAbp = "com.jakewharton.threetenabp:threetenabp:1.2.3"

const val gravitySnapHelper = "com.github.rubensousa:gravitysnaphelper:2.2.0"

const val timber = "com.jakewharton.timber:timber:4.7.1"

const val tmdbJava = "com.uwetrottmann.tmdb2:tmdb-java:2.2.0"
const val traktJava = "com.uwetrottmann.trakt5:trakt-java:6.4.0"
const val traktJava = "com.uwetrottmann.trakt5:trakt-java:6.5.0"

const val appauth = "net.openid:appauth:0.7.1"

Expand All @@ -60,25 +60,25 @@ object Libs {

object Google {
const val material = "com.google.android.material:material:1.1.0"
const val firebaseCore = "com.google.firebase:firebase-core:17.2.2"
const val firebaseCore = "com.google.firebase:firebase-core:17.2.3"
const val crashlytics = "com.crashlytics.sdk.android:crashlytics:2.10.1"
const val gmsGoogleServices = "com.google.gms:google-services:4.3.3"
const val fabricPlugin = "io.fabric.tools:gradle:1.31.2"

const val openSourceLicensesPlugin = "com.google.android.gms:oss-licenses-plugin:0.10.1"
const val openSourceLicensesPlugin = "com.google.android.gms:oss-licenses-plugin:0.10.2"
const val openSourceLicensesLibrary = "com.google.android.gms:play-services-oss-licenses:17.0.0"
}

object Kotlin {
private const val version = "1.3.61"
private const val version = "1.3.71"
const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
const val reflect = "org.jetbrains.kotlin:kotlin-reflect:$version"
const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
}

object Coroutines {
private const val version = "1.3.2"
private const val version = "1.3.5"
const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version"
const val rx2 = "org.jetbrains.kotlinx:kotlinx-coroutines-rx2:$version"
const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version"
Expand All @@ -92,7 +92,7 @@ object Libs {
const val palette = "androidx.palette:palette:1.0.0"
const val recyclerview = "androidx.recyclerview:recyclerview:1.1.0"
const val emoji = "androidx.emoji:emoji:1.0.0"
const val swiperefresh = "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha03"
const val swiperefresh = "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-beta01"

object Navigation {
private const val version = "2.2.1"
Expand All @@ -102,7 +102,7 @@ object Libs {
}

object Fragment {
private const val version = "1.2.2"
private const val version = "1.2.3"
const val fragment = "androidx.fragment:fragment:$version"
const val fragmentKtx = "androidx.fragment:fragment-ktx:$version"
}
Expand All @@ -119,7 +119,7 @@ object Libs {
const val archCoreTesting = "androidx.arch.core:core-testing:2.1.0"

object Paging {
private const val version = "2.1.1"
private const val version = "2.1.2"
const val common = "androidx.paging:paging-common-ktx:$version"
const val runtime = "androidx.paging:paging-runtime-ktx:$version"
}
Expand All @@ -137,7 +137,7 @@ object Libs {
}

object Room {
private const val version = "2.2.4"
private const val version = "2.2.5"
const val common = "androidx.room:room-common:$version"
const val runtime = "androidx.room:room-runtime:$version"
const val compiler = "androidx.room:room-compiler:$version"
Expand All @@ -146,7 +146,7 @@ object Libs {
}

object Work {
private const val version = "2.3.2"
private const val version = "2.3.4"
const val runtimeKtx = "androidx.work:work-runtime-ktx:$version"
}

Expand All @@ -163,21 +163,16 @@ object Libs {
}
}

object RxJava {
const val rxJava = "io.reactivex.rxjava2:rxjava:2.2.11"
const val rxAndroid = "io.reactivex.rxjava2:rxandroid:2.1.1"
}

object Dagger {
private const val version = "2.26"
private const val version = "2.27"
const val dagger = "com.google.dagger:dagger:$version"
const val androidSupport = "com.google.dagger:dagger-android-support:$version"
const val compiler = "com.google.dagger:dagger-compiler:$version"
const val androidProcessor = "com.google.dagger:dagger-android-processor:$version"
}

object Retrofit {
private const val version = "2.7.1"
private const val version = "2.8.1"
const val retrofit = "com.squareup.retrofit2:retrofit:$version"
const val retrofit_rxjava_adapter = "com.squareup.retrofit2:adapter-rxjava2:$version"
const val gsonConverter = "com.squareup.retrofit2:converter-gson:$version"
Expand Down
2 changes: 1 addition & 1 deletion ...on-imageloading/src/main/java/app/tivi/common/imageloading/ImageLoadingBindingAdapters.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ fun ImageView.loadLogo(
"imageCornerRadius",
requireAll = false
)
@UseExperimental(ExperimentalCoil::class)
@OptIn(ExperimentalCoil::class)
fun ImageView.loadImage(
oldImage: TmdbImageEntity?,
oldSaturateOnLoad: Boolean?,
Expand Down
4 changes: 2 additions & 2 deletions tasks/src/main/java/app/tivi/tasks/ShowTasksImpl.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ class ShowTasksImpl @Inject constructor(
override fun setupNightSyncs() {
val request = PeriodicWorkRequest.Builder(
SyncAllFollowedShows::class.java,
24, TimeUnit.HOURS,
12, TimeUnit.HOURS
24L, TimeUnit.HOURS,
12L, TimeUnit.HOURS
).setConstraints(
Constraints.Builder()
.setRequiredNetworkType(NetworkType.CONNECTED)
Expand Down

0 comments on commit e0d694f

Please sign in to comment.