From c03e0f96d2c3fe68913575a5382eb7c493ddc378 Mon Sep 17 00:00:00 2001 From: Anton Lakotka Date: Tue, 17 Jan 2023 20:18:05 +0100 Subject: [PATCH] [Gradle] Use ProjectLayout in KotlinMetadataLibraryDirectories ^KT-49933 --- .../idea/IdeaKpmMetadataBinaryDependencyResolver.kt | 2 +- .../IdeTransformedMetadataDependencyResolver.kt | 2 +- .../plugin/mpp/KotlinMetadataLibraryDirectories.kt | 13 ++++++------- .../gradle/plugin/mpp/transformMetadataLibraries.kt | 2 +- .../CInteropMetadataDependencyTransformationTask.kt | 4 ++-- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmMetadataBinaryDependencyResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmMetadataBinaryDependencyResolver.kt index 006169e8d79..6b2bb53cc69 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmMetadataBinaryDependencyResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmMetadataBinaryDependencyResolver.kt @@ -44,7 +44,7 @@ internal class IdeaKpmMetadataBinaryDependencyResolver( val sourceSetContent = artifactContent.findSourceSet(visibleFragmentName) ?: return@mapNotNull null val metadataBinary = sourceSetContent.metadataBinary ?: return@mapNotNull null - val libraryFile = fragment.project.kotlinTransformedMetadataLibraryDirectoryForIde + val libraryFile = fragment.project.layout.kotlinTransformedMetadataLibraryDirectoryForIde .resolve(metadataBinary.relativeFile) .apply { if (!isFile) metadataBinary.copyTo(this) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeTransformedMetadataDependencyResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeTransformedMetadataDependencyResolver.kt index 0ad00f3c199..9b504b0215d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeTransformedMetadataDependencyResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeTransformedMetadataDependencyResolver.kt @@ -30,7 +30,7 @@ internal object IdeTransformedMetadataDependencyResolver : IdeDependencyResolver val sourceSetContent = artifactContent.findSourceSet(visibleSourceSet) ?: return@mapNotNull null val sourceSetMetadataBinary = sourceSetContent.metadataBinary ?: return@mapNotNull null - val metadataLibraryOutputFile = sourceSet.internal.project.kotlinTransformedMetadataLibraryDirectoryForIde + val metadataLibraryOutputFile = sourceSet.internal.project.layout.kotlinTransformedMetadataLibraryDirectoryForIde .resolve(sourceSetMetadataBinary.relativeFile) metadataLibraryOutputFile.parentFile.mkdirs() diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMetadataLibraryDirectories.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMetadataLibraryDirectories.kt index 483f800afec..44de109442b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMetadataLibraryDirectories.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMetadataLibraryDirectories.kt @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.gradle.plugin.mpp -import org.gradle.api.Project import org.gradle.api.file.ProjectLayout import java.io.File @@ -15,11 +14,11 @@ private const val kotlinTransformedCInteropMetadataLibraries = "kotlinTransforme internal fun ProjectLayout.kotlinTransformedMetadataLibraryDirectoryForBuild(sourceSetName: String): File = buildDirectory.get().asFile.resolve(kotlinTransformedMetadataLibraries).resolve(sourceSetName) -internal val Project.kotlinTransformedMetadataLibraryDirectoryForIde: File - get() = rootDir.resolve(".gradle").resolve("kotlin").resolve(kotlinTransformedMetadataLibraries) +internal val ProjectLayout.kotlinTransformedMetadataLibraryDirectoryForIde: File + get() = projectDirectory.asFile.resolve(".gradle").resolve("kotlin").resolve(kotlinTransformedMetadataLibraries) -internal fun Project.kotlinTransformedCInteropMetadataLibraryDirectoryForBuild(sourceSetName: String): File = - buildDir.resolve(kotlinTransformedCInteropMetadataLibraries).resolve(sourceSetName) +internal fun ProjectLayout.kotlinTransformedCInteropMetadataLibraryDirectoryForBuild(sourceSetName: String): File = + buildDirectory.get().asFile.resolve(kotlinTransformedCInteropMetadataLibraries).resolve(sourceSetName) -internal val Project.kotlinTransformedCInteropMetadataLibraryDirectoryForIde: File - get() = rootDir.resolve(".gradle").resolve("kotlin").resolve(kotlinTransformedCInteropMetadataLibraries) +internal val ProjectLayout.kotlinTransformedCInteropMetadataLibraryDirectoryForIde: File + get() = projectDirectory.asFile.resolve(".gradle").resolve("kotlin").resolve(kotlinTransformedCInteropMetadataLibraries) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/transformMetadataLibraries.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/transformMetadataLibraries.kt index 4d77ca2070a..5452fcc387b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/transformMetadataLibraries.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/transformMetadataLibraries.kt @@ -27,7 +27,7 @@ internal fun Project.transformMetadataLibrariesForIde( } is ArtifactMetadataProvider -> transformMetadataLibrariesForIde( - kotlinTransformedMetadataLibraryDirectoryForIde, resolution, metadataProvider + layout.kotlinTransformedMetadataLibraryDirectoryForIde, resolution, metadataProvider ) } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CInteropMetadataDependencyTransformationTask.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CInteropMetadataDependencyTransformationTask.kt index 4306ae6261d..5a73f9391fa 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CInteropMetadataDependencyTransformationTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CInteropMetadataDependencyTransformationTask.kt @@ -54,7 +54,7 @@ internal fun Project.locateOrRegisterCInteropMetadataDependencyTransformationTas args = listOf( sourceSet, /* outputDirectory = */ - project.kotlinTransformedCInteropMetadataLibraryDirectoryForBuild(sourceSet.name), + project.layout.kotlinTransformedCInteropMetadataLibraryDirectoryForBuild(sourceSet.name), /* outputLibraryFilesDiscovery = */ CInteropMetadataDependencyTransformationTask.OutputLibraryFilesDiscovery.ScanOutputDirectory, /* cleaning = */ @@ -82,7 +82,7 @@ internal fun Project.locateOrRegisterCInteropMetadataDependencyTransformationTas args = listOf( sourceSet, /* outputDirectory = */ - project.kotlinTransformedCInteropMetadataLibraryDirectoryForIde, + project.layout.kotlinTransformedCInteropMetadataLibraryDirectoryForIde, /* outputLibraryFilesDiscovery = */ CInteropMetadataDependencyTransformationTask.OutputLibraryFilesDiscovery.Precise, /* cleaning = */