update dep

This commit is contained in:
k0shk0sh 2020-01-05 13:44:29 +01:00
parent e20eee944c
commit 5ba761e02b
6 changed files with 40 additions and 38 deletions

View File

@ -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

1
base/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/build

View File

@ -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"

View File

@ -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'

1
reactions/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/build

View File

@ -51,7 +51,7 @@
<item name="tabStyle">@style/TabLayoutStyle</item>
</style>
<style name="TabLayoutStyle" parent="Widget.Design.TabLayout">
<style name="TabLayoutStyle" parent="Widget.MaterialComponents.TabLayout">
<item name="tabBackground">?attr/selectableItemBackground</item>
<item name="tabTextAppearance">@style/TabTextAppearance</item>
<item name="tabSelectedTextColor">?android:textColorPrimary</item>