Skip to content

Commit bf0d42a

Browse files
VampireVampire
committed
Properly share build outputs between projects
1 parent 7e4d21a commit bf0d42a

2 files changed

Lines changed: 107 additions & 23 deletions

File tree

‎gradle/build-logic/src/main/kotlin/net/kautler/ncc_packer.gradle.kts‎

Lines changed: 63 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -54,39 +54,80 @@ tasks.withType<IncrementalSyncTask>().configureEach {
5454
}
5555
}
5656

57+
// work-around for missing feature in dependencies block added in Gradle 8.3
58+
//val setupWsl by configurations.registering {
59+
val setupWslExecutable by configurations.creating {
60+
isCanBeConsumed = false
61+
isCanBeResolved = false
62+
isVisible = false
63+
}
64+
65+
val setupWslExecutableFile by configurations.registering {
66+
isCanBeConsumed = false
67+
isCanBeResolved = true
68+
isVisible = false
69+
extendsFrom(setupWslExecutable)
70+
}
71+
72+
dependencies {
73+
setupWslExecutable(project(path = ":", configuration = "executable"))
74+
}
75+
5776
// work-around for https://youtrack.jetbrains.com/issue/KT-56305
5877
tasks.withType<NodeJsExec>().configureEach {
59-
abstract class ArgumentProvider @Inject constructor(rootProject: Project) : CommandLineArgumentProvider {
78+
val output by extra {
79+
layout.buildDirectory.dir("distributions/$name")
80+
}
81+
82+
abstract class ArgumentProvider @Inject constructor(
83+
setupWslExecutableFile: Provider<File>,
84+
destinationDirectory: Provider<Directory>
85+
) : CommandLineArgumentProvider {
6086
@get:InputFile
61-
@get:SkipWhenEmpty
6287
abstract val input: RegularFileProperty
6388

6489
@get:OutputDirectory
65-
abstract val output: DirectoryProperty
90+
abstract val destinationDirectory: DirectoryProperty
6691

6792
init {
68-
input.fileProvider(
69-
rootProject
70-
.tasks
71-
.named<IncrementalSyncTask>("jsProductionExecutableCompileSync")
72-
.map {
73-
it
74-
.outputs
75-
.files
76-
.asFileTree
77-
.matching { include("${rootProject.name}.js") }
78-
.singleFile
79-
}
80-
)
81-
82-
output.set(rootProject.layout.buildDirectory.dir("distributions"))
93+
input.fileProvider(setupWslExecutableFile)
94+
this.destinationDirectory.set(destinationDirectory)
8395
}
8496

85-
override fun asArguments(): MutableIterable<String> =
86-
mutableListOf(
97+
override fun asArguments(): Iterable<String> =
98+
listOf(
8799
input.get().asFile.absolutePath,
88-
output.get().asFile.absolutePath
100+
destinationDirectory.get().asFile.absolutePath
89101
)
90102
}
91-
argumentProviders.add(objects.newInstance<ArgumentProvider>(rootProject))
103+
104+
argumentProviders.add(
105+
objects.newInstance<ArgumentProvider>(
106+
setupWslExecutableFile
107+
.flatMap { it.elements }
108+
.map { it.single().asFile },
109+
output
110+
)
111+
)
112+
113+
doFirst {
114+
output.get().asFile.deleteRecursively()
115+
}
116+
}
117+
118+
val setupWslDistribution by configurations.registering {
119+
isCanBeConsumed = true
120+
isCanBeResolved = false
121+
isVisible = false
122+
}
123+
124+
artifacts {
125+
val jsNodeProductionRun by tasks.existing
126+
add(
127+
setupWslDistribution.name,
128+
jsNodeProductionRun.map {
129+
val output: Provider<Directory> by it.extra
130+
output.get()
131+
}
132+
)
92133
}

‎gradle/build-logic/src/main/kotlin/net/kautler/node.gradle.kts‎

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,49 @@ configure<NodeJsRootExtension> {
9595
version = libs.versions.build.node.get()
9696
}
9797

98+
val executable by configurations.registering {
99+
isCanBeConsumed = true
100+
isCanBeResolved = false
101+
isVisible = false
102+
}
103+
104+
artifacts {
105+
val jsProductionExecutableCompileSync by tasks.existing(IncrementalSyncTask::class)
106+
add(
107+
executable.name,
108+
jsProductionExecutableCompileSync.map {
109+
it
110+
.destinationDirectory
111+
.get()
112+
.resolve("${project.name}.js")
113+
}
114+
)
115+
}
116+
117+
// work-around for missing feature in dependencies block added in Gradle 8.3
118+
//val setupWsl by configurations.registering {
119+
val setupWslDistribution by configurations.creating {
120+
isCanBeConsumed = false
121+
isCanBeResolved = false
122+
isVisible = false
123+
}
124+
125+
val setupWslDistributionFiles by configurations.registering {
126+
isCanBeConsumed = false
127+
isCanBeResolved = true
128+
isVisible = false
129+
extendsFrom(setupWslDistribution)
130+
}
131+
132+
dependencies {
133+
setupWslDistribution(project(path = ":ncc-packer", configuration = "setupWslDistribution"))
134+
}
135+
136+
val syncDistribution by tasks.registering(Sync::class) {
137+
from(setupWslDistributionFiles)
138+
into(layout.buildDirectory.dir("distributions"))
139+
}
140+
98141
tasks.assemble {
99-
dependsOn(project(":ncc-packer").tasks.named("jsNodeProductionRun"))
142+
dependsOn(syncDistribution)
100143
}

0 commit comments

Comments
 (0)