Use Kolinter Gradle plugin for linting instead of ktlint directly

(cherry picked from commit 76f6fe4601)

app/src/main/java/exh/EXHMigrations.kt

@@ -28,10 +28,10 @@ import eu.kanade.tachiyomi.source.online.all.Hitomi
 import eu.kanade.tachiyomi.source.online.all.NHentai
 import exh.merged.sql.models.MergedMangaReference
 import exh.source.BlacklistedSources
+import uy.kohesive.injekt.injectLazy
 import java.io.File
 import java.net.URI
 import java.net.URISyntaxException
-import uy.kohesive.injekt.injectLazy
 
 object EXHMigrations {
     private val db: DatabaseHelper by injectLazy()

app/src/main/java/exh/GalleryAdder.kt

@@ -10,8 +10,8 @@ import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.source.online.UrlImportableSource
 import eu.kanade.tachiyomi.source.online.all.EHentai
 import eu.kanade.tachiyomi.util.chapter.syncChaptersWithSource
-import java.util.Date
 import uy.kohesive.injekt.injectLazy
+import java.util.Date
 
 class GalleryAdder {
 

app/src/main/java/exh/debug/DebugFunctions.kt

@@ -25,7 +25,6 @@ import exh.metadata.metadata.base.insertFlatMetadata
 import exh.util.await
 import exh.util.cancellable
 import exh.util.jobScheduler
-import java.lang.RuntimeException
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.asFlow
 import kotlinx.coroutines.flow.mapNotNull
@@ -34,6 +33,7 @@ import kotlinx.coroutines.runBlocking
 import timber.log.Timber
 import uy.kohesive.injekt.injectLazy
 import xyz.nulldev.ts.api.http.serializer.FilterSerializer
+import java.lang.RuntimeException
 
 @OptIn(FlowPreview::class)
 object DebugFunctions {

app/src/main/java/exh/eh/EHentaiUpdateHelper.kt

@@ -8,11 +8,11 @@ import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.database.models.MangaCategory
 import exh.metadata.metadata.EHentaiSearchMetadata
 import exh.metadata.metadata.base.getFlatMetadataForManga
-import java.io.File
-import java.util.Date
 import rx.Observable
 import rx.Single
 import uy.kohesive.injekt.injectLazy
+import java.io.File
+import java.util.Date
 
 data class ChapterChain(val manga: Manga, val chapters: List<Chapter>)
 

app/src/main/java/exh/eh/EHentaiUpdateWorker.kt

@@ -27,11 +27,6 @@ import exh.metadata.metadata.base.insertFlatMetadata
 import exh.util.await
 import exh.util.cancellable
 import exh.util.jobScheduler
-import java.util.ArrayList
-import kotlin.coroutines.CoroutineContext
-import kotlin.time.ExperimentalTime
-import kotlin.time.days
-import kotlin.time.hours
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -47,6 +42,11 @@ import rx.schedulers.Schedulers
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
+import java.util.ArrayList
+import kotlin.coroutines.CoroutineContext
+import kotlin.time.ExperimentalTime
+import kotlin.time.days
+import kotlin.time.hours
 
 class EHentaiUpdateWorker : JobService(), CoroutineScope {
     override val coroutineContext: CoroutineContext

app/src/main/java/exh/eh/MemAutoFlushingLookupTable.kt

@@ -3,13 +3,6 @@ package exh.eh
 import android.util.SparseArray
 import androidx.core.util.AtomicFile
 import com.elvishew.xlog.XLog
-import java.io.Closeable
-import java.io.File
-import java.io.FileNotFoundException
-import java.io.InputStream
-import java.nio.ByteBuffer
-import kotlin.concurrent.thread
-import kotlin.coroutines.CoroutineContext
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -22,6 +15,13 @@ import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
+import java.io.Closeable
+import java.io.File
+import java.io.FileNotFoundException
+import java.io.InputStream
+import java.nio.ByteBuffer
+import kotlin.concurrent.thread
+import kotlin.coroutines.CoroutineContext
 
 /**
  * In memory Int -> Obj lookup table implementation that

app/src/main/java/exh/favorites/FavoritesSyncHelper.kt

@@ -24,13 +24,13 @@ import exh.eh.EHentaiUpdateWorker
 import exh.util.ignore
 import exh.util.trans
 import exh.util.wifiManager
-import kotlin.concurrent.thread
 import okhttp3.FormBody
 import okhttp3.Request
 import rx.subjects.BehaviorSubject
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
+import kotlin.concurrent.thread
 
 class FavoritesSyncHelper(val context: Context) {
     private val db: DatabaseHelper by injectLazy()

app/src/main/java/exh/favorites/LocalFavoritesStorage.kt

@@ -8,8 +8,8 @@ import exh.EXH_SOURCE_ID
 import exh.metadata.metadata.EHentaiSearchMetadata
 import io.realm.Realm
 import io.realm.RealmConfiguration
-import java.util.Date
 import uy.kohesive.injekt.injectLazy
+import java.util.Date
 
 class LocalFavoritesStorage {
     private val db: DatabaseHelper by injectLazy()

app/src/main/java/exh/md/handlers/ApiChapterParser.kt

@@ -3,8 +3,8 @@ package exh.md.handlers
 import com.github.salomonbrys.kotson.string
 import com.google.gson.JsonParser
 import eu.kanade.tachiyomi.source.model.Page
-import java.util.Date
 import okhttp3.Response
+import java.util.Date
 
 class ApiChapterParser {
     fun pageListParse(response: Response): List<Page> {

app/src/main/java/exh/md/handlers/ApiMangaParser.kt

@@ -18,12 +18,12 @@ import exh.metadata.metadata.base.RaisedTag
 import exh.metadata.metadata.base.getFlatMetadataForManga
 import exh.metadata.metadata.base.insertFlatMetadata
 import exh.util.floor
-import java.util.Date
 import okhttp3.Response
 import rx.Completable
 import rx.Single
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
+import java.util.Date
 
 class ApiMangaParser(private val langs: List<String>) {
     val db: DatabaseHelper get() = Injekt.get()

app/src/main/java/exh/md/handlers/MangaPlusHandler.kt

@@ -3,7 +3,6 @@ package exh.md.handlers
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.source.model.Page
 import exh.md.handlers.serializers.MangaPlusSerializer
-import java.util.UUID
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.protobuf.ProtoBuf
 import okhttp3.Headers
@@ -13,6 +12,7 @@ import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import okhttp3.ResponseBody.Companion.toResponseBody
+import java.util.UUID
 
 class MangaPlusHandler(currentClient: OkHttpClient) {
     val baseUrl = "https://jumpg-webapi.tokyo-cdn.com/api"

app/src/main/java/exh/md/utils/MdUtil.kt

@@ -6,12 +6,12 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.all.MangaDex
 import exh.util.floor
-import java.net.URI
-import java.net.URISyntaxException
 import kotlinx.serialization.json.Json
 import org.jsoup.parser.Parser
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
+import java.net.URI
+import java.net.URISyntaxException
 
 class MdUtil {
 

app/src/main/java/exh/metadata/metadata/EHentaiSearchMetadata.kt

@@ -9,9 +9,9 @@ import exh.metadata.EX_DATE_FORMAT
 import exh.metadata.ONGOING_SUFFIX
 import exh.metadata.humanReadableByteCount
 import exh.metadata.metadata.base.RaisedSearchMetadata
-import java.util.Date
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
+import java.util.Date
 
 class EHentaiSearchMetadata : RaisedSearchMetadata() {
     var gId: String?

app/src/main/java/exh/metadata/metadata/NHentaiSearchMetadata.kt

@@ -6,8 +6,8 @@ import eu.kanade.tachiyomi.source.model.SManga
 import exh.metadata.EX_DATE_FORMAT
 import exh.metadata.ONGOING_SUFFIX
 import exh.metadata.metadata.base.RaisedSearchMetadata
-import java.util.Date
 import uy.kohesive.injekt.api.get
+import java.util.Date
 
 class NHentaiSearchMetadata : RaisedSearchMetadata() {
     var url get() = nhId?.let { BASE_URL + nhIdToPath(it) }

app/src/main/java/exh/metadata/metadata/base/FlatMetadata.kt

@@ -5,9 +5,9 @@ import eu.kanade.tachiyomi.data.database.DatabaseHelper
 import exh.metadata.sql.models.SearchMetadata
 import exh.metadata.sql.models.SearchTag
 import exh.metadata.sql.models.SearchTitle
-import kotlin.reflect.KClass
 import rx.Completable
 import rx.Single
+import kotlin.reflect.KClass
 
 data class FlatMetadata(
     val metadata: SearchMetadata,

app/src/main/java/exh/uconfig/ConfiguringDialogController.kt

@@ -8,8 +8,8 @@ import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.ui.base.controller.DialogController
 import eu.kanade.tachiyomi.util.lang.launchUI
 import eu.kanade.tachiyomi.util.system.toast
-import kotlin.concurrent.thread
 import timber.log.Timber
+import kotlin.concurrent.thread
 
 class ConfiguringDialogController : DialogController() {
     private var materialDialog: MaterialDialog? = null

app/src/main/java/exh/ui/LoaderManager.kt

@@ -1,11 +1,11 @@
 package exh.ui
 
-import java.util.UUID
-import kotlin.coroutines.CoroutineContext
-import kotlin.coroutines.EmptyCoroutineContext
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import java.util.UUID
+import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.EmptyCoroutineContext
 
 typealias LoadingHandle = String
 

app/src/main/java/exh/ui/base/BaseExhController.kt

@@ -7,11 +7,11 @@ import android.view.ViewGroup
 import androidx.annotation.LayoutRes
 import androidx.viewbinding.ViewBinding
 import eu.kanade.tachiyomi.ui.base.controller.BaseController
-import kotlin.coroutines.CoroutineContext
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancel
+import kotlin.coroutines.CoroutineContext
 
 abstract class BaseExhController<VB : ViewBinding>(bundle: Bundle? = null) : BaseController<VB>(bundle), CoroutineScope {
     abstract val layoutId: Int

app/src/main/java/exh/ui/batchadd/BatchAddController.kt

@@ -93,8 +93,8 @@ class BatchAddController : NucleusController<EhFragmentBatchAddBinding, BatchAdd
                             ?.subscribeUntilDestroy {
                                 binding.progressLog.append("$it\n")
                             }?.let {
-                            progressSubscriptions += it
-                        }
+                                progressSubscriptions += it
+                            }
                     } else if (it == BatchAddPresenter.STATE_PROGRESS_TO_INPUT) {
                         hideProgress(this)
                         presenter.currentlyAddingRelay.call(BatchAddPresenter.STATE_IDLE)

app/src/main/java/exh/ui/batchadd/BatchAddPresenter.kt

@@ -9,9 +9,9 @@ import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
 import exh.GalleryAddEvent
 import exh.GalleryAdder
 import exh.util.trimOrNull
-import kotlin.concurrent.thread
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
+import kotlin.concurrent.thread
 
 class BatchAddPresenter : BasePresenter<BatchAddController>() {
 

app/src/main/java/exh/ui/captcha/AutoSolvingWebViewClient.kt

@@ -5,9 +5,9 @@ import android.webkit.WebResourceResponse
 import android.webkit.WebView
 import eu.kanade.tachiyomi.util.asJsoup
 import exh.ui.captcha.BrowserActionActivity.Companion.CROSS_WINDOW_SCRIPT_INNER
-import java.nio.charset.Charset
 import org.jsoup.nodes.DataNode
 import org.jsoup.nodes.Element
+import java.nio.charset.Charset
 
 class AutoSolvingWebViewClient(
     activity: BrowserActionActivity,

app/src/main/java/exh/ui/captcha/BrowserActionActivity.kt

@@ -25,9 +25,6 @@ import eu.kanade.tachiyomi.source.online.HttpSource
 import eu.kanade.tachiyomi.util.system.setDefaultSettings
 import exh.source.DelegatedHttpSource
 import exh.util.melt
-import java.io.Serializable
-import java.net.URL
-import java.util.UUID
 import kotlinx.android.synthetic.main.eh_activity_captcha.toolbar
 import kotlinx.android.synthetic.main.eh_activity_captcha.webview
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
@@ -40,6 +37,9 @@ import rx.Single
 import rx.schedulers.Schedulers
 import timber.log.Timber
 import uy.kohesive.injekt.injectLazy
+import java.io.Serializable
+import java.net.URL
+import java.util.UUID
 
 class BrowserActionActivity : AppCompatActivity() {
     private val sourceManager: SourceManager by injectLazy()

app/src/main/java/exh/ui/intercept/InterceptActivity.kt

@@ -14,10 +14,10 @@ import eu.kanade.tachiyomi.ui.main.MainActivity
 import eu.kanade.tachiyomi.ui.manga.MangaController
 import exh.GalleryAddEvent
 import exh.GalleryAdder
-import kotlin.concurrent.thread
 import rx.Subscription
 import rx.android.schedulers.AndroidSchedulers
 import rx.subjects.BehaviorSubject
+import kotlin.concurrent.thread
 
 class InterceptActivity : BaseActivity<EhActivityInterceptBinding>() {
     private var statusSubscription: Subscription? = null

app/src/main/java/exh/ui/login/LoginController.kt

@@ -15,9 +15,9 @@ import eu.kanade.tachiyomi.ui.base.controller.NucleusController
 import eu.kanade.tachiyomi.util.lang.launchUI
 import eu.kanade.tachiyomi.util.system.setDefaultSettings
 import exh.uconfig.WarnConfigureDialogController
-import java.net.HttpCookie
 import timber.log.Timber
 import uy.kohesive.injekt.injectLazy
+import java.net.HttpCookie
 
 /**
  * LoginController

app/src/main/java/exh/ui/metadata/adapters/EHentaiDescriptionAdapter.kt

@@ -16,8 +16,6 @@ import exh.metadata.humanReadableByteCount
 import exh.metadata.metadata.EHentaiSearchMetadata
 import exh.ui.metadata.MetadataViewController
 import exh.util.SourceTagsUtil
-import java.util.Date
-import kotlin.math.roundToInt
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -25,6 +23,8 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import reactivecircus.flowbinding.android.view.clicks
 import reactivecircus.flowbinding.android.view.longClicks
+import java.util.Date
+import kotlin.math.roundToInt
 
 class EHentaiDescriptionAdapter(
     private val controller: MangaController

app/src/main/java/exh/ui/metadata/adapters/HitomiDescriptionAdapter.kt

@@ -14,7 +14,6 @@ import exh.metadata.EX_DATE_FORMAT
 import exh.metadata.metadata.HitomiSearchMetadata
 import exh.ui.metadata.MetadataViewController
 import exh.util.SourceTagsUtil
-import java.util.Date
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -22,6 +21,7 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import reactivecircus.flowbinding.android.view.clicks
 import reactivecircus.flowbinding.android.view.longClicks
+import java.util.Date
 
 class HitomiDescriptionAdapter(
     private val controller: MangaController

app/src/main/java/exh/ui/metadata/adapters/MangaDexDescriptionAdapter.kt

@@ -12,7 +12,6 @@ import eu.kanade.tachiyomi.ui.manga.MangaController
 import eu.kanade.tachiyomi.util.system.copyToClipboard
 import exh.metadata.metadata.MangaDexSearchMetadata
 import exh.ui.metadata.MetadataViewController
-import kotlin.math.roundToInt
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -20,6 +19,7 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import reactivecircus.flowbinding.android.view.clicks
 import reactivecircus.flowbinding.android.view.longClicks
+import kotlin.math.roundToInt
 
 class MangaDexDescriptionAdapter(
     private val controller: MangaController

app/src/main/java/exh/ui/metadata/adapters/NHentaiDescriptionAdapter.kt

@@ -16,7 +16,6 @@ import exh.metadata.EX_DATE_FORMAT
 import exh.metadata.metadata.NHentaiSearchMetadata
 import exh.ui.metadata.MetadataViewController
 import exh.util.SourceTagsUtil
-import java.util.Date
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -24,6 +23,7 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import reactivecircus.flowbinding.android.view.clicks
 import reactivecircus.flowbinding.android.view.longClicks
+import java.util.Date
 
 class NHentaiDescriptionAdapter(
     private val controller: MangaController

app/src/main/java/exh/ui/metadata/adapters/PervEdenDescriptionAdapter.kt

@@ -13,8 +13,6 @@ import eu.kanade.tachiyomi.util.system.copyToClipboard
 import exh.metadata.metadata.PervEdenSearchMetadata
 import exh.ui.metadata.MetadataViewController
 import exh.util.SourceTagsUtil
-import java.util.Locale
-import kotlin.math.roundToInt
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -22,6 +20,8 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import reactivecircus.flowbinding.android.view.clicks
 import reactivecircus.flowbinding.android.view.longClicks
+import java.util.Locale
+import kotlin.math.roundToInt
 
 class PervEdenDescriptionAdapter(
     private val controller: MangaController

app/src/main/java/exh/ui/metadata/adapters/PururinDescriptionAdapter.kt

@@ -14,7 +14,6 @@ import exh.metadata.metadata.PururinSearchMetadata
 import exh.metadata.metadata.PururinSearchMetadata.Companion.TAG_NAMESPACE_CATEGORY
 import exh.ui.metadata.MetadataViewController
 import exh.util.SourceTagsUtil
-import kotlin.math.roundToInt
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -22,6 +21,7 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import reactivecircus.flowbinding.android.view.clicks
 import reactivecircus.flowbinding.android.view.longClicks
+import kotlin.math.roundToInt
 
 class PururinDescriptionAdapter(
     private val controller: MangaController

app/src/main/java/exh/ui/metadata/adapters/TsuminoDescriptionAdapter.kt

@@ -14,8 +14,6 @@ import eu.kanade.tachiyomi.util.system.getResourceColor
 import exh.metadata.metadata.TsuminoSearchMetadata
 import exh.ui.metadata.MetadataViewController
 import exh.util.SourceTagsUtil
-import java.util.Date
-import kotlin.math.roundToInt
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -23,6 +21,8 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import reactivecircus.flowbinding.android.view.clicks
 import reactivecircus.flowbinding.android.view.longClicks
+import java.util.Date
+import kotlin.math.roundToInt
 
 class TsuminoDescriptionAdapter(
     private val controller: MangaController

app/src/main/java/exh/util/CoroutineUtil.kt

@@ -1,10 +1,10 @@
 package exh.util
 
-import kotlin.coroutines.coroutineContext
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.onEach
+import kotlin.coroutines.coroutineContext
 
 @FlowPreview
 fun <T> Flow<T>.cancellable() = onEach {

app/src/main/java/exh/util/MangaType.kt

@@ -5,9 +5,9 @@ import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.ui.reader.ReaderActivity
-import java.util.Locale
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
+import java.util.Locale
 
 fun Manga.mangaType(context: Context): String {
     return context.getString(

app/src/main/java/exh/util/OkHttpExtensions.kt

@@ -1,11 +1,11 @@
 package exh.util
 
-import java.util.concurrent.atomic.AtomicBoolean
 import okhttp3.Call
 import okhttp3.Response
 import rx.Observable
 import rx.Producer
 import rx.Subscription
+import java.util.concurrent.atomic.AtomicBoolean
 
 fun Call.asObservableWithAsyncStacktrace(): Observable<Pair<Exception, Response>> {
     // Record stacktrace at creation time for easier debugging

app/src/main/java/exh/util/RxUtil.kt

@@ -2,8 +2,6 @@ package exh.util
 
 import com.pushtorefresh.storio.operations.PreparedOperation
 import com.pushtorefresh.storio.sqlite.operations.get.PreparedGetObject
-import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
 import kotlinx.coroutines.CancellableContinuation
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineStart
@@ -28,6 +26,8 @@ import rx.SingleSubscriber
 import rx.Subscriber
 import rx.Subscription
 import rx.subjects.ReplaySubject
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
 
 /**
  * Transform a cold single to a hot single
@@ -103,32 +103,36 @@ suspend fun Completable.awaitSuspending(subscribeOn: Scheduler? = null) {
 }
 
 suspend fun Completable.awaitCompleted(): Unit = suspendCancellableCoroutine { cont ->
-    subscribe(object : CompletableSubscriber {
-        override fun onSubscribe(s: Subscription) {
-            cont.unsubscribeOnCancellation(s)
-        }
+    subscribe(
+        object : CompletableSubscriber {
+            override fun onSubscribe(s: Subscription) {
+                cont.unsubscribeOnCancellation(s)
+            }
 
-        override fun onCompleted() {
-            cont.resume(Unit)
-        }
+            override fun onCompleted() {
+                cont.resume(Unit)
+            }
 
-        override fun onError(e: Throwable) {
-            cont.resumeWithException(e)
+            override fun onError(e: Throwable) {
+                cont.resumeWithException(e)
+            }
         }
-    })
+    )
 }
 
 suspend fun <T> Single<T>.await(): T = suspendCancellableCoroutine { cont ->
     cont.unsubscribeOnCancellation(
-        subscribe(object : SingleSubscriber<T>() {
-            override fun onSuccess(t: T) {
-                cont.resume(t)
-            }
+        subscribe(
+            object : SingleSubscriber<T>() {
+                override fun onSuccess(t: T) {
+                    cont.resume(t)
+                }
 
-            override fun onError(error: Throwable) {
-                cont.resumeWithException(error)
+                override fun onError(error: Throwable) {
+                    cont.resumeWithException(error)
+                }
             }
-        })
+        )
     )
 }
 
@@ -157,35 +161,37 @@ suspend fun <T> Observable<T>.awaitSingle(): T = single().awaitOne()
 @OptIn(InternalCoroutinesApi::class, ExperimentalCoroutinesApi::class)
 private suspend fun <T> Observable<T>.awaitOne(): T = suspendCancellableCoroutine { cont ->
     cont.unsubscribeOnCancellation(
-        subscribe(object : Subscriber<T>() {
-            override fun onStart() {
-                request(1)
-            }
+        subscribe(
+            object : Subscriber<T>() {
+                override fun onStart() {
+                    request(1)
+                }
 
-            override fun onNext(t: T) {
-                cont.resume(t)
-            }
+                override fun onNext(t: T) {
+                    cont.resume(t)
+                }
 
-            override fun onCompleted() {
-                if (cont.isActive) cont.resumeWithException(
-                    IllegalStateException(
-                        "Should have invoked onNext"
+                override fun onCompleted() {
+                    if (cont.isActive) cont.resumeWithException(
+                        IllegalStateException(
+                            "Should have invoked onNext"
+                        )
                     )
-                )
-            }
+                }
 
-            override fun onError(e: Throwable) {
-                /*
+                override fun onError(e: Throwable) {
+          /*
              * Rx1 observable throws NoSuchElementException if cancellation happened before
              * element emission. To mitigate this we try to atomically resume continuation with exception:
              * if resume failed, then we know that continuation successfully cancelled itself
              */
-                val token = cont.tryResumeWithException(e)
-                if (token != null) {
-                    cont.completeResume(token)
+                    val token = cont.tryResumeWithException(e)
+                    if (token != null) {
+                        cont.completeResume(token)
+                    }
                 }
             }
-        })
+        )
     )
 }