Skip to content

Commit 1f46265

Browse files
committed
Fixes #292 - Not feeding new isSnapshot value to ivy configuration.
1 parent 66273a3 commit 1f46265

File tree

5 files changed

+26
-4
lines changed

5 files changed

+26
-4
lines changed

src/main/scala/com/typesafe/sbt/packager/SettingsHelper.scala

+6-4
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,20 @@ object SettingsHelper {
2323
ivyModule <<= (ivySbt, moduleSettings) map { (i, s) => new i.Module(s) },
2424
deliverLocalConfiguration <<= (crossTarget, ivyLoggingLevel) map { (outDir, level) => Classpaths.deliverConfig(outDir, logging = level) },
2525
deliverConfiguration <<= deliverLocalConfiguration,
26-
publishConfiguration <<= (packagedArtifacts, checksums, publishTo) map { (as, checks, publishTo) =>
26+
publishConfiguration <<= (packagedArtifacts, checksums, publishTo, isSnapshot) map { (as, checks, publishTo, isSnap) =>
2727
new PublishConfiguration(ivyFile = None,
2828
resolverName = Classpaths.getPublishTo(publishTo).name,
2929
artifacts = as,
3030
checksums = checks,
31-
logging = UpdateLogging.DownloadOnly)
31+
logging = UpdateLogging.DownloadOnly,
32+
overwrite = isSnap)
3233
},
33-
publishLocalConfiguration <<= (packagedArtifacts, checksums) map { (as, checks) =>
34+
publishLocalConfiguration <<= (packagedArtifacts, checksums, isSnapshot) map { (as, checks, isSnap) =>
3435
new PublishConfiguration(ivyFile = None,
3536
resolverName = "local",
3637
artifacts = as,
3738
checksums = checks,
38-
logging = UpdateLogging.DownloadOnly)
39+
logging = UpdateLogging.DownloadOnly,
40+
overwrite = isSnap)
3941
})) ++ addPackage(config, packageTask, extension)
4042
}
+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import NativePackagerKeys._
2+
3+
packagerSettings
4+
5+
deploymentSettings
6+
7+
name := "simple-test"
8+
9+
version := "0.1.0"
10+
11+
// Workarund for ivy configuration bug
12+
resolvers += (publishTo in Universal).value.get
13+
14+
publishTo in Universal := Some(Resolver.file("test", file("test-repo"))(Patterns("[module]/[revision]/[module]-[revision].[ext]")))
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % sys.props("project.version"))
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
DUMMY!

src/sbt-test/universal/publish/test

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Ensure we can publish to local file system.
2+
> universal:publish
3+
# Ensure isSnpashot works correctly
4+
> universal:publish

0 commit comments

Comments
 (0)