@@ -37,40 +37,39 @@ open class GenerateVerificationXmlTask : DefaultTask() {
37
37
val pomFile = File (publicationReleaseDir, " pom-default.xml" )
38
38
val moduleFile = File (publicationReleaseDir, " module.json" )
39
39
40
- val aarSha256 = aarFile.sha256()
41
- val pomSha256 = pomFile.sha256()
42
- val moduleSha256 = moduleFile.sha256()
40
+ val filesWithExt = mapOf (
41
+ aarFile to " aar" ,
42
+ pomFile to " pom" ,
43
+ moduleFile to " module"
44
+ )
45
+
46
+ val publicKey = System .getenv(" GPG_PUBLIC_FINGERPRINT" )
47
+ val hasPublicKey = ! publicKey.isNullOrBlank()
43
48
44
49
val content = xml(TAG_ROOT ) {
45
50
xmlns = NS_DEPS_VERIF
46
51
TAG_CONFIGURATION {
47
- TAG_VERIF_METADATA { - true .toString() }
48
- TAG_VERIF_SIGNATURE { - false .toString() } // TODO RUM-3104 add signature verification
52
+ TAG_VERIF_METADATA { text( true .toString() ) }
53
+ TAG_VERIF_SIGNATURES { text(hasPublicKey .toString()) }
49
54
}
50
55
TAG_COMPONENTS {
51
56
TAG_COMPONENT {
52
57
attribute(ATTR_GROUP , project.group)
53
58
attribute(ATTR_NAME , project.name)
54
59
attribute(ATTR_VERSION , AndroidConfig .VERSION .name)
55
- TAG_ARTIFACT {
56
- attribute(ATTR_NAME , " ${project.name} -${AndroidConfig .VERSION .name} .aar" )
57
- TAG_SHA256 {
58
- attribute(ATTR_VALUE , aarSha256)
59
- attribute(ATTR_ORIGIN , ORIGIN )
60
- }
61
- }
62
- TAG_ARTIFACT {
63
- attribute(ATTR_NAME , " ${project.name} -${AndroidConfig .VERSION .name} .pom" )
64
- TAG_SHA256 {
65
- attribute(ATTR_VALUE , pomSha256)
66
- attribute(ATTR_ORIGIN , ORIGIN )
67
- }
68
- }
69
- TAG_ARTIFACT {
70
- attribute(ATTR_NAME , " ${project.name} -${AndroidConfig .VERSION .name} .module" )
71
- TAG_SHA256 {
72
- attribute(ATTR_VALUE , moduleSha256)
73
- attribute(ATTR_ORIGIN , ORIGIN )
60
+
61
+ filesWithExt.forEach { (file, ext) ->
62
+ TAG_ARTIFACT {
63
+ attribute(ATTR_NAME , " ${project.name} -${AndroidConfig .VERSION .name} .$ext " )
64
+ TAG_SHA256 {
65
+ attribute(ATTR_VALUE , file.sha256())
66
+ attribute(ATTR_ORIGIN , ORIGIN )
67
+ }
68
+ if (hasPublicKey) {
69
+ TAG_PGP {
70
+ attribute(ATTR_VALUE , publicKey)
71
+ }
72
+ }
74
73
}
75
74
}
76
75
}
@@ -104,10 +103,11 @@ open class GenerateVerificationXmlTask : DefaultTask() {
104
103
private const val TAG_ROOT = " verification-metadata"
105
104
private const val TAG_CONFIGURATION = " configuration"
106
105
private const val TAG_VERIF_METADATA = " verify-metadata"
107
- private const val TAG_VERIF_SIGNATURE = " verify-signature "
106
+ private const val TAG_VERIF_SIGNATURES = " verify-signatures "
108
107
private const val TAG_COMPONENTS = " components"
109
108
private const val TAG_COMPONENT = " component"
110
109
private const val TAG_SHA256 = " sha256"
110
+ private const val TAG_PGP = " pgp"
111
111
112
112
private const val TAG_ARTIFACT = " artifact"
113
113
private const val ATTR_GROUP = " group"
@@ -116,6 +116,6 @@ open class GenerateVerificationXmlTask : DefaultTask() {
116
116
private const val ATTR_VALUE = " value"
117
117
private const val ATTR_ORIGIN = " origin"
118
118
119
- private const val ORIGIN = " Datadog"
119
+ private const val ORIGIN = " Datadog official GitHub release "
120
120
}
121
121
}
0 commit comments