Skip to content

Commit b1f8edd

Browse files
authored
Bump Kotlin compatibility version for SAGP (#935)
This sets it to 1.8
1 parent e2e1597 commit b1f8edd

File tree

6 files changed

+14
-46
lines changed

6 files changed

+14
-46
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
### Breaking Changes
1010

1111
- Drop support for Android Gradle Plugin 7.3.X and below. To continue to use 7.3.X and below use Sentry Android Gradle Plugin 5.7.0. ([#911](https://github.com/getsentry/sentry-android-gradle-plugin/pull/911))
12+
- Minimum supported Kotlin language version is now 1.8 ([#935](https://github.com/getsentry/sentry-android-gradle-plugin/pull/935))
1213

1314
### Internal
1415

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
1818
kotlinSpring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" }
1919
kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
2020
ksp = { id = "com.google.devtools.ksp", version = "1.8.20-1.0.11" }
21-
dokka = { id = "org.jetbrains.dokka", version = "1.8.10" }
21+
dokka = { id = "org.jetbrains.dokka", version = "1.9.20" }
2222
spotless = { id = "com.diffplug.spotless", version = "7.0.4" }
2323
groovyGradlePlugin = { id = "dev.gradleplugins.groovy-gradle-plugin", version = "1.7.1" }
2424
mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.27.0" }
@@ -42,7 +42,7 @@ kotlinCompilerEmbeddable = { group = "org.jetbrains.kotlin", name = "kotlin-comp
4242
autoService = { group = "com.google.auto.service", name = "auto-service", version = "1.0.1" }
4343
autoServiceAnnotatons = { group = "com.google.auto.service", name = "auto-service-annotations", version = "1.0.1" }
4444
kotlinJunit = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit", version.ref = "kotlin" }
45-
kotlinCompileTesting = { group = "dev.zacsweers.kctfork", name = "core", version = "0.7.0" }
45+
kotlinCompileTesting = { group = "dev.zacsweers.kctfork", name = "core", version = "0.7.1" }
4646
truth = { module = "com.google.truth:truth", version = "1.4.4" }
4747
composeDesktop = { group = "org.jetbrains.compose.desktop", name = "desktop", version = "1.6.10" }
4848

plugin-build/build.gradle.kts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ dependencies {
6363
testImplementation(libs.zip4j)
6464
}
6565

66-
configure<JavaPluginExtension> {
66+
java {
6767
sourceCompatibility = JavaVersion.VERSION_11
6868
targetCompatibility = JavaVersion.VERSION_11
6969
}
@@ -89,9 +89,8 @@ tasks.withType<KotlinCompile>().configureEach {
8989

9090
kotlinOptions {
9191
jvmTarget = JavaVersion.VERSION_11.toString()
92-
freeCompilerArgs = listOf("-Xopt-in=kotlin.RequiresOptIn", "-Xjvm-default=enable")
93-
languageVersion = "1.4"
94-
apiVersion = "1.4"
92+
languageVersion = "1.8"
93+
apiVersion = "1.8"
9594
}
9695
}
9796

plugin-build/common/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

plugin-build/common/build.gradle.kts

Lines changed: 0 additions & 31 deletions
This file was deleted.

sentry-kotlin-compiler-plugin/build.gradle.kts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import org.gradle.kotlin.dsl.withType
2-
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
2+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
3+
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
34

45
plugins {
56
alias(libs.plugins.kotlin) version "2.1.0"
@@ -79,12 +80,11 @@ tasks.withType<Jar>().configureEach {
7980

8081
// see
8182
// https://youtrack.jetbrains.com/issue/KTIJ-24311/task-current-target-is-17-and-kaptGenerateStubsProductionDebugKotlin-task-current-target-is-1.8-jvm-target-compatibility-should
82-
kotlin { jvmToolchain(11) }
83-
84-
tasks.withType<KotlinCompile>().configureEach {
85-
kotlinOptions {
86-
jvmTarget = JavaVersion.VERSION_11.toString()
87-
languageVersion = "1.9"
88-
apiVersion = "1.9"
83+
kotlin {
84+
jvmToolchain(11)
85+
compilerOptions {
86+
jvmTarget.set(JvmTarget.JVM_11)
87+
languageVersion.set(KotlinVersion.KOTLIN_1_9)
88+
apiVersion.set(KotlinVersion.KOTLIN_1_9)
8989
}
9090
}

0 commit comments

Comments
 (0)