From 5ba761e02b07b8ba040e20e6defefed2a7cdc716 Mon Sep 17 00:00:00 2001 From: k0shk0sh Date: Sun, 5 Jan 2020 13:44:29 +0100 Subject: [PATCH] update dep --- app/build.gradle | 2 +- base/.gitignore | 1 + build-dependecies/fasthub-dependencies.gradle | 70 +++++++++---------- build.gradle | 2 +- reactions/.gitignore | 1 + resources/src/main/res/values/themes.xml | 2 +- 6 files changed, 40 insertions(+), 38 deletions(-) create mode 100644 base/.gitignore create mode 100644 reactions/.gitignore diff --git a/app/build.gradle b/app/build.gradle index ef8e395c..23ff85b5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -140,7 +140,7 @@ dependencies { implementation dependency.dagger implementation dependency.archs implementation dependency.firebase - api 'com.google.guava:guava:28.1-jre' // for the sake of listenablefuture + api 'com.google.guava:guava:28.2-jre' // for the sake of listenablefuture debugImplementation dependency.developmentDependencies releaseImplementation dependency.releaseDevelopmentDependencies diff --git a/base/.gitignore b/base/.gitignore new file mode 100644 index 00000000..796b96d1 --- /dev/null +++ b/base/.gitignore @@ -0,0 +1 @@ +/build diff --git a/build-dependecies/fasthub-dependencies.gradle b/build-dependecies/fasthub-dependencies.gradle index 7ae76048..de6f61d1 100644 --- a/build-dependecies/fasthub-dependencies.gradle +++ b/build-dependecies/fasthub-dependencies.gradle @@ -3,11 +3,11 @@ ext { rxKotlin = '2.2.0' rxAndroid = '2.0.1' room = '2.1.0-beta01' - paging = '2.1.0' + paging = '2.1.1' lifecycle = '2.2.0-alpha01' navigation = '1.0.0' workManager = '1.0.1' - constraintLayout = '2.0.0-beta2' + constraintLayout = '2.0.0-beta4' dagger2 = '2.24' butterKnife = '8.8.1' javaxAnnotation = '10.0-b28' @@ -17,7 +17,7 @@ ext { glide = '4.10.0' timber = '4.7.1' androidState = '1.4.1' - junit = '4.13-beta-3' + junit = '4.13' mockito = '2.23.4' mockitoKotlin = '1.5.0' assertJ = '3.12.2' @@ -32,18 +32,18 @@ ext { supportLibraries = [ 'androidx.appcompat:appcompat:1.1.0', - 'androidx.coordinatorlayout:coordinatorlayout:1.1.0-beta01', - "com.google.android.material:material:1.1.0-beta01", + 'androidx.coordinatorlayout:coordinatorlayout:1.1.0', + 'com.google.android.material:material:1.2.0-alpha03', "androidx.drawerlayout:drawerlayout:1.0.0", "androidx.recyclerview:recyclerview-selection:1.0.0", - 'androidx.recyclerview:recyclerview:1.1.0-beta04', + 'androidx.recyclerview:recyclerview:1.2.0-alpha01', 'androidx.annotation:annotation:1.1.0', 'androidx.core:core:1.1.0', - 'androidx.fragment:fragment:1.2.0-alpha04', + 'androidx.fragment:fragment:1.2.0-rc04', "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0", - "androidx.browser:browser:1.0.0", - "androidx.webkit:webkit:1.0.0", - "androidx.browser:browser:1.0.0", + 'androidx.browser:browser:1.2.0', + 'androidx.webkit:webkit:1.1.0', + 'androidx.browser:browser:1.2.0', "androidx.constraintlayout:constraintlayout:$constraintLayout", "androidx.constraintlayout:constraintlayout-solver:$constraintLayout", "android.arch.navigation:navigation-ui:$navigation", @@ -58,7 +58,7 @@ ext { "com.evernote:android-state:$androidState", 'com.github.daniel-stoneuk:material-about-library:2.1.0', 'com.scottyab:secure-preferences-lib:0.1.7', - 'com.airbnb.android:lottie:3.0.7', + 'com.airbnb.android:lottie:3.3.1', 'org.jsoup:jsoup:1.12.1', 'com.github.k0shk0sh:RetainedDateTimePickers:1.0.2', 'com.otaliastudios:autocomplete:1.1.0', @@ -66,11 +66,11 @@ ext { ] networking = [ - 'com.squareup.okhttp3:okhttp:4.2.1', - 'com.squareup.okhttp3:logging-interceptor:4.2.1', - 'com.squareup.retrofit2:retrofit:2.6.2', - 'com.squareup.retrofit2:adapter-rxjava2:2.6.2', - 'com.squareup.retrofit2:converter-gson:2.6.2', + 'com.squareup.okhttp3:okhttp:4.3.0', + 'com.squareup.okhttp3:logging-interceptor:4.3.0', + 'com.squareup.retrofit2:retrofit:2.7.1', + 'com.squareup.retrofit2:adapter-rxjava2:2.7.1', + 'com.squareup.retrofit2:converter-gson:2.7.1', "com.google.code.gson:gson:$gson", "com.github.bumptech.glide:glide:$glide", "com.jakewharton.timber:timber:$timber", @@ -85,33 +85,33 @@ ext { ] dagger = [ - 'com.google.dagger:dagger:2.24', - 'com.google.dagger:dagger-android-support:2.24', + 'com.google.dagger:dagger:2.25.4', + 'com.google.dagger:dagger-android-support:2.25.4', "org.glassfish:javax.annotation:$javaxAnnotation" ] archs = [ - 'androidx.lifecycle:lifecycle-extensions:2.2.0-alpha05', - 'androidx.lifecycle:lifecycle-livedata:2.2.0-alpha05', - 'androidx.lifecycle:lifecycle-reactivestreams:2.2.0-alpha05', + 'androidx.lifecycle:lifecycle-extensions:2.2.0-rc03', + 'androidx.lifecycle:lifecycle-livedata:2.2.0-rc03', + 'androidx.lifecycle:lifecycle-reactivestreams:2.2.0-rc03', "androidx.paging:paging-common:$paging", "androidx.paging:paging-runtime:$paging", - "androidx.room:room-common:2.1.0", - "androidx.room:room-rxjava2:2.1.0", - "androidx.room:room-compiler:2.1.0", - 'androidx.core:core-ktx:1.2.0-alpha04', - 'androidx.fragment:fragment-ktx:1.2.0-alpha04', - 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0-alpha05', - 'androidx.lifecycle:lifecycle-reactivestreams-ktx:2.2.0-alpha05', + 'androidx.room:room-common:2.2.3', + 'androidx.room:room-rxjava2:2.2.3', + 'androidx.room:room-compiler:2.2.3', + 'androidx.core:core-ktx:1.2.0-rc01', + 'androidx.fragment:fragment-ktx:1.2.0-rc04', + 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0-rc03', + 'androidx.lifecycle:lifecycle-reactivestreams-ktx:2.2.0-rc03', "android.arch.work:work-runtime:${workManager}", "android.arch.work:work-rxjava2:$workManager" ] firebase = [ - 'com.google.firebase:firebase-core:17.2.0', - 'com.google.firebase:firebase-database:19.1.0', + 'com.google.firebase:firebase-core:17.2.1', + 'com.google.firebase:firebase-database:19.2.0', 'com.crashlytics.sdk.android:crashlytics:2.10.1', - 'com.google.firebase:firebase-messaging:20.0.0', + 'com.google.firebase:firebase-messaging:20.1.0', "com.github.b3er.rxfirebase:firebase-database:11.2.0", "com.github.b3er.rxfirebase:firebase-database-kotlin:11.2.0" ] @@ -137,10 +137,10 @@ ext { processing = [ - 'com.google.dagger:dagger-android-processor:2.24', - 'com.google.dagger:dagger-compiler:2.24', + 'com.google.dagger:dagger-android-processor:2.25.4', + 'com.google.dagger:dagger-compiler:2.25.4', "com.github.bumptech.glide:compiler:$glide", - "androidx.room:room-runtime:2.1.0", + 'androidx.room:room-runtime:2.2.3', "com.evernote:android-state-processor:$androidState", "com.airbnb:deeplinkdispatch-processor:$deepLinkDispatch", "io.noties:prism4j-bundler:2.0.0" @@ -148,7 +148,7 @@ ext { testing = [ "junit:junit:$junit", - "org.assertj:assertj-core:3.13.2", + 'org.assertj:assertj-core:3.14.0', "org.mockito:mockito-core:$mockito", "com.nhaarman:mockito-kotlin:$mockitoKotlin", // "android.arch.work:work-testing:$workManager" diff --git a/build.gradle b/build.gradle index 00c3b398..a42659a0 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ buildscript { maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' } } dependencies { - classpath 'com.android.tools.build:gradle:3.5.1' + classpath 'com.android.tools.build:gradle:3.5.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin" classpath 'io.fabric.tools:gradle:1.28.0' classpath 'com.novoda:gradle-build-properties-plugin:0.3' diff --git a/reactions/.gitignore b/reactions/.gitignore new file mode 100644 index 00000000..796b96d1 --- /dev/null +++ b/reactions/.gitignore @@ -0,0 +1 @@ +/build diff --git a/resources/src/main/res/values/themes.xml b/resources/src/main/res/values/themes.xml index 85bb9fcd..11759c4c 100644 --- a/resources/src/main/res/values/themes.xml +++ b/resources/src/main/res/values/themes.xml @@ -51,7 +51,7 @@ @style/TabLayoutStyle -