Skip to content

Commit 26fab16

Browse files
committed
RUM-11262: Upgrade Kotlin Version to 2.1.21 to remove metadata check error
1 parent 3dd9c5c commit 26fab16

File tree

4 files changed

+6
-12
lines changed

4 files changed

+6
-12
lines changed

buildSrc/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ repositories {
3030
dependencies {
3131

3232
// Dependencies used to configure the gradle plugins
33-
implementation(embeddedKotlin("gradle-plugin"))
33+
implementation(libs.kotlinPluginGradle)
3434
implementation(libs.androidToolsPluginGradle)
3535
implementation(libs.versionsPluginGradle)
3636
implementation(libs.fuzzyWuzzy)

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ dependencies {
8181

8282
// Compile-only dependencies
8383
compileOnly(libs.androidToolsPluginGradle) // for auto-wiring into Android projects
84-
compileOnly(libs.kotlinPluginGradle)
8584
compileOnly(libs.kotlinCompilerEmbeddable)
85+
compileOnly(libs.kotlinPluginGradle)
8686
compileOnly(kotlin20.output)
8787
compileOnly(kotlin21.output)
8888
compileOnly(kotlin22.output)
@@ -201,10 +201,3 @@ listOf(
201201
tasks.named("test") {
202202
dependsOn("testKotlin20", "testKotlin21", "testKotlin22")
203203
}
204-
205-
// TODO RUM-11262: Currently we rely on the `-Xskip-metadata-version-check` compiler option to avoid compilation errors.
206-
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
207-
kotlinOptions {
208-
freeCompilerArgs += "-Xskip-metadata-version-check"
209-
}
210-
}

dd-sdk-android-gradle-plugin/transitiveDependencies

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ com.squareup.okhttp3:okhttp:4.12.0 : 771 Kb
44
com.squareup.okio:okio-jvm:3.6.0 : 351 Kb
55
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10 : 959 b
66
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 : 965 b
7-
org.jetbrains.kotlin:kotlin-stdlib:2.0.21 : 1706 Kb
7+
org.jetbrains.kotlin:kotlin-stdlib:2.1.21 : 1683 Kb
88
org.jetbrains:annotations:13.0 : 17 Kb
99
org.json:json:20231013 : 72 Kb
1010

gradle/libs.versions.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[versions]
22

33
# Commons
4-
kotlin = "2.0.21"
5-
kotlinComposePlugin = "2.0.21"
4+
kotlin = "2.1.21"
5+
kotlinComposePlugin = "2.1.21"
66
json = "20231013"
77
okHttp = "4.12.0"
88
composeBom = "2024.04.01"
@@ -64,6 +64,7 @@ lifecycleRuntimeKtx = "2.8.7"
6464
# Gradle version catalog doesn't allow names to end with plugin, that is why strange names
6565
androidToolsPluginGradle = { module = "com.android.tools.build:gradle", version.ref = "androidToolsPlugin" }
6666
kotlinPluginGradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
67+
kotlinPluginGradleAPI = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin-api", version.ref = "kotlin" }
6768
dokkaPluginGradle = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }
6869
unmockPluginGradle = { module = "de.mobilej.unmock:UnMockPlugin", version.ref = "unmock" }
6970

0 commit comments

Comments
 (0)