Merge pull request #4934 from eed3si9n/wip/publishTo

Revert "don't require publishTo specified if publishArtifact is `false`"
This commit is contained in:
eugene yokota 2019-08-09 09:24:31 -04:00 committed by GitHub
commit 6865f32eae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 20 deletions

View File

@ -2338,10 +2338,8 @@ object Classpaths {
if (isSnapshot.value) "integration" else "release", if (isSnapshot.value) "integration" else "release",
ivyConfigurations.value.map(c => ConfigRef(c.name)).toVector, ivyConfigurations.value.map(c => ConfigRef(c.name)).toVector,
packagedArtifacts.in(publish).value.toVector, packagedArtifacts.in(publish).value.toVector,
checksums.in(publish).value.toVector, { //resolvername: not required if publishTo is false checksums.in(publish).value.toVector,
val publishToOption = publishTo.value getPublishTo(publishTo.value).name,
if (publishArtifact.value) getPublishTo(publishToOption).name else "local"
},
ivyLoggingLevel.value, ivyLoggingLevel.value,
isSnapshot.value isSnapshot.value
) )

View File

@ -1,12 +0,0 @@
[@mpollmeier]: https://github.com/mpollmeier
[#3760]: https://github.com/sbt/sbt/pull/3760
### Fixes with compatibility implications
### Improvements
### Bug fixes
- Remove requirement on `publishTo` if `publishArtifact` is false. [#3760][] by [@mpollmeier][]

View File

@ -1,3 +0,0 @@
// this is supposed to do nothing, and more importantly: not fail
// https://github.com/sbt/sbt/pull/3760
publishArtifact := false

View File

@ -1 +0,0 @@
> publish