Skip to content

Commit 58451cd

Browse files
VampireVampire
committed
fix(abg): fix the GMM content to contain sizes, checksums, and the sources variant
1 parent 7622781 commit 58451cd

File tree

2 files changed

+144
-63
lines changed

2 files changed

+144
-63
lines changed

‎maven-binding-builder/src/main/kotlin/io/github/typesafegithub/workflows/mavenbinding/ModuleBuilding.kt

+110-53
Original file line numberDiff line numberDiff line change
@@ -2,64 +2,121 @@ package io.github.typesafegithub.workflows.mavenbinding
22

33
import io.github.typesafegithub.workflows.actionbindinggenerator.domain.ActionCoords
44

5-
internal fun ActionCoords.buildModuleFile() =
6-
"""
7-
{
8-
"formatVersion": "1.1",
9-
"component": {
10-
"group": "$owner",
11-
"module": "$mavenName",
12-
"version": "$version",
13-
"attributes": {
14-
"org.gradle.status": "release"
15-
}
16-
},
17-
"createdBy": {
18-
"gradle": {
19-
"version": "8.7"
20-
}
21-
},
22-
"variants": [
5+
internal fun ActionCoords.buildModuleFile(
6+
mainJarSize: () -> Int,
7+
mainJarMd5Checksum: () -> String,
8+
mainJarSha1Checksum: () -> String,
9+
mainJarSha256Checksum: () -> String,
10+
mainJarSha512Checksum: () -> String,
11+
sourcesJarSize: () -> Int,
12+
sourcesJarMd5Checksum: () -> String,
13+
sourcesJarSha1Checksum: () -> String,
14+
sourcesJarSha256Checksum: () -> String,
15+
sourcesJarSha512Checksum: () -> String,
16+
): String {
17+
val mainJarSize = mainJarSize()
18+
val mainJarMd5Checksum = mainJarMd5Checksum()
19+
val mainJarSha1Checksum = mainJarSha1Checksum()
20+
val mainJarSha256Checksum = mainJarSha256Checksum()
21+
val mainJarSha512Checksum = mainJarSha512Checksum()
22+
val sourcesJarSize = sourcesJarSize()
23+
val sourcesJarMd5Checksum = sourcesJarMd5Checksum()
24+
val sourcesJarSha1Checksum = sourcesJarSha1Checksum()
25+
val sourcesJarSha256Checksum = sourcesJarSha256Checksum()
26+
val sourcesJarSha512Checksum = sourcesJarSha512Checksum()
27+
return """
2328
{
24-
"name": "apiElements",
25-
"attributes": {
26-
"org.gradle.category": "library",
27-
"org.gradle.dependency.bundling": "external",
28-
"org.gradle.jvm.environment": "standard-jvm",
29-
"org.gradle.jvm.version": 11,
30-
"org.gradle.libraryelements": "jar",
31-
"org.gradle.usage": "java-api",
32-
"org.jetbrains.kotlin.platform.type": "jvm"
29+
"formatVersion": "1.1",
30+
"component": {
31+
"group": "$owner",
32+
"module": "$mavenName",
33+
"version": "$version",
34+
"attributes": {
35+
"org.gradle.status": "release"
36+
}
3337
},
34-
"dependencies": [],
35-
"files": [
36-
{
37-
"name": "$mavenName-$version.jar",
38-
"url": "$mavenName-$version.jar",
39-
"size": 1
38+
"createdBy": {
39+
"gradle": {
40+
"version": "8.7"
4041
}
41-
]
42-
},
43-
{
44-
"name": "runtimeElements",
45-
"attributes": {
46-
"org.gradle.category": "library",
47-
"org.gradle.dependency.bundling": "external",
48-
"org.gradle.jvm.environment": "standard-jvm",
49-
"org.gradle.jvm.version": 11,
50-
"org.gradle.libraryelements": "jar",
51-
"org.gradle.usage": "java-runtime",
52-
"org.jetbrains.kotlin.platform.type": "jvm"
5342
},
54-
"dependencies": [],
55-
"files": [
43+
"variants": [
44+
{
45+
"name": "apiElements",
46+
"attributes": {
47+
"org.gradle.category": "library",
48+
"org.gradle.dependency.bundling": "external",
49+
"org.gradle.jvm.environment": "standard-jvm",
50+
"org.gradle.jvm.version": 11,
51+
"org.gradle.libraryelements": "jar",
52+
"org.gradle.usage": "java-api",
53+
"org.jetbrains.kotlin.platform.type": "jvm"
54+
},
55+
"files": [
56+
{
57+
"name": "$mavenName-$version.jar",
58+
"url": "$mavenName-$version.jar",
59+
"size": $mainJarSize,
60+
"sha512": "$mainJarSha512Checksum",
61+
"sha256": "$mainJarSha256Checksum",
62+
"sha1": "$mainJarSha1Checksum",
63+
"md5": "$mainJarMd5Checksum"
64+
}
65+
]
66+
},
67+
{
68+
"name": "runtimeElements",
69+
"attributes": {
70+
"org.gradle.category": "library",
71+
"org.gradle.dependency.bundling": "external",
72+
"org.gradle.jvm.environment": "standard-jvm",
73+
"org.gradle.jvm.version": 11,
74+
"org.gradle.libraryelements": "jar",
75+
"org.gradle.usage": "java-runtime",
76+
"org.jetbrains.kotlin.platform.type": "jvm"
77+
},
78+
"dependencies": [
79+
{
80+
"group": "io.github.typesafegithub",
81+
"module": "github-workflows-kt",
82+
"version": {
83+
"requires": "$LATEST_RELASED_LIBRARY_VERSION"
84+
}
85+
}
86+
],
87+
"files": [
88+
{
89+
"name": "$mavenName-$version.jar",
90+
"url": "$mavenName-$version.jar",
91+
"size": $mainJarSize,
92+
"sha512": "$mainJarSha512Checksum",
93+
"sha256": "$mainJarSha256Checksum",
94+
"sha1": "$mainJarSha1Checksum",
95+
"md5": "$mainJarMd5Checksum"
96+
}
97+
]
98+
},
5699
{
57-
"name": "$mavenName-$version.jar",
58-
"url": "$mavenName-$version.jar",
59-
"size": 1
100+
"name": "sourcesElements",
101+
"attributes": {
102+
"org.gradle.category": "documentation",
103+
"org.gradle.dependency.bundling": "external",
104+
"org.gradle.docstype": "sources",
105+
"org.gradle.usage": "java-runtime"
106+
},
107+
"files": [
108+
{
109+
"name": "$mavenName-$version-sources.jar",
110+
"url": "$mavenName-$version-sources.jar",
111+
"size": $sourcesJarSize,
112+
"sha512": "$sourcesJarSha512Checksum",
113+
"sha256": "$sourcesJarSha256Checksum",
114+
"sha1": "$sourcesJarSha1Checksum",
115+
"md5": "$sourcesJarMd5Checksum"
116+
}
117+
]
60118
}
61119
]
62120
}
63-
]
64-
}
65-
""".trimIndent()
121+
""".trimIndent()
122+
}

‎maven-binding-builder/src/main/kotlin/io/github/typesafegithub/workflows/mavenbinding/VersionArtifactsBuilding.kt

+34-10
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,45 @@ data class JarArtifact(
1212
val data: () -> ByteArray,
1313
) : Artifact
1414

15-
fun buildVersionArtifacts(actionCoords: ActionCoords): Map<String, Artifact>? =
15+
fun buildVersionArtifacts(actionCoords: ActionCoords): Map<String, Artifact>? {
1616
with(actionCoords) {
1717
val jars = buildJars() ?: return null
1818
val pom = buildPomFile()
19-
val module = buildModuleFile()
19+
val mainJarSize = { jars.mainJar().size }
20+
val mainJarMd5Checksum = { jars.mainJar().md5Checksum() }
21+
val mainJarSha1Checksum = { jars.mainJar().sha1Checksum() }
22+
val mainJarSha256Checksum = { jars.mainJar().sha256Checksum() }
23+
val mainJarSha512Checksum = { jars.mainJar().sha512Checksum() }
24+
val sourcesJarSize = { jars.sourcesJar().size }
25+
val sourcesJarMd5Checksum = { jars.sourcesJar().md5Checksum() }
26+
val sourcesJarSha1Checksum = { jars.sourcesJar().sha1Checksum() }
27+
val sourcesJarSha256Checksum = { jars.sourcesJar().sha256Checksum() }
28+
val sourcesJarSha512Checksum = { jars.sourcesJar().sha512Checksum() }
29+
val module by lazy {
30+
buildModuleFile(
31+
mainJarSize,
32+
mainJarMd5Checksum,
33+
mainJarSha1Checksum,
34+
mainJarSha256Checksum,
35+
mainJarSha512Checksum,
36+
sourcesJarSize,
37+
sourcesJarMd5Checksum,
38+
sourcesJarSha1Checksum,
39+
sourcesJarSha256Checksum,
40+
sourcesJarSha512Checksum,
41+
)
42+
}
2043
return mapOf(
2144
"$mavenName-$version.jar" to JarArtifact(jars.mainJar),
22-
"$mavenName-$version.jar.md5" to TextArtifact { jars.mainJar().md5Checksum() },
23-
"$mavenName-$version.jar.sha1" to TextArtifact { jars.mainJar().sha1Checksum() },
24-
"$mavenName-$version.jar.sha256" to TextArtifact { jars.mainJar().sha256Checksum() },
25-
"$mavenName-$version.jar.sha512" to TextArtifact { jars.mainJar().sha512Checksum() },
45+
"$mavenName-$version.jar.md5" to TextArtifact(mainJarMd5Checksum),
46+
"$mavenName-$version.jar.sha1" to TextArtifact(mainJarSha1Checksum),
47+
"$mavenName-$version.jar.sha256" to TextArtifact(mainJarSha256Checksum),
48+
"$mavenName-$version.jar.sha512" to TextArtifact(mainJarSha512Checksum),
2649
"$mavenName-$version-sources.jar" to JarArtifact(jars.sourcesJar),
27-
"$mavenName-$version-sources.jar.md5" to TextArtifact { jars.sourcesJar().md5Checksum() },
28-
"$mavenName-$version-sources.jar.sha1" to TextArtifact { jars.sourcesJar().sha1Checksum() },
29-
"$mavenName-$version-sources.jar.sha256" to TextArtifact { jars.sourcesJar().sha256Checksum() },
30-
"$mavenName-$version-sources.jar.sha512" to TextArtifact { jars.sourcesJar().sha512Checksum() },
50+
"$mavenName-$version-sources.jar.md5" to TextArtifact(sourcesJarMd5Checksum),
51+
"$mavenName-$version-sources.jar.sha1" to TextArtifact(sourcesJarSha1Checksum),
52+
"$mavenName-$version-sources.jar.sha256" to TextArtifact(sourcesJarSha256Checksum),
53+
"$mavenName-$version-sources.jar.sha512" to TextArtifact(sourcesJarSha512Checksum),
3154
"$mavenName-$version.pom" to TextArtifact { pom },
3255
"$mavenName-$version.pom.md5" to TextArtifact { pom.md5Checksum() },
3356
"$mavenName-$version.pom.sha1" to TextArtifact { pom.sha1Checksum() },
@@ -40,3 +63,4 @@ fun buildVersionArtifacts(actionCoords: ActionCoords): Map<String, Artifact>? =
4063
"$mavenName-$version.module.sha512" to TextArtifact { module.sha512Checksum() },
4164
)
4265
}
66+
}

0 commit comments

Comments
 (0)