From c26a2da6a740b6f1ae7b895e9a6a8397d99ce45b Mon Sep 17 00:00:00 2001 From: Shinokuni Date: Tue, 6 Oct 2020 22:45:19 +0200 Subject: [PATCH 1/3] Refactor and update gradle dependencies --- api/build.gradle | 30 ++++++++++-------------------- app/build.gradle | 30 +++++++++++------------------- db/build.gradle | 13 ++++++++----- 3 files changed, 29 insertions(+), 44 deletions(-) diff --git a/api/build.gradle b/api/build.gradle index bf8dcf78..27e3a701 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -41,42 +41,32 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation project(':db') + api project(':db') - implementation "androidx.core:core-ktx:1.2.0" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - - testImplementation 'junit:junit:4.13' - androidTestImplementation 'androidx.test.ext:junit:1.1.2' - androidTestImplementation 'androidx.test:runner:1.3.0' - androidTestImplementation 'androidx.test:rules:1.3.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' - androidTestImplementation 'com.squareup.okhttp3:mockwebserver:4.8.1' + androidTestImplementation 'com.squareup.okhttp3:mockwebserver:4.9.0' implementation 'com.gitlab.mvysny.konsume-xml:konsume-xml:0.12' - implementation 'com.squareup.okhttp3:okhttp:4.8.1' + implementation 'com.squareup.okhttp3:okhttp:4.9.0' - implementation('com.squareup.retrofit2:retrofit:2.7.1') { + implementation('com.squareup.retrofit2:retrofit:2.9.0') { exclude group: 'okhttp3', module: 'okhttp3' } - implementation('com.squareup.retrofit2:converter-moshi:2.7.1') { + implementation('com.squareup.retrofit2:converter-moshi:2.9.0') { exclude group: 'moshi', module: 'moshi' // moshi converter uses moshi 1.8.0 which breaks codegen 1.9.2 } - implementation ('com.squareup.retrofit2:converter-simplexml:2.7.1') { + implementation ('com.squareup.retrofit2:converter-simplexml:2.9.0') { exclude module: 'stax' exclude module: 'stax-api' exclude module: 'xpp3' } - implementation 'com.squareup.retrofit2:adapter-rxjava2:2.7.1' + implementation 'com.squareup.retrofit2:adapter-rxjava2:2.9.0' - implementation 'com.squareup.moshi:moshi:1.9.2' - kapt 'com.squareup.moshi:moshi-kotlin-codegen:1.9.2' - - implementation 'com.squareup.okhttp3:logging-interceptor:4.2.0' + implementation 'com.squareup.moshi:moshi:1.11.0' + kapt 'com.squareup.moshi:moshi-kotlin-codegen:1.11.0' api 'io.reactivex.rxjava2:rxandroid:2.1.1' - api 'org.jsoup:jsoup:1.12.1' + api 'org.jsoup:jsoup:1.13.1' } diff --git a/app/build.gradle b/app/build.gradle index 0cd879c0..5bdcc285 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -55,34 +55,26 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation project(':api') - implementation project(':db') + api project(':api') + api project(':db') coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.10' - implementation 'com.google.android.material:material:1.2.0' + implementation 'com.google.android.material:material:1.2.1' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.palette:palette:1.0.0' implementation 'androidx.recyclerview:recyclerview:1.1.0' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'androidx.constraintlayout:constraintlayout:2.0.1' implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'androidx.preference:preference:1.1.0' - implementation "androidx.core:core-ktx:1.2.0" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation 'androidx.preference:preference:1.1.1' implementation "androidx.work:work-runtime-ktx:2.4.0" - implementation "androidx.fragment:fragment-ktx:1.2.3" + implementation "androidx.fragment:fragment-ktx:1.2.5" implementation "androidx.browser:browser:1.2.0" - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test.ext:junit:1.1.1' - androidTestImplementation 'androidx.test:runner:1.2.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' - - implementation 'com.github.bumptech.glide:glide:4.10.0' - kapt 'com.github.bumptech.glide:compiler:4.10.0' - implementation 'com.github.bumptech.glide:okhttp3-integration:4.10.0' - implementation('com.github.bumptech.glide:recyclerview-integration:4.10.0') { - // Excludes the support library because it's already included by Glide. + implementation 'com.github.bumptech.glide:glide:4.11.0' + kapt 'com.github.bumptech.glide:compiler:4.11.0' + implementation 'com.github.bumptech.glide:okhttp3-integration:4.11.0' + implementation('com.github.bumptech.glide:recyclerview-integration:4.11.0') { transitive = false } @@ -97,7 +89,7 @@ dependencies { implementation "com.mikepenz:aboutlibraries:6.2.3" debugImplementation 'com.facebook.flipper:flipper:0.30.1' - debugImplementation 'com.facebook.soloader:soloader:0.8.0' + debugImplementation 'com.facebook.soloader:soloader:0.9.0' debugImplementation 'com.facebook.flipper:flipper-network-plugin:0.30.1' debugImplementation 'com.icapps.niddler:niddler:1.2.0' diff --git a/db/build.gradle b/db/build.gradle index 1cb655c4..0d611550 100644 --- a/db/build.gradle +++ b/db/build.gradle @@ -53,12 +53,15 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - api 'androidx.appcompat:appcompat:1.2.0-rc02' + api "androidx.core:core-ktx:1.3.2" + api 'androidx.appcompat:appcompat:1.2.0' + api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test.ext:junit:1.1.1' - androidTestImplementation 'androidx.test:runner:1.2.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + testImplementation 'junit:junit:4.13' + androidTestImplementation 'androidx.test.ext:junit:1.1.2' + androidTestImplementation 'androidx.test:runner:1.3.0' + androidTestImplementation 'androidx.test:rules:1.3.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' api 'androidx.room:room-runtime:2.2.5' kapt 'androidx.room:room-compiler:2.2.5' From 343562657b0c6db481dd4224226d365f31eec804 Mon Sep 17 00:00:00 2001 From: Shinokuni Date: Wed, 7 Oct 2020 22:10:44 +0200 Subject: [PATCH 2/3] Fix test dependencies build error --- api/build.gradle | 7 ++++++- app/build.gradle | 10 ++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/api/build.gradle b/api/build.gradle index 27e3a701..c1ab0760 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -41,8 +41,13 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - api project(':db') + implementation project(':db') + testImplementation 'junit:junit:4.13' + androidTestImplementation 'androidx.test.ext:junit:1.1.2' + androidTestImplementation 'androidx.test:runner:1.3.0' + androidTestImplementation 'androidx.test:rules:1.3.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' androidTestImplementation 'com.squareup.okhttp3:mockwebserver:4.9.0' implementation 'com.gitlab.mvysny.konsume-xml:konsume-xml:0.12' diff --git a/app/build.gradle b/app/build.gradle index 5bdcc285..b096650f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -55,11 +55,17 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - api project(':api') - api project(':db') + implementation project(':api') + implementation project(':db') coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.10' + testImplementation 'junit:junit:4.13' + androidTestImplementation 'androidx.test.ext:junit:1.1.2' + androidTestImplementation 'androidx.test:runner:1.3.0' + androidTestImplementation 'androidx.test:rules:1.3.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' + implementation 'com.google.android.material:material:1.2.1' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.palette:palette:1.0.0' From 2d23369de785288f08901c6c50bc4d7d65ebd4b4 Mon Sep 17 00:00:00 2001 From: Riku Viitanen Date: Wed, 21 Oct 2020 01:53:38 +0300 Subject: [PATCH 3/3] Fix typo: newsest -> newest --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8021181f..1e1f835e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -74,7 +74,7 @@ Credentials Newest to oldest - Oldest to newsest + Oldest to newest Login failed. Please check your credentials New account App released under the GPLv3 licence