From a095952e0f7c31024b915031ea78ade1c72366b1 Mon Sep 17 00:00:00 2001 From: AntsyLich <59261191+AntsyLich@users.noreply.github.com> Date: Sun, 8 Sep 2024 20:09:45 +0600 Subject: [PATCH] Use new library for injekt with inorichi patch (cherry picked from commit c929854ae98b874bf1a7aceb82a15fbe3fb6a41f) --- app/build.gradle.kts | 2 +- app/src/main/java/eu/kanade/tachiyomi/App.kt | 2 ++ gradle/libs.versions.toml | 2 +- presentation-widget/build.gradle.kts | 2 +- source-api/build.gradle.kts | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 918208f18..dbbf02634 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -221,7 +221,7 @@ dependencies { implementation(libs.preferencektx) // Dependency injection - implementation(libs.injekt.core) + implementation(libs.injekt) // Image loading implementation(platform(libs.coil.bom)) diff --git a/app/src/main/java/eu/kanade/tachiyomi/App.kt b/app/src/main/java/eu/kanade/tachiyomi/App.kt index 82a225809..a9a3fca52 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/App.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/App.kt @@ -21,6 +21,7 @@ import coil3.network.okhttp.OkHttpNetworkFetcherFactory import coil3.request.allowRgb565 import coil3.request.crossfade import coil3.util.DebugLogger +import dev.mihon.injekt.patchInjekt import eu.kanade.domain.DomainModule import eu.kanade.domain.SYDomainModule import eu.kanade.domain.base.BasePreferences @@ -78,6 +79,7 @@ class App : Application(), DefaultLifecycleObserver, SingletonImageLoader.Factor @SuppressLint("LaunchActivityFromNotification") override fun onCreate() { super.onCreate() + patchInjekt() GlobalExceptionHandler.initialize(applicationContext, CrashActivity::class.java) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 03f6677c5..bbee2d401 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -39,7 +39,7 @@ sqlite-android = "com.github.requery:sqlite-android:3.45.0" preferencektx = "androidx.preference:preference-ktx:1.2.1" -injekt-core = "com.github.inorichi.injekt:injekt-core:65b0440" +injekt = "com.github.mihonapp:injekt:91edab2317" coil-bom = { module = "io.coil-kt.coil3:coil-bom", version = "3.0.0-alpha10" } coil-core = { module = "io.coil-kt.coil3:coil" } diff --git a/presentation-widget/build.gradle.kts b/presentation-widget/build.gradle.kts index 292b67240..b9815ab15 100644 --- a/presentation-widget/build.gradle.kts +++ b/presentation-widget/build.gradle.kts @@ -26,5 +26,5 @@ dependencies { implementation(platform(libs.coil.bom)) implementation(libs.coil.core) - api(libs.injekt.core) + api(libs.injekt) } diff --git a/source-api/build.gradle.kts b/source-api/build.gradle.kts index ad9fbf516..284a30d1e 100644 --- a/source-api/build.gradle.kts +++ b/source-api/build.gradle.kts @@ -10,7 +10,7 @@ kotlin { val commonMain by getting { dependencies { api(kotlinx.serialization.json) - api(libs.injekt.core) + api(libs.injekt) api(libs.rxjava) api(libs.jsoup)