diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index e6e3d3a957..b67406c0ad 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -45,8 +45,9 @@ dependencies { implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.0") implementation("net.ltgt.gradle:gradle-errorprone-plugin:3.0.1") implementation("net.ltgt.gradle:gradle-nullaway-plugin:1.5.0") - implementation("ru.vyarus:gradle-animalsniffer-plugin:1.7.0") + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20") implementation("org.owasp:dependency-check-gradle:8.2.1") + implementation("ru.vyarus:gradle-animalsniffer-plugin:1.7.0") } // We can't apply conventions to this build so include important ones such as the Java compilation diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-extension-kotlin.txt b/docs/apidiffs/current_vs_latest/opentelemetry-extension-kotlin.txt index df26146497..79c1f8fe85 100644 --- a/docs/apidiffs/current_vs_latest/opentelemetry-extension-kotlin.txt +++ b/docs/apidiffs/current_vs_latest/opentelemetry-extension-kotlin.txt @@ -1,2 +1,9 @@ Comparing source compatibility of against -No changes. \ No newline at end of file +=== UNCHANGED CLASS: PUBLIC FINAL io.opentelemetry.extension.kotlin.ContextExtensionsKt (not serializable) + === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 + *** MODIFIED ANNOTATION: kotlin.Metadata + === UNCHANGED ELEMENT: xi=48 + *** MODIFIED ELEMENT: mv=1,8,0 (<- 1,6,0) + === UNCHANGED ELEMENT: k=2 + === UNCHANGED ELEMENT: d1=�� � ��� ��� ��� ���� ����0�*�0�� ����0�*�0�� ����0�*�0�¨�� + === UNCHANGED ELEMENT: d2=asContextElement,Lkotlin/coroutines/CoroutineContext;,Lio/opentelemetry/context/Context;,Lio/opentelemetry/context/ImplicitContextKeyed;,getOpenTelemetryContext,opentelemetry-extension-kotlin diff --git a/settings.gradle.kts b/settings.gradle.kts index 5951d4cc89..31e07d487b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -4,7 +4,6 @@ pluginManagement { id("com.github.johnrengelman.shadow") version "8.1.1" id("com.gradle.enterprise") version "3.12.6" id("io.github.gradle-nexus.publish-plugin") version "1.3.0" - id("org.jetbrains.kotlin.jvm") version "1.8.20" id("org.graalvm.buildtools.native") version "0.9.20" } }