checksum-dependency: copy requested attributes to the configuration that resolves PGP signatures

Author: vlsi

README.md

@@ -91,6 +91,7 @@ v1.88
 * stage-vote-release: avoid failures when "init" does not exist
 * chore: fixed build warnings
 * checksum-dependency: infer artifact classifier from the file name
+* checksum-dependency: copy requested attributes to the configuration that resolves PGP signatures
 
 v1.87
 * gradle-extensions: requiredString, requiredBool, requiredInt, requiredLong property accessors

checksum.xml

@@ -18,6 +18,7 @@
     <trusted-key id='b801e2f8ef035068ec1139cc29579f18fa8fd93b' group='com.google.j2objc' />
     <trusted-key id='a9789342f598ad5b1175ef357eb97d110dfadd60' group='com.googlecode.concurrent-trees' />
     <trusted-key id='015479e1055341431b4545ab72475fd306b9cab7' group='com.googlecode.javaewah' />
+    <trusted-key id='1bd97a6a154e7810ee0bc832e2f38302c8075e3d' group='com.gradle.publish' />
     <trusted-key id='a2570288e10932263e8326cbaa49c633b4734832' group='com.pinterest' />
     <trusted-key id='a2570288e10932263e8326cbaa49c633b4734832' group='com.pinterest.ktlint' />
     <trusted-key id='1be2dd4b1fcf252fe4f0a1d103281aa0289ff53a' group='com.soywiz.korlibs.korte' />
@@ -68,9 +69,6 @@
     <dependency group='com.github.ben-manes' module='gradle-versions-plugin' version='0.21.0'>
       <sha512>88F475A29F4775BB825AD10BE07AA8DBC6E554561CE01193F75ED2EE5532F615C89192AE4ECB31B3B127C1832E4D7121A3823118B03E05E90295F8B42303618D</sha512>
     </dependency>
-    <dependency group='com.gradle.publish' module='plugin-publish-plugin' version='1.1.0'>
-      <sha512>B74143EEB10F4EDC12B5E795C92CC25861D6BFBF66D5C218B174E5EC7D1715021B0005A0A696507D402629BFC66C0A6730D25529B39DD000F6A93080781986C9</sha512>
-    </dependency>
     <dependency group='de.marcphilipp.gradle' module='nexus-publish-plugin' version='0.4.0'>
       <sha512>37EC6DFBDDD0458A2A341E371D038B3B0A25AB2F9006B295EBCF3BDE873A8D02C8CDAA6C69D875500F67593C618E8EF62C0269FB2F7F527A1367A7D6B8EA3CBE</sha512>
     </dependency>

gradle/checksum-dependency-plugin/cached-pgp-keys/3d/1bd97a6a154e7810ee0bc832e2f38302c8075e3d.asc

@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGOtCzoBEAC7hGOPLFnfvQKzCZpJb3QYq8X9OiUL4tVa5mG0lDTeBBiuQCDy
+Iyhpo8IypllGG6Wxj6ZJbhuHXcnXSu/atmtrnnjARMvDnQ20jX77B+g39ZYuqxgw
+F/EkDYC6gtNUqzJ8IcxFMIQT+J6LCd3a/eTJWwDLUwSnGXVUPTXzYf4laSVdBDVp
+jp6K+tDHQrLZ140DY4GSvT1SzcgR5+5C1Mda3XobIJNHe47AeZPzKuFzZSlKqvrX
+QNexgGGjrEDWt9I3CXeNoOVVZvI2k6jAvUSZb+jN/YWpW+onDeV1S/7AUBaKE2TE
+EJtidYIOuFsufSwLURwX0um17M47sgzxov9vZYDucGntZn4zKYcZsdkTTkrrgU7N
+RSu90mqdL7rCxkUPsSeEUWFyhleGB108QBa5HiE/Z5T5C94kxD9JV1HAocFraTaZ
+SrNr0dBvZH7SoLCUQZ6q3gXebLbLQgDSuApjn523927O1wdnig+xDgAqTP14sw9i
+9OfvpNhCSolFL7mjGYKGfzTFo4pj5CzoKvvAXcsWY4HvwslWJvmrEqvo8Ss+YTII
+fiRSL4DWurT+42yOoExPwcYNofNwEuyYy5Zr9edsXeodScvy/hlri3JuB3Ji142w
+xFCuKUfrAh7hOw6QOXgIFyFXWrW0HH/8IoeJjxvG+6euxkGx8QZutyaY6wARAQAB
+uQINBGOtCzoBEADSUdEj7dz3jsz4EObAdNXnZnJ5zAkqE4zbGtU94sXdBtxD1F++
+5dTNE0ZCVwJLtZnYvxYXYwHBEDB5ZWS7noTL9rXkgXpDP5WGVLTYIMiGjPkVu2fW
+ZZ78Tu4KIfRnkWdUoMQ2g7YNZ8cVU40cZlk63tRdt7Th71g+K/RKWdqh7NK0laua
+lahK+Glped0QEo1TfrEhNgT0JUCwWzuM4qWHDys7itF++xLJsPSwS/wAUqvsWqGz
+W/1KrYbbxgKX4vbrqL3jnk4IHvcKAub0uchLv9KR5QpsVT86TmOB3WsAAlPdosW/
+ahAc2/XyiCxv5JEo8YpErBZ5TSgUy7lJNABS0JUVCeUCq/AAZ2TScOwRX8aXCeYA
+SfRHOZCiWrWy5nMGGnXVs42MMIML9d+Hr37BCCFT3Gbw8WOTeGleE92sed5dBAjO
+PyQWP+IvYxF7zOyNs46RAVlJfg3G33VwEBQgJwLSl/sUYqSHe9QubbxI0fiMsTJd
+Z6/5fbsXVnMbGe4kQDZbDTgylotiHfMCMNefgb0+yA6Fw+EHQeN/v/AtpcpT0w12
+AOpmlNy4+zPQE8Ai73gtJeTRpiuob3k1/JwvLHemB14CtxBGiHAyYHCjPqTPyQUI
+ikj+R8mecG/60RfSmGe3HW7Hpt907BNEcc4s4V9uvJPHIJdZS/gmtSp5VQARAQAB
+=on0Y
+-----END PGP PUBLIC KEY BLOCK-----

gradle/checksum-dependency-plugin/cached-pgp-keys/3d/e2f38302c8075e3d.fingerprints

@@ -0,0 +1 @@
+1bd97a6a154e7810ee0bc832e2f38302c8075e3d

gradle/checksum-dependency-plugin/cached-pgp-keys/90/1b80c80e07bc7190.fingerprints

@@ -0,0 +1 @@
+1bd97a6a154e7810ee0bc832e2f38302c8075e3d

plugins/checksum-dependency-plugin/README.md

@@ -502,6 +502,7 @@ Changelog
 ---------
 v1.88
 * Infer artifact classifier from the file name
+* Copy requested attributes to the configuration that resolves PGP signatures
 
 v1.86
 * Use full fingerprint for PGP verification

plugins/checksum-dependency-plugin/src/main/kotlin/com/github/vlsi/gradle/checksum/ChecksumDependency.kt

@@ -38,6 +38,7 @@ import org.gradle.api.artifacts.component.ModuleComponentIdentifier
 import org.gradle.api.artifacts.dsl.RepositoryHandler
 import org.gradle.api.artifacts.repositories.IvyArtifactRepository
 import org.gradle.api.artifacts.repositories.MavenArtifactRepository
+import org.gradle.api.attributes.Attribute
 import org.gradle.api.initialization.Settings
 import org.gradle.api.logging.LogLevel
 import org.gradle.api.logging.Logging
@@ -137,6 +138,14 @@ class ChecksumDependency(
         logger.debug { "beforeResolve ${dependencies.path}@${dependencies.hashCode()}" }
         val dependencyFactory = settings.gradle.rootProject.dependencies
         val pgpConfiguration = dependencies.configurationContainer.detachedConfiguration()
+        pgpConfiguration.apply {
+            attributes {
+                for (attrKey in dependencies.attributes.keySet()) {
+                    attrKey as Attribute<Any>
+                    attribute(attrKey, dependencies.attributes.getAttribute(attrKey)!!)
+                }
+            }
+        }
         logger.debug {
             "afterResolve of $this, ${this.hashCode()}, will resolve signatures via" +
                     " $pgpConfiguration@${pgpConfiguration.hashCode()}"
@@ -304,7 +313,7 @@ class ChecksumDependency(
 
         for (unresolved in resolve.unresolvedModuleDependencies) {
             logger.lifecycle(
-                "Unable to resolve checksum $unresolved",
+                "Unable to resolve PGP signature for $unresolved",
                 unresolved.problem
             )
         }