azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle] Use ProjectLayout in KotlinMetadataLibraryDirectories

Browse Source 
^KT-49933
This commit is contained in:
Anton Lakotka
2023-01-17 20:18:05 +01:00
committed by Space Team
parent 20a94b80be
commit c03e0f96d2
5 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmMetadataBinaryDependencyResolver.kt
+1 -1
View File
@@ -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) }
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeTransformedMetadataDependencyResolver.kt
+1 -1
View File
@@ -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()
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMetadataLibraryDirectories.kt
+6 -7
View File
@@ -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)
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/transformMetadataLibraries.kt
+1 -1
View File
@@ -27,7 +27,7 @@ internal fun Project.transformMetadataLibrariesForIde(
}
is ArtifactMetadataProvider -> transformMetadataLibrariesForIde(
kotlinTransformedMetadataLibraryDirectoryForIde, resolution, metadataProvider
layout.kotlinTransformedMetadataLibraryDirectoryForIde, resolution, metadataProvider
)
}
}
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CInteropMetadataDependencyTransformationTask.kt
+2 -2
View File
@@ -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 = */