RUM-18937: Split Kotlin version for the buildscript classpath and for the runtime classpath

LICENSE-3rdparty.csv

@@ -140,6 +140,7 @@ import(test),com.jakewharton.android.repackaged,Apache-2.0,"Copyright (C) 2007 T
 import(test),com.parse.bolts,"BSD License","Copyright (c) Facebook, Inc. and its affiliates."
 import(test),com.squareup,Apache-2.0,"Copyright 2015 Square, Inc."
 import(test),dev.drewhamilton.poko,Apache-2.0,Copyright 2020-Present Drew Hamilton
+import(test),dev.zacsweers.kctfork,MPL-2.0,"Copyright (C) 2023 Thilo Schuchort"
 import(test),greatest,ICT,"Copyright (c) 2011-2018 Scott Vokes <vokes.s@gmail.com>"
 import(test),io.github.davidburstrom.contester,Apache-2.0,"Copyright 2022-2024 David Burström"
 import(test),io.github.detekt.sarif4k,Apache-2.0,"Copyright 2021 Artur Bosch & Contributors"
@@ -185,7 +186,6 @@ build,com.fasterxml.jackson.dataformat,Apache-2.,"Copyright (c) 2007- Tatu Salor
 build,com.fasterxml.jackson.module,Apache-2.0,"Copyright (c) 2007- Tatu Saloranta"
 build,com.fasterxml.woodstox,Apache-2.0,"Copyright (c) 2007- Tatu Saloranta"
 build,com.github.ajalt.clikt,Apache-2.0,"Copyright clikt authors"
-build,com.github.tschuchortdev,MPL-2.0,"Copyright (C) 2023 Thilo Schuchort"
 build,com.google.android,Apache-2.0,Copyright (C) 2013 The Android Open Source Project
 build,com.google.api.grpc,Apache-2.0,Copyright 2020 Google LLC
 build,com.google.auto,Apache-2.0,"Copyright 2014 Google LLC"

build-logic/src/main/kotlin/com/datadog/gradle/config/KotlinConfig.kt

@@ -13,15 +13,17 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 internal fun Project.kotlinConfig(
     evaluateWarningsAsErrors: Boolean = true,
-    jvmBytecodeTarget: JvmTarget = JvmTarget.JVM_17
+    jvmBytecodeTarget: JvmTarget = JvmTarget.JVM_17,
+    kotlinApiVersion: KotlinVersion = KotlinVersion.KOTLIN_2_0,
+    kotlinLanguageVersion: KotlinVersion = KotlinVersion.KOTLIN_2_0
 ) {
     taskConfig<KotlinJvmCompile> {
         compilerOptions {
             jvmTarget.set(jvmBytecodeTarget)
             val isCI = System.getenv("CI").toBoolean()
             allWarningsAsErrors.set(evaluateWarningsAsErrors && isCI)
-            apiVersion.set(KotlinVersion.KOTLIN_2_0)
-            languageVersion.set(KotlinVersion.KOTLIN_2_0)
+            apiVersion.set(kotlinApiVersion)
+            languageVersion.set(kotlinLanguageVersion)
         }
     }
 }

build-logic/src/main/kotlin/com/datadog/gradle/plugin/apisurface/ApiSurfacePlugin.kt

@@ -101,7 +101,7 @@ class ApiSurfacePlugin : Plugin<Project> {
     private fun Project.createParserConfiguration(): Configuration {
         val kotlinVersion = extensions.getByType<VersionCatalogsExtension>()
             .named("libs")
-            .findVersion("kotlin")
+            .findVersion("kotlinBuildscript")
             .orElseThrow { IllegalStateException("No `kotlin` version found in the version catalog") }
         return configurations.create(CONFIGURATION_PARSER) {
             isCanBeConsumed = false

build-logic/src/main/kotlin/com/datadog/gradle/plugin/config/DatadogBuildExtension.kt

@@ -13,6 +13,7 @@ import com.datadog.gradle.config.kotlinConfig
 import com.datadog.gradle.config.publishingConfig
 import org.gradle.api.Project
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 import javax.inject.Inject
 
 /**
@@ -29,9 +30,11 @@ abstract class DatadogBuildExtension @Inject constructor(
     /** Aligns Kotlin compilation: bytecode target, API/language version and warning strictness. */
     fun applyKotlinConfig(
         evaluateWarningsAsErrors: Boolean = true,
-        jvmBytecodeTarget: JvmTarget = JvmTarget.JVM_17
+        jvmBytecodeTarget: JvmTarget = JvmTarget.JVM_17,
+        kotlinApiVersion: KotlinVersion = KotlinVersion.KOTLIN_2_0,
+        kotlinLanguageVersion: KotlinVersion = KotlinVersion.KOTLIN_2_0
     ) {
-        project.kotlinConfig(evaluateWarningsAsErrors, jvmBytecodeTarget)
+        project.kotlinConfig(evaluateWarningsAsErrors, jvmBytecodeTarget, kotlinApiVersion, kotlinLanguageVersion)
     }
 
     /** Applies the shared `com.android.library` setup: SDK levels, source sets, lint and packaging. */

dd-sdk-android-core/build.gradle.kts

@@ -111,7 +111,7 @@ android {
 }
 
 dependencies {
-    implementation(libs.kotlin)
+    implementation(libs.kotlinRuntime)
 
     // Network
     implementation(libs.okHttp)
@@ -144,7 +144,7 @@ dependencies {
     unmock(libs.robolectric)
 
     // Test Fixtures
-    testFixturesImplementation(libs.kotlin)
+    testFixturesImplementation(libs.kotlinRuntime)
     testFixturesImplementation(libs.bundles.jUnit5)
     testFixturesImplementation(libs.okHttp)
     testFixturesImplementation(libs.bundles.testTools)

dd-sdk-android-internal/build.gradle.kts

@@ -52,7 +52,7 @@ android {
 }
 
 dependencies {
-    implementation(libs.kotlin)
+    implementation(libs.kotlinRuntime)
     implementation(libs.androidXAnnotation)
 
     // Generate NoOp implementations
@@ -65,7 +65,7 @@ dependencies {
             )
         }
     }
-    testFixturesImplementation(libs.kotlin)
+    testFixturesImplementation(libs.kotlinRuntime)
     testFixturesImplementation(libs.bundles.jUnit5)
     testFixturesImplementation(libs.bundles.testTools)
     testFixturesImplementation(project(":tools:unit")) {

features/dd-sdk-android-flags-openfeature/build.gradle.kts

@@ -52,7 +52,7 @@ dependencies {
     // OpenFeature SDK
     api(libs.openFeatureKotlinSdk)
 
-    implementation(libs.kotlin)
+    implementation(libs.kotlinRuntime)
     implementation(libs.coroutinesCore)
     implementation(libs.androidXAnnotation)
 

features/dd-sdk-android-flags/build.gradle.kts

@@ -56,7 +56,7 @@ dependencies {
     implementation(project(":dd-sdk-android-internal"))
 
     implementation(libs.gson)
-    implementation(libs.kotlin)
+    implementation(libs.kotlinRuntime)
     implementation(libs.okHttp)
     implementation(libs.androidXAnnotation)
     implementation(libs.androidXCollection)

features/dd-sdk-android-logs/build.gradle.kts

@@ -54,7 +54,7 @@ android {
 dependencies {
     api(project(":dd-sdk-android-core"))
     implementation(project(":dd-sdk-android-internal"))
-    implementation(libs.kotlin)
+    implementation(libs.kotlinRuntime)
     implementation(libs.gson)
     implementation(libs.androidXAnnotation)
 

features/dd-sdk-android-ndk/build.gradle.kts

@@ -70,7 +70,7 @@ android {
 dependencies {
     implementation(project(":dd-sdk-android-internal"))
     api(project(":dd-sdk-android-core"))
-    implementation(libs.kotlin)
+    implementation(libs.kotlinRuntime)
     implementation(libs.okHttp)
 
     testImplementation(project(":tools:unit")) {

features/dd-sdk-android-profiling/build.gradle.kts

@@ -55,7 +55,7 @@ android {
 dependencies {
     api(project(":dd-sdk-android-core"))
     implementation(project(":dd-sdk-android-internal"))
-    implementation(libs.kotlin)
+    implementation(libs.kotlinRuntime)
     implementation(libs.androidXCore)
     implementation(libs.androidXCoreKtx)
     implementation(libs.gson)
@@ -78,7 +78,7 @@ dependencies {
     unmock(libs.robolectric)
 
     // Test Fixtures
-    testFixturesImplementation(libs.kotlin)
+    testFixturesImplementation(libs.kotlinRuntime)
     testFixturesImplementation(project(":dd-sdk-android-internal"))
     testFixturesImplementation(libs.androidXAnnotation)
 }

features/dd-sdk-android-rum-debug-widget/build.gradle.kts

@@ -46,7 +46,7 @@ android {
 dependencies {
     implementation(project(":dd-sdk-android-internal"))
     implementation(project(":features:dd-sdk-android-rum"))
-    implementation(libs.kotlin)
+    implementation(libs.kotlinRuntime)
 
     // Android Instrumentation
     implementation(libs.androidXFragment)

features/dd-sdk-android-rum-internal/build.gradle.kts

@@ -44,7 +44,7 @@ android {
 dependencies {
     implementation(project(":dd-sdk-android-core"))
     implementation(project(":dd-sdk-android-internal"))
-    implementation(libs.kotlin)
+    implementation(libs.kotlinRuntime)
 
     testImplementation(project(":tools:unit")) {
         attributes {

features/dd-sdk-android-rum-prelaunch/build.gradle.kts

@@ -43,7 +43,7 @@ android {
 
 dependencies {
     implementation(project(":features:dd-sdk-android-rum-internal"))
-    implementation(libs.kotlin)
+    implementation(libs.kotlinRuntime)
 
     testImplementation(project(":tools:unit")) {
         attributes {

features/dd-sdk-android-rum/build.gradle.kts

@@ -64,7 +64,7 @@ dependencies {
     api(project(":dd-sdk-android-core"))
     implementation(project(":dd-sdk-android-internal"))
     implementation(project(":features:dd-sdk-android-rum-internal"))
-    implementation(libs.kotlin)
+    implementation(libs.kotlinRuntime)
     implementation(libs.gson)
     implementation(libs.okHttp)
 
@@ -105,7 +105,7 @@ dependencies {
             )
         }
     }
-    testFixturesImplementation(libs.kotlin)
+    testFixturesImplementation(libs.kotlinRuntime)
     testFixturesImplementation(libs.bundles.jUnit5)
     testFixturesImplementation(libs.okHttp)
     testFixturesImplementation(libs.bundles.testTools)

features/dd-sdk-android-session-replay-compose/build.gradle.kts

@@ -56,7 +56,7 @@ android {
 dependencies {
     api(project(":features:dd-sdk-android-session-replay"))
     implementation(project(":dd-sdk-android-internal"))
-    implementation(libs.kotlin)
+    implementation(libs.kotlinRuntime)
     implementation(libs.gson)
 
     implementation(platform(libs.androidXComposeBom))

features/dd-sdk-android-session-replay-material/build.gradle.kts

@@ -48,7 +48,7 @@ android {
 
 dependencies {
     api(project(":features:dd-sdk-android-session-replay"))
-    implementation(libs.kotlin)
+    implementation(libs.kotlinRuntime)
     implementation(libs.gson)
     implementation(libs.googleMaterial)
 

features/dd-sdk-android-session-replay/build.gradle.kts

@@ -56,7 +56,7 @@ dependencies {
     api(project(":dd-sdk-android-core"))
     implementation(project(":dd-sdk-android-internal"))
     implementation(libs.okHttp)
-    implementation(libs.kotlin)
+    implementation(libs.kotlinRuntime)
     implementation(libs.gson)
     implementation(libs.androidXAppCompat)
 

features/dd-sdk-android-trace-api/build.gradle.kts

@@ -47,7 +47,7 @@ android {
 dependencies {
     api(project(":dd-sdk-android-core"))
     implementation(project(":dd-sdk-android-internal"))
-    implementation(libs.kotlin)
+    implementation(libs.kotlinRuntime)
     implementation(libs.gson)
     implementation(libs.androidXAnnotation)
     implementation(libs.bundles.traceCore)

features/dd-sdk-android-trace-internal/build.gradle.kts

@@ -47,7 +47,7 @@ android {
 dependencies {
     api(project(":dd-sdk-android-core"))
     implementation(project(":dd-sdk-android-internal"))
-    implementation(libs.kotlin)
+    implementation(libs.kotlinRuntime)
     implementation(libs.gson)
     implementation(libs.androidXAnnotation)
     implementation(libs.bundles.traceCore)

features/dd-sdk-android-trace-otel/build.gradle.kts

@@ -57,7 +57,7 @@ android {
 
 dependencies {
     api(libs.openTelemetryApi)
-    implementation(libs.kotlin)
+    implementation(libs.kotlinRuntime)
     implementation(libs.androidXAnnotation)
 
     api(project(":dd-sdk-android-core"))

features/dd-sdk-android-trace/build.gradle.kts

@@ -59,7 +59,7 @@ dependencies {
     api(project(":features:dd-sdk-android-trace-api"))
     implementation(project(":dd-sdk-android-internal"))
     implementation(project(":features:dd-sdk-android-trace-internal"))
-    implementation(libs.kotlin)
+    implementation(libs.kotlinRuntime)
     implementation(libs.gson)
     implementation(libs.androidXAnnotation)
     implementation(libs.bundles.traceCore)
@@ -86,7 +86,7 @@ dependencies {
 
     // Test Fixtures
     testFixturesImplementation(libs.gson)
-    testFixturesImplementation(libs.kotlin)
+    testFixturesImplementation(libs.kotlinRuntime)
     testFixturesImplementation(libs.okHttp)
     testFixturesImplementation(libs.bundles.jUnit5)
     testFixturesImplementation(libs.bundles.testTools)

features/dd-sdk-android-webview/build.gradle.kts

@@ -47,7 +47,7 @@ android {
 dependencies {
     api(project(":dd-sdk-android-core"))
     implementation(project(":dd-sdk-android-internal"))
-    implementation(libs.kotlin)
+    implementation(libs.kotlinRuntime)
     implementation(libs.gson)
     implementation(libs.androidXAnnotation)
 

gradle/libs.versions.toml

@@ -4,17 +4,11 @@ apollo = "4.3.3"
 cronetApi = "143.7445.0"
 cronetPlayServices = "18.1.1"
 gson = "2.10.1"
-kotlin = "2.0.21"
-# Deliberately not `version.ref = "kotlin"`: this must match the Kotlin Gradle Plugin that is actually
-# loaded, which is AGP's. `androidToolsPlugin` (below) depends on KGP 2.2.10, and that outranks the
-# `kotlin` version above in conflict resolution (`kotlin-gradle-plugin:2.0.21 -> 2.2.10`).
-# The Compose *compiler* is always resolved at the loaded KGP's version and never at this one, so the
-# two drift apart silently. An older plugin against a newer compiler passes options the compiler has
-# since deprecated (RUM-18191, `generateFunctionKeyMetaClasses`), and the version also decides which
-# options are sent at all — 2.2.10 turns on `sourceInformation`, which changes generated Compose code.
-# Re-check this whenever `androidToolsPlugin` moves.
-composeCompilerPlugin = "2.2.10"
-kotlinSP = "2.0.21-1.0.28"
+# We have 2 different versions of Kotlin: one is for the buildscript classpath - Gradle Plugin,
+# Buildscript runtime dependency; another is for the SDK compile/runtime classpath.
+kotlinBuildscript = "2.2.10"
+kotlinRuntime = "2.0.21"
+kotlinSP = "2.2.10-2.0.2"
 kronosNTP = "0.0.1-alpha11"
 kotlinxSerialization = "1.6.3"
 okHttp = "4.12.0"
@@ -67,7 +61,7 @@ msgPackCore = "0.9.12"
 protobufJava = "4.35.0"
 sketchesJava = "0.8.3"
 kover = "0.9.8"
-kspTesting = "1.5.0"
+kspTesting = "0.8.0"
 
 # Tools
 detekt = "1.23.8"
@@ -81,7 +75,7 @@ androidLint = "31.0.2"
 nexusPublishGradlePlugin = "2.0.0"
 datadogPlugin = "1.31.0"
 
-kotlinPoet = "1.14.2"
+kotlinPoet = "2.2.0"
 jsonSchemaValidator = "1.14.6"
 binaryCompatibility = "0.18.1"
 dependencyLicense = "0.7.0"
@@ -122,7 +116,7 @@ material3Android = "1.1.2"
 # Gradle version catalog doesn't allow names to end with plugin, that is why strange names
 androidToolsGradlePluginApi = { module = "com.android.tools.build:gradle-api", version.ref = "androidToolsPlugin" }
 apolloRuntime = { module = "com.apollographql.apollo:apollo-runtime", version.ref = "apollo" }
-kotlinGradlePluginApi = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin-api", version.ref = "kotlin" }
+kotlinGradlePluginApi = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin-api", version.ref = "kotlinBuildscript" }
 dokkaGradlePlugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }
 detektGradlePlugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
 unmockGradlePlugin = { module = "com.github.bjoernq:unmockplugin", version.ref = "unmock" }
@@ -133,7 +127,8 @@ roomCompiler = { module = "androidx.room:room-compiler", version.ref = "room" }
 
 # Common
 
-kotlin = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
+kotlinRuntime = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlinRuntime" }
+kotlinBuildscript = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlinBuildscript" }
 kotlinxSerializationJson = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerialization" }
 
 okHttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okHttp" }
@@ -215,8 +210,8 @@ mockitoKotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "m
 msgPackCore = { module = "org.msgpack:msgpack-core", version.ref = "msgPackCore" }
 protobufJava = { module = "com.google.protobuf:protobuf-java", version.ref = "protobufJava" }
 sketchesJava = { module = "com.datadoghq:sketches-java", version.ref = "sketchesJava" }
-kotlinReflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
-kspTesting = { module = "com.github.tschuchortdev:kotlin-compile-testing-ksp", version.ref = "kspTesting" }
+kotlinReflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlinRuntime" }
+kspTesting = { module = "dev.zacsweers.kctfork:ksp", version.ref = "kspTesting" }
 androidLintTests = { module = "com.android.tools.lint:lint-tests", version.ref = "androidLint" }
 systemStubsJupiter = { module = "uk.org.webcompere:system-stubs-jupiter", version.ref = "systemStubsJupiter" }
 
@@ -232,7 +227,7 @@ androidLintChecks = { module = "com.android.tools.lint:lint-checks", version.ref
 kotlinPoet = { module = "com.squareup:kotlinpoet", version.ref = "kotlinPoet" }
 kotlinPoetKsp = { module = "com.squareup:kotlinpoet-ksp", version.ref = "kotlinPoet" }
 kotlinSP = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "kotlinSP" }
-kotlinCompilerEmbeddable = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlin" }
+kotlinCompilerEmbeddable = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlinBuildscript" }
 jsonSchemaValidator = { module = "com.github.erosb:everit-json-schema", version.ref = "jsonSchemaValidator" }
 kotlinXmlBuilder = { module = "org.redundent:kotlin-xml-builder", version.ref = "kotlinXmlBuilder" }
 
@@ -308,8 +303,7 @@ testTools = [
     "elmyrInject",
     "elmyrJUnit5",
     "elmyrJVM",
-    "mockitoKotlin",
-    "kotlinReflect"
+    "mockitoKotlin"
 ]
 
 androidXNavigation = [
@@ -386,16 +380,16 @@ traceCore = [
 [plugins]
 nexusPublishGradlePlugin = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexusPublishGradlePlugin" }
 datadogGradlePlugin = { id = "com.datadoghq.dd-sdk-android-gradle-plugin", version.ref = "datadogPlugin" }
-composeCompilerPlugin = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "composeCompilerPlugin" }
+composeCompilerPlugin = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlinBuildscript" }
 apolloPlugin = { id = "com.apollographql.apollo", version.ref = "apollo" }
 dependencyLicenseGradlePlugin = { id = "com.datadoghq.dependency-license", version.ref = "dependencyLicense" }
-kotlinAndroidPlugin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+kotlinAndroidPlugin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlinBuildscript" }
 androidLibraryPlugin = { id = "com.android.library", version.ref = "androidToolsPlugin" }
 kotlinSPGradlePlugin = { id = "com.google.devtools.ksp", version.ref = "kotlinSP" }
 dokkaGradlePlugin = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 sqlDelightGradlePlugin = { id = "com.squareup.sqldelight", version.ref = "sqlDelight" }
 binaryCompatibilityGradlePlugin = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binaryCompatibility" }
-kotlinxSerializationPlugin = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+kotlinxSerializationPlugin = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlinBuildscript" }
 koverPlugin = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" }
 ktlintGradlePlugin = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlintGradlePlugin" }
 detektGradlePlugin = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }