Skip to content

Commit 111d435

Browse files
committed
Revert "lets see if this works"
This reverts commit f1d629b.
1 parent f1d629b commit 111d435

File tree

2 files changed

+1
-19
lines changed

2 files changed

+1
-19
lines changed

bootstrap/root.gradle.kts

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import com.replaymod.gradle.preprocess.ProjectGraphNode
2-
import com.replaymod.gradle.preprocess.RootPreprocessExtension
31
import dev.deftu.gradle.utils.ModData
42
import dev.deftu.gradle.utils.ProjectData
53

@@ -10,22 +8,6 @@ plugins {
108
subprojects {
119
val projectData = ProjectData.from(rootProject)
1210
ModData.populateFrom(project, projectData)
13-
14-
// Force evaluation of the previous project in the preprocess chain before this project configures.
15-
// Prevents "Resolution was attempted without an exclusive lock" when using configure-on-demand + parallel,
16-
// since preprocessCode needs to resolve the linked project's compileClasspath.
17-
(parent?.extensions?.findByType(RootPreprocessExtension::class.java))?.rootNode?.let { rootNode ->
18-
val nodes = mutableListOf<ProjectGraphNode>()
19-
fun recurse(node: ProjectGraphNode) {
20-
nodes.add(node)
21-
for ((child) in node.links) recurse(child)
22-
}
23-
recurse(rootNode)
24-
val prevByProject = (1 until nodes.size).associate { nodes[it].project to nodes[it - 1].project }
25-
prevByProject[project.name]?.let { prevProject ->
26-
evaluationDependsOn(":bootstrap:$prevProject")
27-
}
28-
}
2911
}
3012

3113
preprocess {

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Gradle Configuration -- DO NOT TOUCH THESE VALUES.
22
org.gradle.daemon=true
33
org.gradle.parallel=true
4-
org.gradle.configureondemand=true
4+
org.gradle.configureondemand=false
55
org.gradle.parallel.threads=8
66
org.gradle.jvmargs=-Xmx8G
77

0 commit comments

Comments
 (0)