diff --git a/build.gradle b/build.gradle index fed48cbcaedf..583733191359 100644 --- a/build.gradle +++ b/build.gradle @@ -4,6 +4,18 @@ import com.automattic.android.measure.reporters.SlowSlowTasksMetricsReporter import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.tasks.KotlinCompile +buildscript { + dependencies { + // TODO: Remove once dependency-analysis-gradle-plugin isolates its kotlin-metadata-jvm + // dependency onto its own worker classpath, making this override moot (see PR below). + // Interim workaround, endorsed by the plugin author, for reading Kotlin metadata newer + // than DAGP's own bundled reader supports. Tracks this project's own Kotlin version. + // https://github.com/autonomousapps/dependency-analysis-gradle-plugin/issues/1661 + // https://github.com/autonomousapps/dependency-analysis-gradle-plugin/pull/1719 + classpath(libs.kotlin.metadata.jvm) + } +} + plugins { alias(libs.plugins.detekt) alias(libs.plugins.automattic.measure.builds) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7a76e1cd5eec..a46626fe87e5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -239,6 +239,7 @@ jsoup = { group = "org.jsoup", name = "jsoup", version.ref = "jsoup" } junit = { group = "junit", name = "junit", version.ref = "junit" } kotlin-compile-testing-ksp = { group = "com.github.tschuchortdev", name = "kotlin-compile-testing-ksp", version.ref = "kotlin-compile-testing" } kotlin-compile-testing-main = { group = "com.github.tschuchortdev", name = "kotlin-compile-testing", version.ref = "kotlin-compile-testing" } +kotlin-metadata-jvm = { group = "org.jetbrains.kotlin", name = "kotlin-metadata-jvm", version.ref = "kotlin-main" } kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin-main" } kotlin-test-junit = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit", version.ref = "kotlin-main" } kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinx-coroutines" }