DataHearth/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump dependencies, set target sdk 24

Browse Source
This commit is contained in:
len 2016-07-30 16:04:43 +02:00
parent c0a0d60c87
commit f768393a4b
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/build.gradle
View File

@ -29,14 +29,14 @@ def includeUpdater() {
} }
android { android {
compileSdkVersion 23 compileSdkVersion 24
buildToolsVersion "23.0.3" buildToolsVersion "24.0.1"
publishNonDefault true publishNonDefault true
defaultConfig { defaultConfig {
applicationId "eu.kanade.tachiyomi" applicationId "eu.kanade.tachiyomi"
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 23 targetSdkVersion 24
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
versionCode 10 versionCode 10
versionName "0.2.3" versionName "0.2.3"
@ -87,7 +87,7 @@ dependencies {
compile 'com.github.inorichi:ReactiveNetwork:69092ed' compile 'com.github.inorichi:ReactiveNetwork:69092ed'
// Android support library // Android support library
final support_library_version = '23.4.0' final support_library_version = '24.1.1'
compile "com.android.support:support-v4:$support_library_version" compile "com.android.support:support-v4:$support_library_version"
compile "com.android.support:appcompat-v7:$support_library_version" compile "com.android.support:appcompat-v7:$support_library_version"
compile "com.android.support:cardview-v7:$support_library_version" compile "com.android.support:cardview-v7:$support_library_version"
@ -98,11 +98,11 @@ dependencies {
// ReactiveX // ReactiveX
compile 'io.reactivex:rxandroid:1.2.1' compile 'io.reactivex:rxandroid:1.2.1'
compile 'io.reactivex:rxjava:1.1.6' compile 'io.reactivex:rxjava:1.1.8'
compile 'com.f2prateek.rx.preferences:rx-preferences:1.0.2' compile 'com.f2prateek.rx.preferences:rx-preferences:1.0.2'
// Network client // Network client
compile "com.squareup.okhttp3:okhttp:3.3.1" compile "com.squareup.okhttp3:okhttp:3.4.1"
// REST // REST
final retrofit_version = '2.1.0' final retrofit_version = '2.1.0'
@ -111,7 +111,7 @@ dependencies {
compile "com.squareup.retrofit2:adapter-rxjava:$retrofit_version" compile "com.squareup.retrofit2:adapter-rxjava:$retrofit_version"
// IO // IO
compile 'com.squareup.okio:okio:1.8.0' compile 'com.squareup.okio:okio:1.9.0'
// JSON // JSON
compile 'com.google.code.gson:gson:2.7' compile 'com.google.code.gson:gson:2.7'
@ -133,7 +133,7 @@ dependencies {
compile 'com.github.gabrielemariotti.changeloglib:changelog:2.1.0' compile 'com.github.gabrielemariotti.changeloglib:changelog:2.1.0'
// Database // Database
compile "com.pushtorefresh.storio:sqlite:1.9.0" compile "com.pushtorefresh.storio:sqlite:1.10.0"
// Model View Presenter // Model View Presenter
final nucleus_version = '3.0.0' final nucleus_version = '3.0.0'
@ -160,7 +160,7 @@ dependencies {
compile 'eu.davidea:flexible-adapter:4.2.0' compile 'eu.davidea:flexible-adapter:4.2.0'
compile 'com.nononsenseapps:filepicker:2.5.2' compile 'com.nononsenseapps:filepicker:2.5.2'
compile 'com.github.amulyakhare:TextDrawable:558677e' compile 'com.github.amulyakhare:TextDrawable:558677e'
compile 'com.afollestad.material-dialogs:core:0.8.6.1' compile 'com.afollestad.material-dialogs:core:0.8.6.2'
compile 'net.xpece.android:support-preference:0.8.1' compile 'net.xpece.android:support-preference:0.8.1'
compile 'me.zhanghai.android.systemuihelper:library:1.0.0' compile 'me.zhanghai.android.systemuihelper:library:1.0.0'
compile 'org.adw.library:discrete-seekbar:1.0.1' compile 'org.adw.library:discrete-seekbar:1.0.1'
@ -170,7 +170,7 @@ dependencies {
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
testCompile 'org.assertj:assertj-core:1.7.1' testCompile 'org.assertj:assertj-core:1.7.1'
testCompile 'org.mockito:mockito-core:1.10.19' testCompile 'org.mockito:mockito-core:1.10.19'
testCompile 'org.robolectric:robolectric:3.1' testCompile 'org.robolectric:robolectric:3.1.2'
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
} }

10
app/src/main/java/eu/kanade/tachiyomi/widget/preference/MangaSyncLoginDialog.kt
View File

@ -55,14 +55,14 @@ class MangaSyncLoginDialog : LoginDialogPreference() {
requestSubscription = sync.login(user, pass) requestSubscription = sync.login(user, pass)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe({ error -> .subscribe({
sync.logout()
login.progress = -1
login.setText(R.string.unknown_error)
}, {
sync.saveCredentials(user, pass) sync.saveCredentials(user, pass)
dialog.dismiss() dialog.dismiss()
context.toast(R.string.login_success) context.toast(R.string.login_success)
}, { error ->
sync.logout()
login.progress = -1
login.setText(R.string.unknown_error)
}) })
} }

2
build.gradle
View File

@ -7,7 +7,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.1.2' classpath 'com.android.tools.build:gradle:2.1.2'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.12.0' classpath 'com.github.ben-manes:gradle-versions-plugin:0.13.0'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
} }