Upgrade to Kotlin 1.5
This commit is contained in:
parent
51f0c42047
commit
f0c2d22e78
|
@ -111,9 +111,9 @@ play {
|
|||
dependencies {
|
||||
implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar", "*.aar"))))
|
||||
|
||||
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72")
|
||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7")
|
||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.7")
|
||||
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.20")
|
||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0")
|
||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0")
|
||||
|
||||
implementation("androidx.appcompat:appcompat:1.2.0")
|
||||
implementation("androidx.core:core-ktx:1.5.0-alpha02")
|
||||
|
|
|
@ -23,7 +23,7 @@ class HttpUpstream<D : Any, R : OtterResponse<D>>(val behavior: Behavior, privat
|
|||
Single, AtOnce, Progressive
|
||||
}
|
||||
|
||||
override fun fetch(size: Int): Flow<Repository.Response<D>> = flow {
|
||||
override fun fetch(size: Int): Flow<Repository.Response<D>> = flow<Repository.Response<D>> {
|
||||
if (behavior == Behavior.Single && size != 0) return@flow
|
||||
|
||||
val page = ceil(size / AppContext.PAGE_SIZE.toDouble()).toInt() + 1
|
||||
|
|
|
@ -139,9 +139,9 @@ data class Track(
|
|||
if (uploads.isEmpty()) return null
|
||||
|
||||
return when (PowerPreference.getDefaultFile().getString("media_cache_quality")) {
|
||||
"quality" -> uploads.maxBy { it.bitrate } ?: uploads[0]
|
||||
"size" -> uploads.minBy { it.bitrate } ?: uploads[0]
|
||||
else -> uploads.maxBy { it.bitrate } ?: uploads[0]
|
||||
"quality" -> uploads.maxByOrNull { it.bitrate } ?: uploads[0]
|
||||
"size" -> uploads.minByOrNull { it.bitrate } ?: uploads[0]
|
||||
else -> uploads.maxByOrNull { it.bitrate } ?: uploads[0]
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ buildscript {
|
|||
|
||||
dependencies {
|
||||
classpath("com.android.tools.build:gradle:4.2.1")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.20")
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue