Commit f875841d authored by Christophe Henry's avatar Christophe Henry

Bump dependencies

parent b03d48f3
......@@ -65,10 +65,11 @@ android {
experimental = true
}
dataBinding {
enabled = true
buildFeatures {
dataBinding = true
}
testOptions {
unitTests.all {
testLogging {
......@@ -110,15 +111,15 @@ dependencies {
def lifecycle_version = "2.2.0"
def room_version = "2.2.5"
def roomigrant_version = "0.1.7"
def jackson_version = "2.10.3"
def jackson_version = "2.11.0"
def espresso_version = "3.2.0"
def espresso_idling_version = "3.2.0"
def jsoup_version = "1.13.1"
def acraVersion = "5.5.0"
def autoservice_version = "1.0-rc6"
def acraVersion = "5.5.1"
def autoservice_version = "1.0-rc7"
def android_test = "1.2.0"
def retrofit_version = "2.8.1"
def okhttp_version = "4.5.0"
def retrofit_version = "2.9.0"
def okhttp_version = "4.7.2"
def work_version = "2.3.4"
def mockk_version = "1.10.0"
def hamcrest_version = "2.2"
......@@ -133,7 +134,7 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
// AndroidX
implementation "androidx.core:core-ktx:1.2.0"
implementation "androidx.core:core-ktx:1.3.0"
implementation "androidx.appcompat:appcompat:$appcompat_version"
implementation "androidx.appcompat:appcompat-resources:$appcompat_version"
implementation "androidx.activity:activity-ktx:$activity_version"
......@@ -141,7 +142,7 @@ dependencies {
implementation "androidx.constraintlayout:constraintlayout:1.1.3"
implementation "androidx.recyclerview:recyclerview:1.1.0"
implementation "androidx.preference:preference-ktx:1.1.1"
implementation "com.google.android.material:material:1.2.0-alpha06"
implementation "com.google.android.material:material:1.3.0-alpha01"
// ViewModel and LiveData
implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
......@@ -178,7 +179,7 @@ dependencies {
// Utils
implementation "org.apache.commons:commons-text:1.8"
implementation "joda-time:joda-time:2.10.5"
implementation "joda-time:joda-time:2.10.6"
implementation "com.squareup.picasso:picasso:2.71828"
implementation "com.x5dev:chunk-templates:3.5.0"
implementation "eu.davidea:flexible-adapter:5.1.0"
......@@ -213,10 +214,8 @@ dependencies {
*
* The Software shall be used for Good, not Evil.
*/
testImplementation "org.json:json:20190722"
// TODO: Workaround; See https://github.com/mockk/mockk/issues/281#issuecomment-479238315
debugImplementation("io.mockk:mockk:$mockk_version") { exclude module: "objenesis" }
debugImplementation "org.objenesis:objenesis:2.6"
testImplementation "org.json:json:20200518"
testImplementation "io.mockk:mockk:$mockk_version"
debugImplementation "androidx.test:core:$android_test"
debugImplementation "androidx.test:rules:$android_test"
......@@ -224,6 +223,8 @@ dependencies {
androidTestImplementation "androidx.test.ext:junit:1.1.1"
androidTestImplementation "io.mockk:mockk-android:$mockk_version"
// Espresso
androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
androidTestImplementation "androidx.test.espresso:espresso-contrib:$espresso_version"
......
......@@ -92,7 +92,7 @@ class SettingsFragmentTest: FreshRSSBaseTest() {
assertThat(fragment.requireF().preferences.refreshFrequency, equalTo(300L))
}
onView(withText(matchesPattern("Retain articles scroll position"))).perform(click())
onView(withText(matchesPattern("Retain article scroll positions"))).perform(click())
scenario.onFragment {fragment ->
assertThat(fragment.retainScrollPositionPreference.isChecked, equalTo(false))
assertThat(fragment.requireF().preferences.retainScrollPosition, equalTo(false))
......
......@@ -34,6 +34,7 @@ class JodaDateAndTime internal constructor(private val faker: Faker) {
* the time unit.
* @return a future date from now.
*/
@Suppress("UNUSED_VARIABLE")
fun future(atMost: Int, minimum: Int, unit: TimeUnit): DateTime {
val now = DateTime()
val minimumDateTime = DateTime(DateTime.now().millis + unit.toMillis(minimum.toLong()))
......@@ -83,6 +84,7 @@ class JodaDateAndTime internal constructor(private val faker: Faker) {
* the time unit.
* @return a past date from now.
*/
@Suppress("UNUSED_VARIABLE")
fun past(atMost: Int, minimum: Int, unit: TimeUnit): DateTime {
val now = DateTime()
val minimumDateTime = DateTime(DateTime.now().millis - unit.toMillis(minimum.toLong()))
......
......@@ -11,7 +11,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:3.6.3"
classpath 'com.android.tools.build:gradle:4.0.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$android_navigation"
......
#Tue Feb 25 20:09:32 CET 2020
#Mon Jun 08 15:08:04 CEST 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment