From 3b835ac18899f1af98e0aa7c91d6267cc8709722 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Thu, 30 Aug 2018 18:53:17 +0200 Subject: [PATCH] Include version in URI (fixes #29) --- src/main/scala/ReproducibleBuildsPlugin.scala | 6 ++++-- src/sbt-test/sbt-reproducible-builds/simple/test | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/scala/ReproducibleBuildsPlugin.scala b/src/main/scala/ReproducibleBuildsPlugin.scala index c5f0d61..e5a46d9 100644 --- a/src/main/scala/ReproducibleBuildsPlugin.scala +++ b/src/main/scala/ReproducibleBuildsPlugin.scala @@ -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( @@ -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 diff --git a/src/sbt-test/sbt-reproducible-builds/simple/test b/src/sbt-test/sbt-reproducible-builds/simple/test index 3f47248..e5f43b8 100644 --- a/src/sbt-test/sbt-reproducible-builds/simple/test +++ b/src/sbt-test/sbt-reproducible-builds/simple/test @@ -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