Skip to content

Commit ba2aaf1

Browse files
authored
Fix a configuration cache issue (#6073)
1 parent 66a1be0 commit ba2aaf1

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

build-logic/src/main/kotlin/Publishing.kt

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import kotlinx.coroutines.runBlocking
88
import net.mbonnin.vespene.lib.NexusStagingClient
99
import org.gradle.api.Project
1010
import org.gradle.api.attributes.Usage
11+
import org.gradle.api.internal.file.FileOperations
1112
import org.gradle.api.plugins.ExtraPropertiesExtension
1213
import org.gradle.api.plugins.JavaPluginExtension
1314
import org.gradle.api.publish.PublishingExtension
@@ -18,6 +19,7 @@ import org.gradle.api.tasks.TaskProvider
1819
import org.gradle.api.tasks.bundling.Jar
1920
import org.gradle.plugins.signing.Sign
2021
import org.gradle.plugins.signing.SigningExtension
22+
import javax.inject.Inject
2123

2224
fun Project.configurePublishing(isAggregateKdoc: Boolean = false) {
2325
apply {
@@ -122,8 +124,15 @@ fun Project.configureDokkaAggregate() {
122124
dependencies.add(project.dependencies.create("${coordinate.module}:${coordinate.version}:javadoc"))
123125
}
124126

127+
val fileOperations = objects.newInstance(FileOperationsHolder::class.java).fileOperations
128+
125129
tasks.register("extractApolloKdocVersion_$versionString", Copy::class.java) {
126-
from(configuration.elements.map { it.map { zipTree(it) } })
130+
131+
from(configuration.elements.map {
132+
it.map {
133+
fileOperations.zipTree(it)
134+
}
135+
})
127136
into(layout.buildDirectory.dir("kdoc-versions/${coordinate.version}"))
128137
}
129138
}
@@ -154,6 +163,8 @@ fun Project.configureDokkaAggregate() {
154163
}
155164
}
156165

166+
private abstract class FileOperationsHolder @Inject constructor(val fileOperations: FileOperations)
167+
157168
private fun Project.getOssStagingUrl(): String {
158169
val url = try {
159170
this.extensions.extraProperties["ossStagingUrl"] as String?

0 commit comments

Comments
 (0)