Skip to content
Permalink
Browse files

More dependency updates

  • Loading branch information...
chrisbanes committed Sep 24, 2019
1 parent 1f062a3 commit 7b5aafde1b1906cc70bfbecf97b731587d730647
@@ -5,7 +5,7 @@
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
<option name="myNullables">
<value>
<list size="10">
<list size="12">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
@@ -16,12 +16,14 @@
<item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
<item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
<item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
<item index="10" class="java.lang.String" itemvalue="android.annotation.Nullable" />
<item index="11" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
</list>
</value>
</option>
<option name="myNotNulls">
<value>
<list size="9">
<list size="11">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
@@ -31,11 +33,13 @@
<item index="6" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
<item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
<item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
<item index="9" class="java.lang.String" itemvalue="android.annotation.NonNull" />
<item index="10" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
</list>
</value>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
@@ -52,8 +52,8 @@ buildscript {
}

plugins {
id "com.diffplug.gradle.spotless" version "3.24.0"
id 'com.github.ben-manes.versions' version "0.22.0"
id "com.diffplug.gradle.spotless" version "3.24.3"
id 'com.github.ben-manes.versions' version "0.25.0"
}

allprojects {
@@ -23,20 +23,20 @@ object Versions {
object Libs {
const val androidGradlePlugin = "com.android.tools.build:gradle:3.5.0"
const val dexcountGradlePlugin = "com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.6"
const val playPublisherPlugin = "com.github.triplet.gradle:play-publisher:2.3.0"
const val playPublisherPlugin = "com.github.triplet.gradle:play-publisher:2.4.1"

const val mvRx = "com.airbnb.android:mvrx:1.0.1"
const val mvRx = "com.airbnb.android:mvrx:1.1.0"

const val threeTenBp = "org.threeten:threetenbp:1.4.0"
const val threeTenBpNoTzdb = "$threeTenBp:no-tzdb"
const val threeTenAbp = "com.jakewharton.threetenabp:threetenabp:1.2.1"

const val gravitySnapHelper = "com.github.rubensousa:gravitysnaphelper:2.1.0"
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.1.1"
const val traktJava = "com.uwetrottmann.trakt5:trakt-java:6.2.0"
const val traktJava = "com.uwetrottmann.trakt5:trakt-java:6.4.0"

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

@@ -47,11 +47,11 @@ object Libs {
const val inboxRecyclerView = "me.saket:inboxrecyclerview:2.0.0-beta3"

object Google {
const val material = "com.google.android.material:material:1.1.0-alpha09"
const val firebaseCore = "com.google.firebase:firebase-core:17.1.0"
const val material = "com.google.android.material:material:1.1.0-alpha10"
const val firebaseCore = "com.google.firebase:firebase-core:17.2.0"
const val crashlytics = "com.crashlytics.sdk.android:crashlytics:2.10.1"
const val gmsGoogleServices = "com.google.gms:google-services:4.3.0"
const val fabricPlugin = "io.fabric.tools:gradle:1.31.0"
const val gmsGoogleServices = "com.google.gms:google-services:4.3.2"
const val fabricPlugin = "io.fabric.tools:gradle:1.31.1"

const val openSourceLicensesPlugin = "com.google.android.gms:oss-licenses-plugin:0.9.5"
const val openSourceLicensesLibrary = "com.google.android.gms:play-services-oss-licenses:17.0.0"
@@ -74,11 +74,11 @@ object Libs {
}

object AndroidX {
const val appcompat = "androidx.appcompat:appcompat:1.1.0-rc01"
const val appcompat = "androidx.appcompat:appcompat:1.1.0"
const val browser = "androidx.browser:browser:1.0.0"
const val collection = "androidx.collection:collection-ktx:1.1.0"
const val palette = "androidx.palette:palette:1.0.0"
const val recyclerview = "androidx.recyclerview:recyclerview:1.1.0-beta03"
const val recyclerview = "androidx.recyclerview:recyclerview:1.1.0-beta04"
const val emoji = "androidx.emoji:emoji:1.0.0"
const val swiperefresh = "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha02"

@@ -104,19 +104,19 @@ object Libs {
const val espressoCore = "androidx.test.espresso:espresso-core:3.2.0"
}

const val archCoreTesting = "androidx.arch.core:core-testing:2.0.1"
const val archCoreTesting = "androidx.arch.core:core-testing:2.1.0"

object Paging {
private const val version = "2.1.0"
const val common = "androidx.paging:paging-common-ktx:$version"
const val runtime = "androidx.paging:paging-runtime-ktx:$version"
}

const val preference = "androidx.preference:preference:1.1.0-rc01"
const val preference = "androidx.preference:preference:1.1.0"

const val constraintlayout = "androidx.constraintlayout:constraintlayout:2.0.0-beta2"

const val coreKtx = "androidx.core:core-ktx:1.2.0-alpha03"
const val coreKtx = "androidx.core:core-ktx:1.2.0-alpha04"

object Lifecycle {
private const val version = "2.2.0-alpha03"
@@ -126,7 +126,7 @@ object Libs {
}

object Room {
private const val version = "2.2.0-beta01"
private const val version = "2.2.0-rc01"
const val common = "androidx.room:room-common:$version"
const val runtime = "androidx.room:room-runtime:$version"
const val compiler = "androidx.room:room-compiler:$version"
@@ -154,20 +154,20 @@ object Libs {
}

object Retrofit {
private const val version = "2.6.1"
private const val version = "2.6.2"
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"
}

object OkHttp {
private const val version = "4.1.0"
private const val version = "4.2.0"
const val okhttp = "com.squareup.okhttp3:okhttp:$version"
const val loggingInterceptor = "com.squareup.okhttp3:logging-interceptor:$version"
}

object Epoxy {
private const val version = "3.7.0"
private const val version = "3.8.0"
const val epoxy = "com.airbnb.android:epoxy:$version"
const val paging = "com.airbnb.android:epoxy-paging:$version"
const val dataBinding = "com.airbnb.android:epoxy-databinding:$version"
@@ -37,16 +37,20 @@ class MaterialShapeConstraintLayout @JvmOverloads constructor(
background = MaterialShapeDrawable.createWithElevationOverlay(context, elevation).apply {
fillColor = ta.getColorStateList(R.styleable.MaterialShapeConstraintLayout_materialBackgroundColor)

val builder = shapeAppearanceModel.toBuilder()

val topLeft = ta.getDimensionPixelSize(
R.styleable.MaterialShapeConstraintLayout_materialBackgroundTopLeftRadius, 0)
if (topLeft > 0) {
shapeAppearanceModel.setTopLeftCorner(CornerFamily.ROUNDED, topLeft)
builder.setTopLeftCorner(CornerFamily.ROUNDED, topLeft)
}
val topRight = ta.getDimensionPixelSize(
R.styleable.MaterialShapeConstraintLayout_materialBackgroundTopRightRadius, 0)
if (topRight > 0) {
shapeAppearanceModel.setTopRightCorner(CornerFamily.ROUNDED, topRight)
builder.setTopRightCorner(CornerFamily.ROUNDED, topRight)
}

shapeAppearanceModel = builder.build()
}
}
}
@@ -65,9 +65,10 @@ class TopLeftCutoutBackgroundView : View {
val shapeModel = shapeDrawable.shapeAppearanceModel
val newCutSize = lerp(0f, maxCutSize, cutProgress)

if (newCutSize != shapeModel.topLeftCorner?.cornerSize) {
shapeModel.topLeftCorner = CutCornerTreatment(newCutSize)
shapeDrawable.shapeAppearanceModel = shapeModel
if (newCutSize != shapeModel.topLeftCorner.cornerSize) {
shapeDrawable.shapeAppearanceModel = shapeModel.toBuilder()
.setTopLeftCorner(CutCornerTreatment(newCutSize))
.build()
}
}
}
@@ -32,7 +32,7 @@ class TraktRecommendedShowsDataSource @Inject constructor(
) : RecommendedShowsDataSource {
override suspend fun getRecommendedShows(page: Int, pageSize: Int): Result<List<TiviShow>> {
// We add 1 because Trakt uses a 1-based index whereas we use a 0-based index
return recommendationsService.get().shows(null)
return recommendationsService.get().shows(page + 1, pageSize, null)
.executeWithRetry()
.toResult(showMapper.toListMapper())
}
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 7b5aafd

Please sign in to comment.
You can’t perform that action at this time.