From dd26073d12cc5b729e80da1694b76eca14560592 Mon Sep 17 00:00:00 2001 From: Inez Korczynski Date: Fri, 2 Jan 2026 10:42:00 -0800 Subject: [PATCH] Migrate from *MetadataConfigurationName to *ConfigurationName - Kotlin 2.3.x compatibility *MetadataConfigurationName were removed so switching to using the source set implementationConfigurationName (and similar) to read declared dependencies - which is the supported public API going forward. --- CHANGELOG.md | 3 +++ gradle.properties | 2 +- .../tooling/support/jvm/KotlinExtractorSupport.kt | 10 +++++----- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd89693..5d3f7c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ ## Unreleased +## v0.1.8 +- Migrate from `*MetadataConfigurationName` to `*ConfigurationName` - Kotlin 2.3.x compatibility + ## v0.1.7 - Align `affected-paths-core` version with a `tooling-support` that it uses diff --git a/gradle.properties b/gradle.properties index dd8bc80..67a3130 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 kotlin.code.style=official GROUP=com.squareup.affected.paths -VERSION_NAME=0.1.7 +VERSION_NAME=0.1.8 POM_URL=https://github.com/squareup/affected-paths POM_SCM_URL=https://github.com/squareup/affected-paths diff --git a/tooling/support/jvm/src/main/kotlin/com/squareup/tooling/support/jvm/KotlinExtractorSupport.kt b/tooling/support/jvm/src/main/kotlin/com/squareup/tooling/support/jvm/KotlinExtractorSupport.kt index 2ee84e7..6052e9c 100644 --- a/tooling/support/jvm/src/main/kotlin/com/squareup/tooling/support/jvm/KotlinExtractorSupport.kt +++ b/tooling/support/jvm/src/main/kotlin/com/squareup/tooling/support/jvm/KotlinExtractorSupport.kt @@ -34,8 +34,8 @@ internal fun KotlinSourceSet.extractSquareTestConfiguration( return SquareTestConfiguration( srcs = kotlin.sourceDirectories.map { it.toRelativeString(project.projectDir) }.toSet(), deps = project.configurations.extractDependencies( - implementationMetadataConfigurationName, - compileOnlyMetadataConfigurationName + implementationConfigurationName, + compileOnlyConfigurationName ).map { it.extractSquareDependency(project) }.toSet() ) } @@ -73,10 +73,10 @@ internal fun KotlinSourceSet.extractSquareVariantConfigurationParams( } val configNames = buildList { - add(implementationMetadataConfigurationName) - add(compileOnlyMetadataConfigurationName) + add(implementationConfigurationName) + add(compileOnlyConfigurationName) addAll( - project.configurations.getByName(implementationMetadataConfigurationName).extendsFrom + project.configurations.getByName(implementationConfigurationName).extendsFrom .orEmpty().map { it.name } ) }.toTypedArray()