Merge pull request #420 from DataDog/yl/kcp/upgradle-kotlin-compiler-to-2-1-21

RUM-11262: Upgrade Kotlin Version to 2.1.21 to remove metadata check error

Author: ambushwork

buildSrc/build.gradle.kts

@@ -30,7 +30,7 @@ repositories {
 dependencies {
 
     // Dependencies used to configure the gradle plugins
-    implementation(embeddedKotlin("gradle-plugin"))
+    implementation(libs.kotlinPluginGradle)
     implementation(libs.androidToolsPluginGradle)
     implementation(libs.versionsPluginGradle)
     implementation(libs.fuzzyWuzzy)

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

@@ -81,8 +81,8 @@ dependencies {
 
     // Compile-only dependencies
     compileOnly(libs.androidToolsPluginGradle) // for auto-wiring into Android projects
-    compileOnly(libs.kotlinPluginGradle)
     compileOnly(libs.kotlinCompilerEmbeddable)
+    compileOnly(libs.kotlinPluginGradle)
     compileOnly(kotlin20.output)
     compileOnly(kotlin21.output)
     compileOnly(kotlin22.output)
@@ -201,10 +201,3 @@ listOf(
 tasks.named("test") {
     dependsOn("testKotlin20", "testKotlin21", "testKotlin22")
 }
-
-// TODO RUM-11262: Currently we rely on the `-Xskip-metadata-version-check` compiler option to avoid compilation errors.
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-    kotlinOptions {
-        freeCompilerArgs += "-Xskip-metadata-version-check"
-    }
-}

dd-sdk-android-gradle-plugin/transitiveDependencies

@@ -4,7 +4,7 @@ com.squareup.okhttp3:okhttp:4.12.0                              :  771 Kb
 com.squareup.okio:okio-jvm:3.6.0                                :  351 Kb
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10                  :  959 b 
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10                  :  965 b 
-org.jetbrains.kotlin:kotlin-stdlib:2.0.21                       : 1706 Kb
+org.jetbrains.kotlin:kotlin-stdlib:2.1.21                       : 1683 Kb
 org.jetbrains:annotations:13.0                                  :   17 Kb
 org.json:json:20231013                                          :   72 Kb
 

gradle/libs.versions.toml

@@ -1,8 +1,8 @@
 [versions]
 
 # Commons
-kotlin = "2.0.21"
-kotlinComposePlugin = "2.0.21"
+kotlin = "2.1.21"
+kotlinComposePlugin = "2.1.21"
 json = "20231013"
 okHttp = "4.12.0"
 composeBom = "2024.04.01"