Mastodon
/
pachli-android
mirror of https://github.com/pachli/pachli-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update deps

This commit is contained in:
Conny Duck 2018-08-31 20:35:30 +02:00
parent a0b626bff0
commit ff4a8ff4b8
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/build.gradle
View File

@ -1,7 +1,7 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
apply plugin: 'kotlin-kapt'
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'
def getGitSha = { -> def getGitSha = { ->
def stdout = new ByteArrayOutputStream() def stdout = new ByteArrayOutputStream()
@ -60,7 +60,7 @@ android {
} }
ext.supportLibraryVersion = '27.1.1' ext.supportLibraryVersion = '27.1.1'
ext.daggerVersion = '2.16' ext.daggerVersion = '2.17'
// if libraries are changed here, they should also be changed in LicenseActivity // if libraries are changed here, they should also be changed in LicenseActivity
@ -82,13 +82,13 @@ dependencies {
implementation 'com.squareup.okhttp3:logging-interceptor:3.11.0' implementation 'com.squareup.okhttp3:logging-interceptor:3.11.0'
implementation 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0' implementation 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0'
implementation 'com.github.connyduck:sparkbutton:1.0.1' implementation 'com.github.connyduck:sparkbutton:1.0.1'
implementation 'com.github.chrisbanes:PhotoView:2.1.3' implementation 'com.github.chrisbanes:PhotoView:2.1.4'
implementation 'com.mikepenz:google-material-typeface:3.0.1.2.original@aar' implementation 'com.mikepenz:google-material-typeface:3.0.1.2.original@aar'
implementation('com.theartofdev.edmodo:android-image-cropper:2.7.0') { implementation('com.theartofdev.edmodo:android-image-cropper:2.7.0') {
exclude group: 'com.android.support' exclude group: 'com.android.support'
} }
implementation 'com.evernote:android-job:1.2.6' implementation 'com.evernote:android-job:1.2.6'
implementation 'com.android.support.constraint:constraint-layout:1.1.2' implementation 'com.android.support.constraint:constraint-layout:1.1.3'
// EmojiCompat // EmojiCompat
implementation "com.android.support:support-emoji:$supportLibraryVersion" implementation "com.android.support:support-emoji:$supportLibraryVersion"
implementation "com.android.support:support-emoji-appcompat:$supportLibraryVersion" implementation "com.android.support:support-emoji-appcompat:$supportLibraryVersion"
@ -111,8 +111,8 @@ dependencies {
exclude group: 'com.android.support', module: 'support-annotations' exclude group: 'com.android.support', module: 'support-annotations'
}) })
debugImplementation 'im.dino:dbinspector:3.4.1@aar' debugImplementation 'im.dino:dbinspector:3.4.1@aar'
implementation 'io.reactivex.rxjava2:rxjava:2.2.0' implementation 'io.reactivex.rxjava2:rxjava:2.2.1'
implementation 'io.reactivex.rxjava2:rxandroid:2.0.2' implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
implementation 'com.uber.autodispose:autodispose-android-archcomponents:0.8.0' implementation 'com.uber.autodispose:autodispose-android-archcomponents:1.0.0-RC2'
implementation 'com.uber.autodispose:autodispose-kotlin:0.8.0' implementation 'com.uber.autodispose:autodispose-ktx:1.0.0-RC2'
} }

4
app/src/main/java/com/keylesspalace/tusky/di/AppComponent.kt
View File

@ -18,7 +18,7 @@ package com.keylesspalace.tusky.di
import com.keylesspalace.tusky.TuskyApplication import com.keylesspalace.tusky.TuskyApplication
import dagger.BindsInstance import dagger.BindsInstance
import dagger.Component import dagger.Component
import dagger.android.AndroidInjectionModule import dagger.android.support.AndroidSupportInjectionModule
import javax.inject.Singleton import javax.inject.Singleton
@ -30,7 +30,7 @@ import javax.inject.Singleton
@Component(modules = [ @Component(modules = [
AppModule::class, AppModule::class,
NetworkModule::class, NetworkModule::class,
AndroidInjectionModule::class, AndroidSupportInjectionModule::class,
ActivitiesModule::class, ActivitiesModule::class,
ServicesModule::class, ServicesModule::class,
BroadcastReceiverModule::class, BroadcastReceiverModule::class,