luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7830 from Friendseeker/remove-early-output-version 

[1.x] Use generic early output file name
This commit is contained in:
eugene yokota 2024-10-28 01:12:58 -04:00 committed by GitHub
parent 2259598e5f 4beb78b260
commit 4e15180596
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
main/src/main/scala/sbt/Defaults.scala
View File

@ -1818,16 +1818,8 @@ object Defaults extends BuildCommon {
extraPrefix: String extraPrefix: String
): Initialize[File] = ): Initialize[File] =
Def.setting { Def.setting {
val f = artifactName.value
crossTarget.value / crossTarget.value /
(prefix(configuration.value.name) + extraPrefix) / f( (prefix(configuration.value.name) + "early") / "early.jar"
ScalaVersion(
(artifactName / scalaVersion).value,
(artifactName / scalaBinaryVersion).value
),
projectID.value,
art.value
)
} }
private[sbt] def prefixArtifactPathSetting( private[sbt] def prefixArtifactPathSetting(

2
sbt-app/src/sbt-test/source-dependencies/pipelining/build.sbt
View File

@ -17,6 +17,6 @@ lazy val use = project
val x = (dep / Compile / compile).value val x = (dep / Compile / compile).value
val picklePath = (Compile / internalDependencyPicklePath).value val picklePath = (Compile / internalDependencyPicklePath).value
assert(picklePath.size == 1 && assert(picklePath.size == 1 &&
picklePath.head.data.name == "dep_2.13-0.1.0-SNAPSHOT.jar", s"picklePath = ${picklePath}") picklePath.head.data.name == "early.jar", s"picklePath = ${picklePath}")
}, },
) )