[#323] Kotlin 1.7.10

Also suppressed some deprecations which are making the build logs very noisy.
This commit is contained in:
Carter Jernigan 2022-07-25 15:36:23 -04:00 committed by GitHub
parent dc3d911bde
commit 48d86b23ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 5 deletions

View File

@ -87,8 +87,8 @@ android {
}
kotlinOptions {
jvmTarget = "1.8"
freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
freeCompilerArgs += "-Xopt-in=kotlin.time.ExperimentalTime"
freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
freeCompilerArgs += "-opt-in=kotlin.time.ExperimentalTime"
// freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ObsoleteCoroutinesApi"
// freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.FlowPreview"
}

View File

@ -61,6 +61,8 @@ import kotlinx.coroutines.flow.runningReduce
import kotlinx.coroutines.isActive
import kotlinx.coroutines.launch
// There are deprecations with the use of BroadcastChannel
@kotlinx.coroutines.ObsoleteCoroutinesApi
class HomeFragment : BaseFragment<FragmentHomeBinding>() {
override val screen = Report.Screen.HOME

View File

@ -29,6 +29,8 @@ import kotlinx.coroutines.flow.scan
import javax.inject.Inject
import kotlin.math.roundToInt
// There are deprecations with the use of BroadcastChannel
@kotlinx.coroutines.ObsoleteCoroutinesApi
class HomeViewModel @Inject constructor() : ViewModel() {
@Inject

View File

@ -3,7 +3,7 @@ package cash.z.ecc.android
object Deps {
// For use in the top-level build.gradle which gives an error when provided
// `Deps.Kotlin.version` directly
const val kotlinVersion = "1.7.0"
const val kotlinVersion = "1.7.10"
const val navigationVersion = "2.3.5"
const val compileSdkVersion = 31
@ -74,7 +74,7 @@ object Deps {
object Kotlin : Version(kotlinVersion) {
val STDLIB = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
val REFLECT = "org.jetbrains.kotlin:kotlin-reflect:$version"
object Coroutines : Version("1.6.1") {
object Coroutines : Version("1.6.4") {
val ANDROID = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version"
val CORE = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version"
val TEST = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version"

View File

@ -14,7 +14,7 @@ android {
consumerProguardFiles 'consumer-rules.pro'
}
kotlinOptions {
freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8

View File

@ -10,6 +10,8 @@ import java.io.PrintWriter
import java.io.StringWriter
import kotlin.coroutines.coroutineContext
// There are deprecations with the use of BroadcastChannel
@OptIn(ObsoleteCoroutinesApi::class)
class Feedback(capacity: Int = 256) {
lateinit var scope: CoroutineScope
private set