Update dependencies

app/build.gradle

@@ -28,10 +28,6 @@ android {
 		sourceCompatibility JavaVersion.VERSION_1_8
 		targetCompatibility JavaVersion.VERSION_1_8
 	}
-	kotlinOptions {
-		jvmTarget = JavaVersion.VERSION_1_8.toString()
-		freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
-	}
 	buildTypes {
 		debug {
 			applicationIdSuffix = '.debug'
@@ -55,17 +51,23 @@ android {
 androidExtensions {
 	experimental = true
 }
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+	kotlinOptions {
+		jvmTarget = JavaVersion.VERSION_1_8.toString()
+		freeCompilerArgs += ['-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi', '-Xjvm-default=all']
+	}
+}
 dependencies {
 	implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
 	implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7'
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9'
-	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.7'
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9'
 
-	implementation 'androidx.core:core-ktx:1.5.0-alpha01'
+	implementation 'androidx.core:core-ktx:1.5.0-alpha02'
-	implementation 'androidx.activity:activity-ktx:1.2.0-alpha07'
+	implementation 'androidx.activity:activity-ktx:1.2.0-alpha08'
-	implementation 'androidx.fragment:fragment-ktx:1.3.0-alpha07'
+	implementation 'androidx.fragment:fragment-ktx:1.3.0-alpha08'
-	implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.0-alpha06'
+	implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.0-alpha07'
-	implementation 'androidx.constraintlayout:constraintlayout:2.0.0-rc1'
+	implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
 	implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 	implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha05'
 	implementation 'androidx.viewpager2:viewpager2:1.1.0-alpha01'
@@ -73,7 +75,7 @@ dependencies {
 	implementation 'androidx.work:work-runtime-ktx:2.4.0'
 	implementation 'com.google.android.material:material:1.3.0-alpha02'
 	//noinspection LifecycleAnnotationProcessorWithJava8
-	kapt 'androidx.lifecycle:lifecycle-compiler:2.3.0-alpha06'
+	kapt 'androidx.lifecycle:lifecycle-compiler:2.3.0-alpha07'
 
 	implementation 'androidx.room:room-runtime:2.2.5'
 	implementation 'androidx.room:room-ktx:2.2.5'
@@ -85,12 +87,12 @@ dependencies {
 	implementation 'com.github.moxy-community:moxy-ktx:2.1.2'
 	kapt 'com.github.moxy-community:moxy-compiler:2.1.2'
 
-	implementation 'com.squareup.okhttp3:okhttp:4.8.0'
+	implementation 'com.squareup.okhttp3:okhttp:4.8.1'
 	implementation 'com.squareup.okio:okio:2.7.0'
 	implementation 'org.jsoup:jsoup:1.13.1'
 
-	implementation 'org.koin:koin-android:2.1.5'
+	implementation 'org.koin:koin-android:2.2.0-alpha-1'
-	implementation 'io.coil-kt:coil:0.11.0'
+	implementation 'io.coil-kt:coil:1.0.0-rc1'
 	implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.10.0'
 	implementation 'com.tomclaw.cache:cache:1.0'
 

app/src/main/java/org/koitharu/kotatsu/KotatsuApp.kt

@@ -6,7 +6,7 @@ import androidx.appcompat.app.AppCompatDelegate
 import androidx.room.Room
 import coil.Coil
 import coil.ComponentRegistry
-import coil.ImageLoaderBuilder
+import coil.ImageLoader
 import coil.util.CoilUtils
 import com.chuckerteam.chucker.api.ChuckerCollector
 import com.chuckerteam.chucker.api.ChuckerInterceptor
@@ -14,6 +14,7 @@ import okhttp3.OkHttpClient
 import org.koin.android.ext.koin.androidContext
 import org.koin.android.ext.koin.androidLogger
 import org.koin.core.context.startKoin
+import org.koin.core.logger.Level
 import org.koin.dsl.module
 import org.koitharu.kotatsu.core.db.DatabasePrePopulateCallback
 import org.koitharu.kotatsu.core.db.MangaDatabase
@@ -73,7 +74,7 @@ class KotatsuApp : Application() {
 
 	private fun initKoin() {
 		startKoin {
-			androidLogger()
+			androidLogger(Level.ERROR)
 			androidContext(applicationContext)
 			modules(
 				module {
@@ -101,7 +102,7 @@ class KotatsuApp : Application() {
 
 	private fun initCoil() {
 		Coil.setImageLoader(
-			ImageLoaderBuilder(applicationContext)
+			ImageLoader.Builder(applicationContext)
 				.okHttpClient(
 					okHttp()
 						.cache(CoilUtils.createDefaultCache(applicationContext))

app/src/main/java/org/koitharu/kotatsu/core/db/TagsDao.kt

@@ -4,19 +4,19 @@ import androidx.room.*
 import org.koitharu.kotatsu.core.db.entity.TagEntity
 
 @Dao
-interface TagsDao {
+abstract class TagsDao {
 
 	@Query("SELECT * FROM tags")
-	suspend fun getAllTags(): List<TagEntity>
+	abstract suspend fun getAllTags(): List<TagEntity>
 
 	@Insert(onConflict = OnConflictStrategy.IGNORE)
-	suspend fun insert(tag: TagEntity): Long
+	abstract suspend fun insert(tag: TagEntity): Long
 
 	@Update(onConflict = OnConflictStrategy.IGNORE)
-	suspend fun update(tag: TagEntity): Int
+	abstract suspend fun update(tag: TagEntity): Int
 
 	@Transaction
-	suspend fun upsert(tags: Iterable<TagEntity>) {
+	open suspend fun upsert(tags: Iterable<TagEntity>) {
 		tags.forEach { tag ->
 			if (update(tag) <= 0) {
 				insert(tag)

app/src/main/java/org/koitharu/kotatsu/core/local/CbzFetcher.kt

@@ -2,7 +2,7 @@ package org.koitharu.kotatsu.core.local
 
 import android.net.Uri
 import android.webkit.MimeTypeMap
-import coil.bitmappool.BitmapPool
+import coil.bitmap.BitmapPool
 import coil.decode.DataSource
 import coil.decode.Options
 import coil.fetch.FetchResult

app/src/main/java/org/koitharu/kotatsu/core/parser/site/ChanRepository.kt

@@ -131,7 +131,7 @@ abstract class ChanRepository(loaderContext: MangaLoaderContext) : RemoteMangaRe
 	override fun onCreatePreferences() = setOf(R.string.key_parser_domain)
 
 	private fun getSortKey(sortOrder: SortOrder?) =
-		when (sortOrder ?: sortOrders.minBy { it.ordinal }) {
+		when (sortOrder ?: sortOrders.minByOrNull { it.ordinal }) {
 			SortOrder.ALPHABETICAL -> "catalog"
 			SortOrder.POPULARITY -> "mostfavorites"
 			SortOrder.NEWEST -> "manga/new"
@@ -139,7 +139,7 @@ abstract class ChanRepository(loaderContext: MangaLoaderContext) : RemoteMangaRe
 		}
 
 	private fun getSortKey2(sortOrder: SortOrder?) =
-		when (sortOrder ?: sortOrders.minBy { it.ordinal }) {
+		when (sortOrder ?: sortOrders.minByOrNull { it.ordinal }) {
 			SortOrder.ALPHABETICAL -> "abcasc"
 			SortOrder.POPULARITY -> "favdesc"
 			SortOrder.NEWEST -> "datedesc"

app/src/main/java/org/koitharu/kotatsu/core/parser/site/GroupleRepository.kt

@@ -165,7 +165,7 @@ abstract class GroupleRepository(loaderContext: MangaLoaderContext) :
 	override fun onCreatePreferences() = setOf(R.string.key_parser_domain)
 
 	private fun getSortKey(sortOrder: SortOrder?) =
-		when (sortOrder ?: sortOrders.minBy { it.ordinal }) {
+		when (sortOrder ?: sortOrders.minByOrNull { it.ordinal }) {
 			SortOrder.ALPHABETICAL -> "name"
 			SortOrder.POPULARITY -> "rate"
 			SortOrder.UPDATED -> "updated"

app/src/main/java/org/koitharu/kotatsu/ui/details/MangaDetailsFragment.kt

@@ -6,7 +6,7 @@ import androidx.core.net.toUri
 import androidx.core.text.parseAsHtml
 import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
-import coil.api.load
+import coil.load
 import com.google.android.material.chip.Chip
 import kotlinx.android.synthetic.main.fragment_details.*
 import kotlinx.coroutines.Dispatchers

app/src/main/java/org/koitharu/kotatsu/ui/download/DownloadNotification.kt

@@ -13,7 +13,6 @@ import androidx.core.graphics.drawable.toBitmap
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.ui.details.MangaDetailsActivity
-import org.koitharu.kotatsu.utils.ext.clearActions
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 import kotlin.math.roundToInt
 

app/src/main/java/org/koitharu/kotatsu/ui/download/DownloadService.kt

@@ -8,7 +8,7 @@ import android.webkit.MimeTypeMap
 import android.widget.Toast
 import androidx.core.content.ContextCompat
 import coil.Coil
-import coil.request.GetRequestBuilder
+import coil.request.ImageRequest
 import kotlinx.coroutines.*
 import kotlinx.coroutines.sync.Mutex
 import okhttp3.OkHttpClient
@@ -89,7 +89,7 @@ class DownloadService : BaseService() {
 				val repo = MangaProviderFactory.create(manga.source)
 				val cover = safe {
 					Coil.execute(
-						GetRequestBuilder(this@DownloadService)
+						ImageRequest.Builder(this@DownloadService)
 							.data(manga.coverUrl)
 							.build()
 					).drawable

app/src/main/java/org/koitharu/kotatsu/ui/list/MangaGridHolder.kt

@@ -1,8 +1,8 @@
 package org.koitharu.kotatsu.ui.list
 
 import android.view.ViewGroup
-import coil.api.clear
+import coil.clear
-import coil.api.load
+import coil.load
 import kotlinx.android.synthetic.main.item_manga_grid.*
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.Manga

app/src/main/java/org/koitharu/kotatsu/ui/list/MangaListDetailsHolder.kt

@@ -3,8 +3,8 @@ package org.koitharu.kotatsu.ui.list
 import android.annotation.SuppressLint
 import android.view.ViewGroup
 import androidx.core.view.isVisible
-import coil.api.clear
+import coil.clear
-import coil.api.load
+import coil.load
 import kotlinx.android.synthetic.main.item_manga_list_details.*
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.Manga

app/src/main/java/org/koitharu/kotatsu/ui/list/MangaListHolder.kt

@@ -1,8 +1,8 @@
 package org.koitharu.kotatsu.ui.list
 
 import android.view.ViewGroup
-import coil.api.clear
+import coil.clear
-import coil.api.load
+import coil.load
 import kotlinx.android.synthetic.main.item_manga_list.*
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.Manga

app/src/main/java/org/koitharu/kotatsu/ui/list/feed/FeedHolder.kt

@@ -2,8 +2,8 @@ package org.koitharu.kotatsu.ui.list.feed
 
 import android.text.format.DateUtils
 import android.view.ViewGroup
-import coil.api.clear
+import coil.clear
-import coil.api.load
+import coil.load
 import kotlinx.android.synthetic.main.item_tracklog.*
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.TrackingLogItem

app/src/main/java/org/koitharu/kotatsu/ui/reader/thumbnails/PageThumbnailHolder.kt

@@ -3,7 +3,7 @@ package org.koitharu.kotatsu.ui.reader.thumbnails
 import android.view.ViewGroup
 import androidx.core.net.toUri
 import coil.Coil
-import coil.request.GetRequestBuilder
+import coil.request.ImageRequest
 import coil.size.PixelSize
 import coil.size.Size
 import kotlinx.android.synthetic.main.item_page_thumb.*
@@ -18,7 +18,7 @@ class PageThumbnailHolder(parent: ViewGroup, private val scope: CoroutineScope)
 	BaseViewHolder<MangaPage, PagesCache>(parent, R.layout.item_page_thumb) {
 
 	private var job: Job? = null
-	private	val thumbSize: Size
+	private val thumbSize: Size
 
 	init {
 		val width = itemView.context.resources.getDimensionPixelSize(R.dimen.preferred_grid_width)
@@ -38,10 +38,12 @@ class PageThumbnailHolder(parent: ViewGroup, private val scope: CoroutineScope)
 					val pageUrl = MangaProviderFactory.create(data.source).getPageFullUrl(data)
 					extra[pageUrl]?.toUri()?.toString() ?: pageUrl
 				}
-				val drawable = Coil.execute(GetRequestBuilder(context)
+				val drawable = Coil.execute(
-					.data(url)
+					ImageRequest.Builder(context)
-					.size(thumbSize)
+						.data(url)
-					.build()).drawable
+						.size(thumbSize)
+						.build()
+				).drawable
 				withContext(Dispatchers.Main) {
 					imageView_thumb.setImageDrawable(drawable)
 				}

app/src/main/java/org/koitharu/kotatsu/ui/settings/AppUpdateChecker.kt

@@ -67,10 +67,15 @@ class AppUpdateChecker(private val activity: ComponentActivity) : KoinComponent
 			.setTitle(R.string.app_update_available)
 			.setMessage(buildString {
 				append(activity.getString(R.string.new_version_s, version.name))
-				appendln()
+				appendLine()
-				append(activity.getString(R.string.size_s, FileSizeUtils.formatBytes(activity, version.apkSize)))
+				append(
-				appendln()
+					activity.getString(
-				appendln()
+						R.string.size_s,
+						FileSizeUtils.formatBytes(activity, version.apkSize)
+					)
+				)
+				appendLine()
+				appendLine()
 				append(version.description)
 			})
 			.setPositiveButton(R.string.download) { _, _ ->

app/src/main/java/org/koitharu/kotatsu/ui/tracker/TrackWorker.kt

@@ -10,7 +10,7 @@ import androidx.core.app.NotificationCompat
 import androidx.core.content.ContextCompat
 import androidx.work.*
 import coil.Coil
-import coil.request.GetRequestBuilder
+import coil.request.ImageRequest
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.koin.core.KoinComponent
@@ -143,7 +143,7 @@ class TrackWorker(context: Context, workerParams: WorkerParameters) :
 			setNumber(newChapters.size)
 			setLargeIcon(
 				Coil.execute(
-					GetRequestBuilder(applicationContext)
+					ImageRequest.Builder(applicationContext)
 						.data(manga.coverUrl)
 						.build()
 				).toBitmapOrNull()

app/src/main/java/org/koitharu/kotatsu/ui/widget/recent/RecentListFactory.kt

@@ -5,7 +5,7 @@ import android.content.Intent
 import android.widget.RemoteViews
 import android.widget.RemoteViewsService
 import coil.Coil
-import coil.request.GetRequestBuilder
+import coil.request.ImageRequest
 import kotlinx.coroutines.runBlocking
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.Manga
@@ -38,9 +38,11 @@ class RecentListFactory(private val context: Context) : RemoteViewsService.Remot
 		val item = dataSet[position]
 		try {
 			val cover = runBlocking {
-				Coil.execute(GetRequestBuilder(context)
+				Coil.execute(
-					.data(item.coverUrl)
+					ImageRequest.Builder(context)
-					.build()).requireBitmap()
+						.data(item.coverUrl)
+						.build()
+				).requireBitmap()
 			}
 			views.setImageViewBitmap(R.id.imageView_cover, cover)
 		} catch (e: IOException) {

app/src/main/java/org/koitharu/kotatsu/ui/widget/shelf/ShelfListFactory.kt

@@ -5,7 +5,7 @@ import android.content.Intent
 import android.widget.RemoteViews
 import android.widget.RemoteViewsService
 import coil.Coil
-import coil.request.GetRequestBuilder
+import coil.request.ImageRequest
 import kotlinx.coroutines.runBlocking
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.Manga
@@ -49,9 +49,11 @@ class ShelfListFactory(private val context: Context, widgetId: Int) : RemoteView
 		views.setTextViewText(R.id.textView_title, item.title)
 		try {
 			val cover = runBlocking {
-				Coil.execute(GetRequestBuilder(context)
+				Coil.execute(
-					.data(item.coverUrl)
+					ImageRequest.Builder(context)
-					.build()).requireBitmap()
+						.data(item.coverUrl)
+						.build()
+				).requireBitmap()
 			}
 			views.setImageViewBitmap(R.id.imageView_cover, cover)
 		} catch (e: IOException) {

app/src/main/java/org/koitharu/kotatsu/utils/MangaShortcut.kt

@@ -10,7 +10,7 @@ import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.core.graphics.drawable.IconCompat
 import coil.Coil
-import coil.request.GetRequestBuilder
+import coil.request.ImageRequest
 import coil.size.PixelSize
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -40,7 +40,7 @@ class MangaShortcut(private val manga: Manga) {
 		}
 		builder.setRank(1)
 		if (shortcuts.isNotEmpty() && shortcuts.size >= limit) {
-			manager.removeDynamicShortcuts(listOf(shortcuts.minBy { it.rank }!!.id))
+			manager.removeDynamicShortcuts(listOf(shortcuts.minByOrNull { it.rank }!!.id))
 		}
 		manager.addDynamicShortcuts(listOf(builder.build().toShortcutInfo()))
 	}
@@ -66,9 +66,11 @@ class MangaShortcut(private val manga: Manga) {
 		val icon = safe {
 			val size = getIconSize(context)
 			withContext(Dispatchers.IO) {
-				val bmp = Coil.execute(GetRequestBuilder(context)
+				val bmp = Coil.execute(
-					.data(manga.coverUrl)
+					ImageRequest.Builder(context)
-					.build()).requireBitmap()
+						.data(manga.coverUrl)
+						.build()
+				).requireBitmap()
 				ThumbnailUtils.extractThumbnail(bmp, size.width, size.height, 0)
 			}
 		}

app/src/main/java/org/koitharu/kotatsu/utils/ext/CoilExt.kt

@@ -2,15 +2,15 @@ package org.koitharu.kotatsu.utils.ext
 
 import androidx.core.graphics.drawable.toBitmap
 import coil.request.ErrorResult
-import coil.request.RequestResult
+import coil.request.ImageResult
 import coil.request.SuccessResult
 
-fun RequestResult.requireBitmap() = when(this) {
+fun ImageResult.requireBitmap() = when (this) {
 	is SuccessResult -> drawable.toBitmap()
 	is ErrorResult -> throw throwable
 }
 
-fun RequestResult.toBitmapOrNull() = when(this) {
+fun ImageResult.toBitmapOrNull() = when (this) {
 	is SuccessResult -> try {
 		drawable.toBitmap()
 	} catch (_: Throwable) {

app/src/main/java/org/koitharu/kotatsu/utils/ext/NotificationExt.kt

@@ -1,12 +0,0 @@
-package org.koitharu.kotatsu.utils.ext
-
-import android.annotation.SuppressLint
-import androidx.core.app.NotificationCompat
-
-@SuppressLint("RestrictedApi")
-fun NotificationCompat.Builder.clearActions(): NotificationCompat.Builder {
-	safe {
-		mActions.clear()
-	}
-	return this
-}

build.gradle

@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-	ext.kotlin_version = "1.3.72"
+	ext.kotlin_version = '1.4.0'
 	repositories {
 		google()
 		jcenter()

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Jul 01 18:26:34 EEST 2020
+#Wed Aug 26 15:09:14 EEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip