From 41ed4b23d82adc7821d4baeefa7051015bd0260c Mon Sep 17 00:00:00 2001 From: ganfra Date: Tue, 2 Jul 2019 09:39:45 +0200 Subject: [PATCH] Update dependencies (tested ok) --- matrix-sdk-android-rx/build.gradle | 8 ++++---- matrix-sdk-android/build.gradle | 20 +++++++++---------- vector/build.gradle | 14 ++++++------- .../settings/VectorSettingsActivity.kt | 4 +--- 4 files changed, 22 insertions(+), 24 deletions(-) diff --git a/matrix-sdk-android-rx/build.gradle b/matrix-sdk-android-rx/build.gradle index 183f3be1a1..546922f25b 100644 --- a/matrix-sdk-android-rx/build.gradle +++ b/matrix-sdk-android-rx/build.gradle @@ -35,11 +35,11 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(":matrix-sdk-android") - implementation 'androidx.appcompat:appcompat:1.1.0-alpha01' + implementation 'androidx.appcompat:appcompat:1.1.0-beta01' implementation 'io.reactivex.rxjava2:rxkotlin:2.3.0' - implementation 'io.reactivex.rxjava2:rxandroid:2.1.0' + implementation 'io.reactivex.rxjava2:rxandroid:2.1.1' testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' + androidTestImplementation 'androidx.test:runner:1.2.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' } diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle index 49a5bd381a..1bcd4fb3c6 100644 --- a/matrix-sdk-android/build.gradle +++ b/matrix-sdk-android/build.gradle @@ -86,7 +86,7 @@ static def gitRevisionDate() { dependencies { def arrow_version = "0.8.0" - def support_version = '1.1.0-alpha03' + def support_version = '1.1.0-beta01' def moshi_version = '1.8.0' def lifecycle_version = '2.0.0' def coroutines_version = "1.0.1" @@ -98,8 +98,8 @@ dependencies { implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version" - implementation "androidx.appcompat:appcompat:$support_version" - implementation "androidx.recyclerview:recyclerview:$support_version" + implementation "androidx.appcompat:appcompat:1.1.0-beta01" + implementation "androidx.recyclerview:recyclerview:1.1.0-alpha06" implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version" kapt "androidx.lifecycle:lifecycle-compiler:$lifecycle_version" @@ -107,7 +107,7 @@ dependencies { // Network implementation 'com.squareup.retrofit2:retrofit:2.4.0' implementation 'com.squareup.retrofit2:converter-moshi:2.4.0' - implementation 'com.squareup.okhttp3:okhttp:3.11.0' + implementation 'com.squareup.okhttp3:okhttp:3.14.1' implementation 'com.squareup.okhttp3:logging-interceptor:3.10.0' implementation 'com.novoda:merlin:1.1.6' implementation "com.squareup.moshi:moshi-adapters:$moshi_version" @@ -120,7 +120,7 @@ dependencies { kapt 'dk.ilios:realmfieldnameshelper:1.1.1' // Work - implementation "androidx.work:work-runtime-ktx:2.1.0-beta01" + implementation "androidx.work:work-runtime-ktx:2.1.0-rc01" // FP implementation "io.arrow-kt:arrow-core:$arrow_version" @@ -155,11 +155,11 @@ dependencies { testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version" androidTestImplementation "org.koin:koin-test:$koin_version" - androidTestImplementation 'androidx.test:core:1.1.0' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test:rules:1.1.1' - androidTestImplementation 'androidx.test.ext:junit:1.1.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' + androidTestImplementation 'androidx.test:core:1.2.0' + androidTestImplementation 'androidx.test:runner:1.2.0' + androidTestImplementation 'androidx.test:rules:1.2.0' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' androidTestImplementation 'org.amshove.kluent:kluent-android:1.44' androidTestImplementation "io.mockk:mockk-android:1.8.13.kotlin13" androidTestImplementation "androidx.arch.core:core-testing:$lifecycle_version" diff --git a/vector/build.gradle b/vector/build.gradle index 5e17277f7e..4575c1305d 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -156,9 +156,9 @@ dependencies { implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version" - implementation 'androidx.appcompat:appcompat:1.1.0-alpha03' - implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta1' - implementation 'androidx.core:core-ktx:1.0.1' + implementation 'androidx.appcompat:appcompat:1.1.0-beta01' + implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2' + implementation 'androidx.core:core-ktx:1.0.2' implementation 'com.jakewharton.threetenabp:threetenabp:1.1.1' implementation "com.squareup.moshi:moshi-adapters:$moshi_version" @@ -185,7 +185,7 @@ dependencies { implementation 'com.airbnb.android:mvrx:1.0.1' // Work - implementation "androidx.work:work-runtime-ktx:2.1.0-beta01" + implementation "androidx.work:work-runtime-ktx:2.1.0-rc01" // Functional Programming implementation "io.arrow-kt:arrow-core:$arrow_version" @@ -195,7 +195,7 @@ dependencies { // UI implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1' - implementation 'com.google.android.material:material:1.1.0-alpha04' + implementation 'com.google.android.material:material:1.1.0-alpha07' implementation 'me.gujun.android:span:1.7' implementation "ru.noties.markwon:core:$markwon_version" implementation "ru.noties.markwon:html:$markwon_version" @@ -246,8 +246,8 @@ dependencies { // TESTS testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' + androidTestImplementation 'androidx.test:runner:1.2.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' } if (!getGradle().getStartParameter().getTaskRequests().toString().contains("Fdroid")) { diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsActivity.kt b/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsActivity.kt index 5207efd5fa..672a33d0fc 100755 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsActivity.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsActivity.kt @@ -86,9 +86,7 @@ class VectorSettingsActivity : VectorBaseActivity(), try { pref?.fragment?.let { oFragment = supportFragmentManager.fragmentFactory - .instantiate( - classLoader, - it, pref.extras) + .instantiate(classLoader, it) } } catch (e: Throwable) { showSnackbar(getString(R.string.not_implemented))