Skip to content

Commit

Permalink
Bump kotlin to v1.9.20 (#362)
Browse files Browse the repository at this point in the history
* Bump kotlin to v1.9.20

* Fix compiler warnings

* Try again at fixing expect-actual warning

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Erik Christensen <40830816+erikc5000@users.noreply.github.com>
  • Loading branch information
renovate[bot] and erikc5000 authored Nov 1, 2023
1 parent cd3ea7e commit d734e6d
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
15 changes: 11 additions & 4 deletions buildSrc/src/main/kotlin/base-convention.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,28 @@ import org.gradle.api.tasks.testing.AbstractTestTask
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
import org.gradle.api.tasks.testing.logging.TestLogEvent
import org.gradle.kotlin.dsl.withType
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask

tasks.withType<JavaCompile>().configureEach {
sourceCompatibility = JavaVersion.VERSION_11.toString()
targetCompatibility = JavaVersion.VERSION_11.toString()
}

tasks.withType<KotlinCompile>().configureEach {
tasks.withType<KotlinJvmCompile>().configureEach {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_11)
jvmTarget = JvmTarget.JVM_11
}
}

tasks.withType(AbstractTestTask::class).configureEach {
tasks.withType<KotlinCompilationTask<*>>().configureEach {
compilerOptions {
freeCompilerArgs.add("-Xexpect-actual-classes")
}
}

tasks.withType<AbstractTestTask>().configureEach {
testLogging {
events = setOf(TestLogEvent.FAILED)
exceptionFormat = TestExceptionFormat.FULL
Expand Down
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ releaseRepositoryUrl=https://oss.sonatype.org/service/local/staging/deploy/maven

kotlin.code.style=official
kotlin.mpp.stability.nowarn=true
kotlin.mpp.applyDefaultHierarchyTemplate=false

android.useAndroidX=true

Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
kotlin = "1.9.10"
kotlin = "1.9.20"
dokka = "1.9.10"
serialization = "1.6.0"
atomicfu = "0.22.0"
Expand Down

0 comments on commit d734e6d

Please sign in to comment.