FreshRSS
/
Readrops
mirror of https://github.com/readrops/Readrops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/di

This commit is contained in:
Shinokuni 2020-10-23 19:08:52 +02:00
parent e32b20bc87 89ff34fb01
commit fcfff57e1d
4 changed files with 33 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
api/build.gradle
View File

@ -43,41 +43,36 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation project(':db') implementation project(':db')
implementation "androidx.core:core-ktx:1.2.0"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
testImplementation 'junit:junit:4.13' testImplementation 'junit:junit:4.13'
androidTestImplementation 'androidx.test.ext:junit:1.1.2' androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test:runner:1.3.0' androidTestImplementation 'androidx.test:runner:1.3.0'
androidTestImplementation 'androidx.test:rules:1.3.0' androidTestImplementation 'androidx.test:rules:1.3.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.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'
testImplementation "org.koin:koin-test:2.1.6" testImplementation "org.koin:koin-test:2.1.6"
implementation 'com.gitlab.mvysny.konsume-xml:konsume-xml:0.12' 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' 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 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'
exclude module: 'stax-api' exclude module: 'stax-api'
exclude module: 'xpp3' 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' implementation 'com.squareup.moshi:moshi:1.11.0'
kapt 'com.squareup.moshi:moshi-kotlin-codegen:1.9.2' kapt 'com.squareup.moshi:moshi-kotlin-codegen:1.11.0'
implementation 'com.squareup.okhttp3:logging-interceptor:4.2.0'
api 'io.reactivex.rxjava2:rxandroid:2.1.1' api 'io.reactivex.rxjava2:rxandroid:2.1.1'
api 'org.jsoup:jsoup:1.12.1' api 'org.jsoup:jsoup:1.13.1'
} }

32
app/build.gradle
View File

@ -60,30 +60,28 @@ dependencies {
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.10' coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.10'
implementation 'com.google.android.material:material:1.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'
implementation 'com.google.android.material:material:1.2.1'
implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.palette:palette:1.0.0' implementation 'androidx.palette:palette:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.1.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.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.preference:preference:1.1.0' implementation 'androidx.preference:preference:1.1.1'
implementation "androidx.core:core-ktx:1.2.0"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation "androidx.work:work-runtime-ktx:2.4.0" 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" implementation "androidx.browser:browser:1.2.0"
testImplementation "org.koin:koin-test:2.1.6" testImplementation "org.koin:koin-test:2.1.6"
testImplementation 'junit:junit:4.12' implementation 'com.github.bumptech.glide:glide:4.11.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.1' kapt 'com.github.bumptech.glide:compiler:4.11.0'
androidTestImplementation 'androidx.test:runner:1.2.0' implementation 'com.github.bumptech.glide:okhttp3-integration:4.11.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' implementation('com.github.bumptech.glide:recyclerview-integration:4.11.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.
transitive = false transitive = false
} }
@ -98,7 +96,7 @@ dependencies {
implementation "com.mikepenz:aboutlibraries:6.2.3" implementation "com.mikepenz:aboutlibraries:6.2.3"
debugImplementation 'com.facebook.flipper:flipper:0.30.1' 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.facebook.flipper:flipper-network-plugin:0.30.1'
debugImplementation 'com.icapps.niddler:niddler:1.2.0' debugImplementation 'com.icapps.niddler:niddler:1.2.0'

2
app/src/main/res/values/strings.xml
View File

@ -74,7 +74,7 @@
<string name="credentials">Credentials</string> <string name="credentials">Credentials</string>
<string name="filter_newest">Newest to oldest</string> <string name="filter_newest">Newest to oldest</string>
<string name="filter_oldest">Oldest to newsest</string> <string name="filter_oldest">Oldest to newest</string>
<string name="login_failed">Login failed. Please check your credentials</string> <string name="login_failed">Login failed. Please check your credentials</string>
<string name="new_account">New account</string> <string name="new_account">New account</string>
<string name="app_licence">App released under the GPLv3 licence</string> <string name="app_licence">App released under the GPLv3 licence</string>

13
db/build.gradle
View File

@ -53,12 +53,15 @@ android {
dependencies { dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) 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' testImplementation 'junit:junit:4.13'
androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test:runner:1.2.0' androidTestImplementation 'androidx.test:runner:1.3.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.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' api 'androidx.room:room-runtime:2.2.5'
kapt 'androidx.room:room-compiler:2.2.5' kapt 'androidx.room:room-compiler:2.2.5'