Skip to content

Commit a849327

Browse files
authored
Update min kotlin version to 1.8 (#7155)
1 parent 00b61a2 commit a849327

File tree

3 files changed

+16
-7
lines changed

3 files changed

+16
-7
lines changed

VERSIONING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ respect to semantic versioning.
7373
|----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
7474
| Java | 8+ | All artifacts, unless otherwise noted | Changing requires major version bump. |
7575
| Android | 23+ (NOTE: [desugaring](https://developer.android.com/studio/write/java8-support#library-desugaring) is required. We stay up to date with the latest version of [desugar_jdk_libs](https://github.com/google/desugar_jdk_libs).) | Artifacts using `otel.animalsniffer-conventions` plugin | Kept in sync with minimum requirements for [Google Play services](https://developers.google.com/android/guides/setup). Subject to change in minor version. |
76-
| Kotlin | 1.6+ | Only applies to `opentelemetry-extension-kotlin` | Kept in sync with [minimum non-deprecated](https://kotlinlang.org/docs/gradle-compiler-options.html#attributes-common-to-jvm-and-js) version. Subject to change in minor versions. |
76+
| Kotlin | 1.8+ | Only applies to `opentelemetry-extension-kotlin` | Kept in sync with [minimum non-deprecated](https://kotlinlang.org/docs/gradle-compiler-options.html#attributes-common-to-jvm-and-js) version. Subject to change in minor versions. |
7777

7878
## API vs SDK
7979

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,9 @@
11
Comparing source compatibility of opentelemetry-extension-kotlin-1.50.0-SNAPSHOT.jar against opentelemetry-extension-kotlin-1.49.0.jar
2-
No changes.
2+
=== UNCHANGED CLASS: PUBLIC FINAL io.opentelemetry.extension.kotlin.ContextExtensionsKt (not serializable)
3+
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
4+
*** MODIFIED ANNOTATION: kotlin.Metadata
5+
=== UNCHANGED ELEMENT: xi=48
6+
*** MODIFIED ELEMENT: mv=2,1,0 (<- 1,6,0)
7+
=== UNCHANGED ELEMENT: k=2
8+
=== UNCHANGED ELEMENT: d1=��&#xA;�&#xA;���&#xA;���&#xA;���&#xA;����&#xA;����0�*�0��&#xA;����0�*�0��&#xA;����0�*�0�¨��
9+
=== UNCHANGED ELEMENT: d2=asContextElement,Lkotlin/coroutines/CoroutineContext;,Lio/opentelemetry/context/Context;,Lio/opentelemetry/context/ImplicitContextKeyed;,getOpenTelemetryContext,opentelemetry-extension-kotlin

extensions/kotlin/build.gradle.kts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2+
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
3+
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
24

35
plugins {
46
id("otel.java-conventions")
@@ -45,10 +47,10 @@ testing {
4547
}
4648

4749
tasks {
48-
withType(KotlinCompile::class) {
49-
kotlinOptions {
50-
jvmTarget = "1.8"
51-
languageVersion = "1.6"
50+
withType(KotlinJvmCompile::class) {
51+
compilerOptions {
52+
jvmTarget.set(JvmTarget.JVM_1_8)
53+
apiVersion.set(KotlinVersion.KOTLIN_1_8)
5254
}
5355
}
5456

0 commit comments

Comments
 (0)