Skip to content

Commit

Permalink
Include version in URI (fixes #29)
Browse files Browse the repository at this point in the history
  • Loading branch information
raboof committed Aug 30, 2018
1 parent 0f03675 commit 3b835ac
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
6 changes: 4 additions & 2 deletions src/main/scala/ReproducibleBuildsPlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ object ReproducibleBuildsPlugin extends AutoPlugin {
reproducibleBuildsUploadCertification := {
val file = signedReproducibleBuildsCertification.value
val groupId = organization.value
val uri = reproducibleBuildsUploadPrefix.value.resolve(groupId + "/" + reproducibleBuildsPackageName.value + "/").resolve(file.getName)
val uploadPrefix = reproducibleBuildsUploadPrefix.value
val uri = uploadPrefix.resolve(groupId + "/" + reproducibleBuildsPackageName.value + "/" + version.value + "/")
.resolve(file.getName)

import gigahorse.HttpWrite._
http.run(
Expand All @@ -115,7 +117,7 @@ object ReproducibleBuildsPlugin extends AutoPlugin {
val ours = reproducibleBuildsCertification.value
val groupId = organization.value
val uploadPrefix = reproducibleBuildsUploadPrefix.value
val uri = uploadPrefix.resolve(groupId + "/" + reproducibleBuildsPackageName.value + "/")
val uri = uploadPrefix.resolve(groupId + "/" + reproducibleBuildsPackageName.value + "/" + version.value + "/")
http.run(GigahorseSupport.url(uri.toASCIIString)).onComplete {
case Success(v) =>
v.bodyAsString
Expand Down
4 changes: 3 additions & 1 deletion src/sbt-test/sbt-reproducible-builds/simple/test
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@ $ must-mirror target/scala-2.12/stripped/simple_2.12-0.1.0-SNAPSHOT.jar expected
> reproducibleBuildsCertification
$ exists target/scala-2.12/simple_2.12_0.1.0-SNAPSHOT_all_STATIC.buildinfo
# Not on travis:
# signedReproducibleBuildsCertification
#> signedReproducibleBuildsCertification
#> reproducibleBuildsUploadCertification
#> reproducibleBuildsCheckCertification

0 comments on commit 3b835ac

Please sign in to comment.