Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix race in packageArtifact for doPatchPluginXml #124

Merged
merged 2 commits into from
Jan 19, 2024
Merged

Fix race in packageArtifact for doPatchPluginXml #124

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1ba1c7
Sequence doPatchPluginXml
kellen Oct 26, 2023
5675af5
Add comment
kellen Jan 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ideaSupport/src/main/scala/org/jetbrains/sbtidea/Init.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,13 @@ trait Init { this: Keys.type =>
filterScalaLibraryCp(previousValue)
},
packageArtifact := {
doPatchPluginXml.value
packageArtifact.value
},
// packageMappings must complete before patching
packageArtifact dependsOn Def.sequential(packageMappings, doPatchPluginXml)
}.value,
packageArtifactDynamic := {
doPatchPluginXml.value
packageArtifactDynamic.value
},
// packageMappings must complete before patching
packageArtifactDynamic dependsOn Def.sequential(packageMappings, doPatchPluginXml)
}.value,
packageArtifactZip := Def.sequential(
buildIntellijOptionsIndex.toTask,
doPackageArtifactZip.toTask,
Expand Down