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

Merge 77eb17a4f0 into b3b1a3477e

This commit is contained in:
kenji yoshida 2026-07-19 05:26:00 +00:00 committed by GitHub
parent b3b1a3477e 77eb17a4f0
commit dca834c801
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -286,11 +286,12 @@ object Defaults extends BuildCommon with DefExtra {
csrCacheDirectory := LMCoursier.defaultCacheLocation, csrCacheDirectory := LMCoursier.defaultCacheLocation,
csrSameVersions :== Nil, csrSameVersions :== Nil,
stagingDirectory := (ThisBuild / baseDirectory).value / "target" / "sona-staging", stagingDirectory := (ThisBuild / baseDirectory).value / "target" / "sona-staging",
sonaBundleDirectory := (ThisBuild / baseDirectory).value / "target" / "sona-bundle",
localStaging := Some(Resolver.file("local-staging", stagingDirectory.value)), localStaging := Some(Resolver.file("local-staging", stagingDirectory.value)),
sonaBundle := Publishing sonaBundle := Publishing
.makeBundle( .makeBundle(
stagingDirectory.value.toPath(), stagingDirectory.value.toPath(),
((ThisBuild / baseDirectory).value / "target" / "sona-bundle" / "bundle.zip").toPath() (sonaBundleDirectory.value / "bundle.zip").toPath()
) )
.toFile(), .toFile(),
sonaBundle / aggregate :== false, sonaBundle / aggregate :== false,

2
main/src/main/scala/sbt/Keys.scala
View File

@ -677,6 +677,8 @@ object Keys {
@transient @transient
val stagingDirectory = settingKey[File]("Local staging directory for Sonatype publishing").withRank(CSetting) val stagingDirectory = settingKey[File]("Local staging directory for Sonatype publishing").withRank(CSetting)
@transient @transient
private[sbt] val sonaBundleDirectory = settingKey[File]("Local bundle directory for Sonatype publishing").withRank(DSetting)
@transient
val sonaBundle = taskKey[File]("Local bundle for Sonatype publishing").withRank(DTask) val sonaBundle = taskKey[File]("Local bundle for Sonatype publishing").withRank(DTask)
val localStaging = settingKey[Option[Resolver]]("Local staging resolver for Sonatype publishing").withRank(CSetting) val localStaging = settingKey[Option[Resolver]]("Local staging resolver for Sonatype publishing").withRank(CSetting)
val sonaDeploymentName = settingKey[String]("The name used for deployment").withRank(DSetting) val sonaDeploymentName = settingKey[String]("The name used for deployment").withRank(DSetting)

3
main/src/main/scala/sbt/internal/Clean.scala
View File

@ -226,6 +226,9 @@ private[sbt] object Clean {
case d: DiskActionCacheStore => d.clear() case d: DiskActionCacheStore => d.clear()
case _ => () case _ => ()
IO.delete(outputDirectory.toFile()) IO.delete(outputDirectory.toFile())
val extracted = Project.extract(s)
IO.delete(extracted.get(Keys.stagingDirectory))
IO.delete(extracted.get(Keys.sonaBundleDirectory))
IO.delete( IO.delete(
s.configuration s.configuration
.provider() .provider()