From b3e16d2b2a44f564690c936e6a5132cc8c26a53a Mon Sep 17 00:00:00 2001 From: tarsin Date: Wed, 22 Feb 2023 17:57:26 +0800 Subject: [PATCH] Revert "Proper way to configure atomicfu" This reverts commit 22c8a362246585523e2d6763223b8fde4d896cac. --- app/build.gradle.kts | 7 +------ .../java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt | 3 +-- build.gradle.kts | 1 - 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 56ba02755..4987281ff 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -3,14 +3,9 @@ plugins { kotlin("android") id("kotlin-parcelize") kotlin("plugin.serialization") - kotlin("plugin.atomicfu") id("com.google.devtools.ksp") } -atomicfuCompilerPlugin { - isJvmIrTransformationEnabled = true -} - android { compileSdk = 33 buildToolsVersion = "33.0.2" @@ -197,7 +192,7 @@ dependencies { // https://coil-kt.github.io/coil/changelog/ implementation("io.coil-kt:coil-compose:2.2.2") - compileOnly("org.jetbrains.kotlinx:atomicfu:0.20.0") + implementation("org.jetbrains.kotlinx:atomicfu:0.20.0") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4") implementation("org.jetbrains.kotlinx:kotlinx-serialization-cbor:1.5.0-RC") implementation("org.jsoup:jsoup:1.15.4") diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt index f2f3cd1d3..a6dff9f12 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt @@ -192,8 +192,6 @@ class ReaderActivity : EhActivity() { return EhUrl.getGalleryDetailUrl(gid, token, 0, false) } - private val continuation = atomic(null) - private fun buildProvider() { if (mGalleryProvider != null) { return @@ -213,6 +211,7 @@ class ReaderActivity : EhActivity() { Toast.makeText(this, R.string.error_reading_failed, Toast.LENGTH_SHORT).show() } + val continuation = atomic(null) mGalleryProvider = ArchivePageLoader(this, mUri!!, flow { if (!dialogShown) { diff --git a/build.gradle.kts b/build.gradle.kts index d3972dad4..ae882c88b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,7 +2,6 @@ plugins { id("com.android.application") version "8.0.0-beta03" apply false kotlin("android") version "1.8.10" apply false kotlin("plugin.serialization") version "1.8.10" apply false - kotlin("plugin.atomicfu") version "1.8.10" apply false id("com.google.devtools.ksp") version "1.8.10-1.0.9" apply false }