Commit 5de5f6f5 authored by Christophe Henry's avatar Christophe Henry

Cleanup dependencies

parent 78893c71
......@@ -106,7 +106,8 @@ spotless {
}
dependencies {
def lifecycle_version = '2.2.0'
def appcompat_version = "1.1.0"
def lifecycle_version = "2.2.0"
def room_version = '2.2.3'
def roomigrant_version = "0.1.7"
def fuel_version = "2.0.1"
......@@ -114,7 +115,6 @@ dependencies {
def espresso_version = "3.2.0"
def test_runnner_version = "1.2.0"
def promise_version = "3.3.0"
def android_support_version = "28.0.0"
def android_navigation = "1.0.0"
def jsoup_version = "1.12.1"
def acraVersion = "5.1.3"
......@@ -130,36 +130,33 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
// Compat libraries
implementation "com.android.support:appcompat-v7:$android_support_version"
implementation "com.android.support:preference-v7:$android_support_version"
implementation "com.android.support:support-core-utils:$android_support_version"
implementation "com.android.support:support-fragment:$android_support_version"
implementation "com.android.support:support-compat:$android_support_version"
implementation "com.android.support:support-core-ui:$android_support_version"
// AndroidX
implementation "androidx.appcompat:appcompat:$appcompat_version"
implementation "androidx.appcompat:appcompat-resources:$appcompat_version"
// AndroidX layout
implementation "androidx.appcompat:appcompat:1.1.0"
implementation "androidx.core:core-ktx:1.1.0"
implementation 'com.google.android.material:material:1.2.0-alpha04'
implementation "androidx.constraintlayout:constraintlayout:1.1.3"
implementation 'androidx.recyclerview:recyclerview:1.1.0'
implementation "androidx.recyclerview:recyclerview:1.1.0"
implementation "androidx.preference:preference-ktx:1.1.0"
implementation "com.google.android.material:material:1.2.0-alpha04"
// ViewModel and LiveData
implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-reactivestreams-ktx:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-reactivestreams-ktx:$lifecycle_version"
kapt "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
androidTestImplementation "androidx.arch.core:core-testing:2.1.0"
// Room
// Navigation
implementation "android.arch.navigation:navigation-fragment-ktx:$android_navigation"
implementation "android.arch.navigation:navigation-ui-ktx:$android_navigation"
// Room & roomigrant
kapt "androidx.room:room-compiler:$room_version"
implementation "androidx.room:room-runtime:$room_version"
implementation "androidx.room:room-rxjava2:$room_version"
implementation "androidx.room:room-guava:$room_version"
androidTestImplementation "androidx.room:room-testing:$room_version"
// roomigrant
implementation "com.github.MatrixDev.Roomigrant:RoomigrantLib:$roomigrant_version"
kapt "com.github.MatrixDev.Roomigrant:RoomigrantCompiler:$roomigrant_version"
......@@ -172,13 +169,9 @@ dependencies {
implementation "nl.komponents.kovenant:kovenant:$promise_version"
implementation "nl.komponents.kovenant:kovenant-android:$promise_version"
// Navigation
implementation "android.arch.navigation:navigation-fragment-ktx:$android_navigation"
implementation "android.arch.navigation:navigation-ui-ktx:$android_navigation"
// Utils
implementation "org.apache.commons:commons-text:1.8"
implementation 'joda-time:joda-time:2.10.5'
implementation "joda-time:joda-time:2.10.5"
implementation "com.squareup.picasso:picasso:2.71828"
implementation "com.x5dev:chunk-templates:3.5.0"
implementation "eu.davidea:flexible-adapter:5.1.0"
......
......@@ -6,8 +6,8 @@ import fr.chenry.android.freshrss.F
import fr.chenry.android.freshrss.R
class SettingsFragment: PreferenceFragmentCompat(), Preference.OnPreferenceChangeListener {
private val refreshFrequencyPreference: ListPreference by lazy {
findPreference(F.preferences.refreshFrequencyKey) as ListPreference
private val refreshFrequencyPreference by lazy {
findPreference(F.preferences.refreshFrequencyKey) ?: ListPreference(context)
}
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
......
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