FreshRSS/Readrops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove jcenter dependency

Browse Source
This commit is contained in:
Shinokuni 2021-07-02 18:56:11 +02:00
parent 10e4da4fbb
commit cbff42b4f2
13 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
api/build.gradle
View File

@ -36,6 +36,9 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = '1.8'
}
}
dependencies {
@ -48,8 +51,8 @@ dependencies {
androidTestImplementation 'androidx.test:rules:1.3.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
testImplementation 'com.squareup.okhttp3:mockwebserver:4.9.0'
androidTestImplementation "org.koin:koin-test:2.1.6"
testImplementation "org.koin:koin-test:2.1.6"
androidTestImplementation "io.insert-koin:koin-test:2.1.6"
testImplementation "io.insert-koin:koin-test:2.1.6"
implementation 'com.gitlab.mvysny.konsume-xml:konsume-xml:0.12'
@ -76,6 +79,6 @@ dependencies {
api 'io.reactivex.rxjava2:rxandroid:2.1.1'
api 'org.jsoup:jsoup:1.13.1'
debugApi 'com.icapps.niddler:niddler:1.2.0'
releaseApi 'com.icapps.niddler:niddler-noop:1.2.0'
debugApi 'com.chimerapps.niddler:niddler:1.5.5'
releaseApi 'com.chimerapps.niddler:niddler-noop:1.5.5'
}

2
api/src/main/java/com/readrops/api/ApiModule.kt
View File

@ -1,6 +1,6 @@
package com.readrops.api
import com.icapps.niddler.interceptor.okhttp.NiddlerOkHttpInterceptor
import com.chimerapps.niddler.interceptor.okhttp.NiddlerOkHttpInterceptor
import com.readrops.api.localfeed.LocalRSSDataSource
import com.readrops.api.services.freshrss.FreshRSSDataSource
import com.readrops.api.services.freshrss.FreshRSSService

4
api/src/main/java/com/readrops/api/localfeed/LocalRSSDataSource.kt
View File

@ -17,8 +17,8 @@ import okhttp3.OkHttpClient
import okhttp3.Request
import okhttp3.Response
import okio.Buffer
import org.koin.core.KoinComponent
import org.koin.core.get
import org.koin.core.component.KoinComponent
import org.koin.core.component.get
import java.io.ByteArrayInputStream
import java.io.IOException
import java.io.InputStream

8
app/build.gradle
View File

@ -76,7 +76,7 @@ dependencies {
implementation "androidx.work:work-runtime-ktx:2.4.0"
implementation "androidx.fragment:fragment-ktx:1.2.5"
implementation "androidx.browser:browser:1.2.0"
testImplementation "org.koin:koin-test:2.1.6"
testImplementation "io.insert-koin:koin-test:2.1.6"
implementation 'com.github.bumptech.glide:glide:4.11.0'
kapt 'com.github.bumptech.glide:compiler:4.11.0'
@ -95,7 +95,7 @@ dependencies {
implementation 'com.mikepenz:materialdrawer:6.1.2'
implementation "com.mikepenz:aboutlibraries:6.2.3"
debugImplementation 'com.facebook.flipper:flipper:0.30.1'
debugImplementation 'com.facebook.soloader:soloader:0.9.0'
debugImplementation 'com.facebook.flipper:flipper-network-plugin:0.30.1'
debugImplementation 'com.facebook.flipper:flipper:0.96.1'
debugImplementation 'com.facebook.soloader:soloader:0.10.1'
debugImplementation 'com.facebook.flipper:flipper-network-plugin:0.96.1'
}

4
app/src/main/java/com/readrops/app/AppModule.kt
View File

@ -1,8 +1,8 @@
package com.readrops.app
import androidx.preference.PreferenceManager
import com.icapps.niddler.core.AndroidNiddler
import com.icapps.niddler.core.Niddler
import com.chimerapps.niddler.core.AndroidNiddler
import com.chimerapps.niddler.core.Niddler
import com.readrops.app.account.AccountViewModel
import com.readrops.app.addfeed.AddFeedsViewModel
import com.readrops.app.feedsfolders.ManageFeedsFoldersViewModel

4
app/src/main/java/com/readrops/app/notifications/NotificationPermissionListAdapter.kt
View File

@ -10,8 +10,8 @@ import com.readrops.app.R
import com.readrops.app.databinding.NotificationPermissionLayoutBinding
import com.readrops.app.utils.GlideRequests
import com.readrops.db.entities.Feed
import org.koin.core.KoinComponent
import org.koin.core.get
import org.koin.core.component.KoinComponent
import org.koin.core.component.get
class NotificationPermissionListAdapter(var enableAll: Boolean, val listener: (feed: Feed) -> Unit) :
ListAdapter<Feed, NotificationPermissionListAdapter.NotificationPermissionViewHolder>(DIFF_CALLBACK), KoinComponent {

4
app/src/main/java/com/readrops/app/notifications/sync/SyncResultAnalyser.kt
View File

@ -11,8 +11,8 @@ import com.readrops.db.entities.account.Account
import com.readrops.api.services.SyncResult
import com.readrops.app.utils.GlideRequests
import com.readrops.app.utils.Utils
import org.koin.core.KoinComponent
import org.koin.core.get
import org.koin.core.component.KoinComponent
import org.koin.core.component.get
/**
* Simple class to get synchro notification content (title, content and largeIcon) according to some rules

4
app/src/main/java/com/readrops/app/notifications/sync/SyncResultDebugData.kt
View File

@ -6,8 +6,8 @@ import com.readrops.db.entities.Item
import com.readrops.db.entities.account.Account
import com.readrops.db.entities.account.AccountType
import org.jetbrains.annotations.TestOnly
import org.koin.core.KoinComponent
import org.koin.core.get
import org.koin.core.component.KoinComponent
import org.koin.core.component.get
class SyncResultDebugData {

4
app/src/main/java/com/readrops/app/notifications/sync/SyncWorker.kt
View File

@ -21,8 +21,8 @@ import com.readrops.db.entities.Item
import com.readrops.db.entities.account.Account
import io.reactivex.disposables.Disposable
import io.reactivex.schedulers.Schedulers
import org.koin.core.KoinComponent
import org.koin.core.get
import org.koin.core.component.KoinComponent
import org.koin.core.component.get
import org.koin.core.parameter.parametersOf
class SyncWorker(context: Context, parameters: WorkerParameters) : Worker(context, parameters), KoinComponent {

4
app/src/main/java/com/readrops/app/utils/ReadropsGlideModule.kt
View File

@ -8,8 +8,8 @@ import com.bumptech.glide.integration.okhttp3.OkHttpUrlLoader
import com.bumptech.glide.load.model.GlideUrl
import com.bumptech.glide.module.AppGlideModule
import okhttp3.OkHttpClient
import org.koin.core.KoinComponent
import org.koin.core.get
import org.koin.core.component.KoinComponent
import org.koin.core.component.get
import java.io.InputStream
@GlideModule

4
app/src/main/java/com/readrops/app/utils/feedscolors/FeedsColorsIntentService.kt
View File

@ -9,8 +9,8 @@ import com.readrops.app.ReadropsApp
import com.readrops.app.utils.ReadropsKeys.FEEDS
import com.readrops.db.Database
import com.readrops.db.entities.Feed
import org.koin.core.KoinComponent
import org.koin.core.get
import org.koin.core.component.KoinComponent
import org.koin.core.component.get
class FeedsColorsIntentService : IntentService("FeedsColorsIntentService"), KoinComponent {

3
build.gradle
View File

@ -5,7 +5,7 @@ buildscript {
repositories {
google()
jcenter()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.3'
@ -16,7 +16,6 @@ buildscript {
allprojects {
repositories {
google()
jcenter()
mavenCentral()
maven { url 'https://jitpack.io' }
}

11
db/build.gradle
View File

@ -47,6 +47,9 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = '1.8'
}
}
dependencies {
@ -75,8 +78,8 @@ dependencies {
api 'joda-time:joda-time:2.10.5'
def koin_version = "2.1.6"
api "org.koin:koin-android:$koin_version"
api "org.koin:koin-androidx-scope:$koin_version"
api "org.koin:koin-androidx-viewmodel:$koin_version"
def koin_version = "2.2.3"
api "io.insert-koin:koin-android:$koin_version"
api "io.insert-koin:koin-androidx-scope:$koin_version"
api "io.insert-koin:koin-androidx-viewmodel:$koin_version"
}