mirror of https://github.com/sbt/sbt.git
Remove sbt-pgp-coursier (#269)
This commit is contained in:
Alexandre Archambault
GitHub
parent
fdfb676a2e
commit
cc0643e71b
|
|
@ -14,7 +14,6 @@ jobs:
|
|||
include:
|
||||
- env: SBT_COURSIER=1 TEST_GROUP=1
|
||||
- env: SBT_COURSIER=1 TEST_GROUP=2
|
||||
- env: SBT_PGP_COURSIER=1
|
||||
- env: LM_COURSIER=1 TEST_GROUP=1
|
||||
- env: LM_COURSIER=1 TEST_GROUP=2
|
||||
- stage: release
|
||||
|
|
|
|||
23
build.sbt
23
build.sbt
|
|
@ -124,26 +124,6 @@ lazy val `sbt-coursier` = project
|
|||
}
|
||||
)
|
||||
|
||||
lazy val `sbt-pgp-coursier` = project
|
||||
.in(file("modules/sbt-pgp-coursier"))
|
||||
.enablePlugins(ScriptedPlugin)
|
||||
.disablePlugins(MimaPlugin)
|
||||
.dependsOn(`sbt-coursier`)
|
||||
.settings(
|
||||
plugin,
|
||||
libraryDependencies += {
|
||||
val sbtv = CrossVersion.binarySbtVersion(sbtVersion.in(pluginCrossBuild).value)
|
||||
val sv = scalaBinaryVersion.value
|
||||
val ver = "1.1.2-1"
|
||||
Defaults.sbtPluginExtra("com.jsuereth" % "sbt-pgp" % ver, sbtv, sv)
|
||||
},
|
||||
scriptedDependencies := {
|
||||
scriptedDependencies.value
|
||||
// TODO Get dependency projects automatically
|
||||
scriptedDependencies.in(`sbt-coursier`).value
|
||||
}
|
||||
)
|
||||
|
||||
lazy val `sbt-coursier-root` = project
|
||||
.in(file("."))
|
||||
.disablePlugins(MimaPlugin)
|
||||
|
|
@ -153,8 +133,7 @@ lazy val `sbt-coursier-root` = project
|
|||
`sbt-coursier`,
|
||||
`sbt-coursier-shared`,
|
||||
`sbt-coursier-shared-shaded`,
|
||||
`sbt-lm-coursier`,
|
||||
`sbt-pgp-coursier`
|
||||
`sbt-lm-coursier`
|
||||
)
|
||||
.settings(
|
||||
shared,
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
package coursier
|
||||
|
||||
import com.typesafe.sbt.pgp.PgpKeys.updatePgpSignatures
|
||||
import coursier.sbtcoursier.UpdateTasks
|
||||
import sbt.AutoPlugin
|
||||
|
||||
object CoursierSbtPgpPlugin extends AutoPlugin {
|
||||
|
||||
override def trigger = allRequirements
|
||||
|
||||
override def requires = com.typesafe.sbt.SbtPgp && coursier.sbtcoursier.CoursierPlugin
|
||||
|
||||
override val projectSettings = Seq(
|
||||
updatePgpSignatures := UpdateTasks.updateTask(withClassifiers = false, includeSignatures = true).value
|
||||
)
|
||||
|
||||
}
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
See a similar test under sbt-coursier/src/sbt-test/sbt-coursier-0.13/publish-local-signed
|
||||
|
||||
A few things from this test were grabbed from https://github.com/sbt/sbt-pgp/tree/431c0a50fc5e91b881ebb154f22cc6a0b209be10/pgp-plugin/src/sbt-test/sbt-pgp/skip
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
scalaVersion := "2.12.3"
|
||||
|
||||
// seen in https://github.com/sbt/sbt-pgp/blob/431c0a50fc5e91b881ebb154f22cc6a0b209be10/pgp-plugin/src/sbt-test/sbt-pgp/skip/build.sbt
|
||||
credentials.in(GlobalScope) := Seq(Credentials("", "pgp", "", "test password"))
|
||||
pgpSecretRing := baseDirectory.value / "secring.pgp"
|
||||
pgpPublicRing := baseDirectory.value / "pubring.pgp"
|
||||
|
||||
// seems required by sbt-pgp 1.1.1, even to publish locally
|
||||
publishTo := Some("foo" at "https://f.oo")
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
{
|
||||
val pluginVersion = sys.props.getOrElse(
|
||||
"plugin.version",
|
||||
throw new RuntimeException(
|
||||
"""|The system property 'plugin.version' is not defined.
|
||||
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin
|
||||
)
|
||||
)
|
||||
|
||||
addSbtPlugin("io.get-coursier" % "sbt-pgp-coursier" % pluginVersion)
|
||||
}
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
Version: BCPG v1.51
|
||||
|
||||
mQENBFVcLH0BCACmERkKh73zr+0nFl7/6WWP3QcNa3msWDlArP6GzQEOmFBNZEtv
|
||||
1BRSKz1fGl4aZzpNPDh2rNcsjVhJPzwVLUzsJuWgBa2EdYafnsUjQ37V998iFhtZ
|
||||
ZgbXieJ2yMvaNPPrPjgYBAZFrnQmH0oQDx+GWDd5Y3lQBx0heIJA5YjPN3meDzqZ
|
||||
FC0qxSVeCPFYaxAFoMnNDEohpvGV3iiUTAyTgSDofxJqVV20oeMCJzC89VskCjSV
|
||||
KIlCnKIRFA+WtND1AsJuIBM/x4JQkRF8xc/2tS5xGXSQllgwxHXEnhDDXcT0o6pY
|
||||
Ni2xYSG0gcmwaBGvx8N1RjWcVms/iJ4ViayxABEBAAG0C1Rlc3QgPFRlc3Q+iQEc
|
||||
BBMBAgAGBQJVXCx9AAoJEKotvJKVuRt6fQkH/1XhdHxOB5m92TasMkxCqjuK0EtQ
|
||||
0HEIkoRC+Z9gOUqlhK58y+8DK9ZAEx/e09CDK1N+x/R3xQUKh2KbUpS7yiNzzqZO
|
||||
OejWtmWw6gYNHy1COP9WKT8Qgr+z4d7GBTrGthEhvZftHyyqlN6JZJZ2ZcvE/Odz
|
||||
QkMbd4aeRXi+KgzHp4fa1hLaA2BT7TT1trYH2L6OI6VbcEebnz+up738liHq9p/R
|
||||
JrJP4JjLzWtEkL83pE6FHhXowsdaG8WKYfWRstX7RixHq5P13PW/iAZEAmJb08ER
|
||||
mmguiicjExRk7UaIVwKPa5P1DAOgeK/ejCLsxrUKspIgt6JLQFbprGZHRdE=
|
||||
=/1s8
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
-----BEGIN PGP PRIVATE KEY BLOCK-----
|
||||
Version: BCPG v1.51
|
||||
|
||||
lQO+BFVcLH0BCACmERkKh73zr+0nFl7/6WWP3QcNa3msWDlArP6GzQEOmFBNZEtv
|
||||
1BRSKz1fGl4aZzpNPDh2rNcsjVhJPzwVLUzsJuWgBa2EdYafnsUjQ37V998iFhtZ
|
||||
ZgbXieJ2yMvaNPPrPjgYBAZFrnQmH0oQDx+GWDd5Y3lQBx0heIJA5YjPN3meDzqZ
|
||||
FC0qxSVeCPFYaxAFoMnNDEohpvGV3iiUTAyTgSDofxJqVV20oeMCJzC89VskCjSV
|
||||
KIlCnKIRFA+WtND1AsJuIBM/x4JQkRF8xc/2tS5xGXSQllgwxHXEnhDDXcT0o6pY
|
||||
Ni2xYSG0gcmwaBGvx8N1RjWcVms/iJ4ViayxABEBAAH+AwMCQJCBiVce8z5gAZr+
|
||||
L8W6NOs8orCIgLbCjKAHuKan9mZXtvOaml/8EDiBjLvwekUQj0OI6S29y5QsQpvn
|
||||
lo8vXAsJnA/Q0olrAim2aZPOXVjQOYsOwExo4SAu7zXBQ3w3+jYsM5kHYPWICr3g
|
||||
3LzhVUmDTHjein/Xa9X7M8bzAY0Esoabl1aSKZ9K15P2ss7noHXrKZPxRk3jb0XP
|
||||
jHE2h5zTLLkdyXnZ74ILVYYEOjqe7P/+eWBL5TIan73ekNCKkgRBKI+pWB8Bc8sA
|
||||
ww2WtlkpsogVItjZ7spk03HVykSr/hS2TnVoR1vX+C8bPLjvwksNORWELf9z32vA
|
||||
ASgqoqeKMc+qHLPnZOrNIoCwUgBHLq/XL09E4Sav1TnqQt14Ya3oTiWQARMY+6jC
|
||||
FGpHhKhx4XjrBjUyGWm8EzC/IPWIXSs9oeOxfSag7QNCf3F1fOjUOYkt32bTpEiM
|
||||
X5sxrovkW/bh0U7thnIsHeklDx99U89F3J0K5svN66f7XplN3wYgwBJA/Fjymgj0
|
||||
zYN0cibnL1rp6zyMRSu5iDQRq1A9rFzsOQb4+gyNMUvlSM1ajA/sFvHsk0xFXdPG
|
||||
ADOx9Tn3f4JN58ylGnMygtBmcS4f+lDVS0Q96lRuyFRTze/+JuhVTPNk2kClNp8y
|
||||
98dc4UMawEyZ55EbxhVKx10jZ74Sswk8N15NhSZN5IKBUwQ1JWAoMnn0UDFeniBW
|
||||
gjmD/82a0QzosJRkOEKqaCUK02FUgFNcB/6Aauj5Pm6vDehWnk+4Kz4f2QrqdD+Y
|
||||
DquqcQ88gPj7jJnRX/+lMwKd73PeK3GfpvWCkRcliUs47LQ585uc03lArxpG2j74
|
||||
hG9Lxt/B545sqsYt2ViJ0hNBRgwfUdGy6NVef4F6JxVxkD32eavDDUBfXC/a5zRu
|
||||
m7QLVGVzdCA8VGVzdD6JARwEEwECAAYFAlVcLH0ACgkQqi28kpW5G3p9CQf/VeF0
|
||||
fE4Hmb3ZNqwyTEKqO4rQS1DQcQiShEL5n2A5SqWErnzL7wMr1kATH97T0IMrU37H
|
||||
9HfFBQqHYptSlLvKI3POpk456Na2ZbDqBg0fLUI4/1YpPxCCv7Ph3sYFOsa2ESG9
|
||||
l+0fLKqU3olklnZly8T853NCQxt3hp5FeL4qDMenh9rWEtoDYFPtNPW2tgfYvo4j
|
||||
pVtwR5ufP66nvfyWIer2n9Emsk/gmMvNa0SQvzekToUeFejCx1obxYph9ZGy1ftG
|
||||
LEerk/Xc9b+IBkQCYlvTwRGaaC6KJyMTFGTtRohXAo9rk/UMA6B4r96MIuzGtQqy
|
||||
kiC3oktAVumsZkdF0Q==
|
||||
=wGX/
|
||||
-----END PGP PRIVATE KEY BLOCK-----
|
||||
|
|
@ -1 +0,0 @@
|
|||
object Foo
|
||||
|
|
@ -1 +0,0 @@
|
|||
> publishLocalSigned
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
scalaVersion := "2.11.8"
|
||||
|
||||
libraryDependencies += "com.github.alexarchambault" %% "argonaut-shapeless_6.2" % "1.2.0-M5"
|
||||
|
||||
lazy val check = TaskKey[Unit]("check")
|
||||
|
||||
check := {
|
||||
val report = com.typesafe.sbt.pgp.PgpKeys.updatePgpSignatures.value
|
||||
val configReport = report
|
||||
.configurations
|
||||
.find { confRep =>
|
||||
// .toString required with sbt 1.0 (ConfigRef -> String)
|
||||
confRep.configuration.toString == "compile"
|
||||
}
|
||||
.getOrElse {
|
||||
sys.error("No configuration report found for configuration 'compile'")
|
||||
}
|
||||
val moduleReports = configReport.modules
|
||||
val signatures = moduleReports
|
||||
.flatMap(_.artifacts)
|
||||
.filter(_._1.extension == "jar.asc")
|
||||
.map(_._2)
|
||||
assert(
|
||||
signatures.nonEmpty,
|
||||
"No signatures found"
|
||||
)
|
||||
def isCoursierCachePath(p: File) = {
|
||||
val abs = p.getAbsolutePath
|
||||
abs.contains("/.coursier/") || // Former cache path
|
||||
abs.contains("/coursier/") || // New cache path, Linux
|
||||
abs.contains("/Coursier/") // New cache path, OS X
|
||||
}
|
||||
assert(
|
||||
signatures.forall(isCoursierCachePath),
|
||||
s"Found signatures not provided by coursier:\n" +
|
||||
signatures
|
||||
.filter(!isCoursierCachePath(_))
|
||||
.map(" " + _)
|
||||
.mkString("\n")
|
||||
)
|
||||
}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
{
|
||||
val pluginVersion = sys.props.getOrElse(
|
||||
"plugin.version",
|
||||
throw new RuntimeException(
|
||||
"""|The system property 'plugin.version' is not defined.
|
||||
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin
|
||||
)
|
||||
)
|
||||
|
||||
addSbtPlugin("io.get-coursier" % "sbt-pgp-coursier" % pluginVersion)
|
||||
}
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
> checkPgpSignatures
|
||||
> check
|
||||
|
|
@ -5,10 +5,6 @@ lmCoursier() {
|
|||
[ "${LM_COURSIER:-""}" = 1 ]
|
||||
}
|
||||
|
||||
sbtPgpCoursier() {
|
||||
[ "${SBT_PGP_COURSIER:-""}" = 1 ]
|
||||
}
|
||||
|
||||
sbtShading() {
|
||||
[ "${SBT_SHADING:-""}" = 1 ]
|
||||
}
|
||||
|
|
@ -51,25 +47,9 @@ runSbtShadingTests() {
|
|||
./sbt ++$TRAVIS_SCALA_VERSION sbt-shading/scripted
|
||||
}
|
||||
|
||||
runSbtPgpCoursierTests() {
|
||||
addPgpKeys
|
||||
./sbt ++$TRAVIS_SCALA_VERSION sbt-pgp-coursier/compile
|
||||
# disable for now, sbt ++$TRAVIS_SCALA_VERSION sbt-pgp-coursier/scripted
|
||||
# fails with "unknown signature key algorithm: 22"
|
||||
# and "No signatures found"
|
||||
}
|
||||
|
||||
addPgpKeys() {
|
||||
for key in b41f2bce 9fa47a44 ae548ced b4493b94 53a97466 36ee59d9 dc426429 3b80305d 69e0a56c fdd5c0cd 35543c27 70173ee5 111557de 39c263a9; do
|
||||
gpg --keyserver keyserver.ubuntu.com --recv "$key"
|
||||
done
|
||||
}
|
||||
|
||||
|
||||
if sbtShading; then
|
||||
runSbtShadingTests
|
||||
elif sbtPgpCoursier; then
|
||||
runSbtPgpCoursierTests
|
||||
elif lmCoursier; then
|
||||
runLmCoursierTests
|
||||
else
|
||||
|
|
|
|||
Loading…
Reference in New Issue