Skip to content

Commit f375ddf

Browse files
authored
fix(abg): fix the GMM content to contain sizes, checksums, and the sources variant (#1937)
1 parent 7cc6014 commit f375ddf

File tree

2 files changed

+85
-16
lines changed

2 files changed

+85
-16
lines changed

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

+51-6
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,18 @@ package io.github.typesafegithub.workflows.mavenbinding
22

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

5-
internal fun ActionCoords.buildModuleFile() =
6-
"""
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+
) = """
717
{
818
"formatVersion": "1.1",
919
"component": {
@@ -31,12 +41,15 @@ internal fun ActionCoords.buildModuleFile() =
3141
"org.gradle.usage": "java-api",
3242
"org.jetbrains.kotlin.platform.type": "jvm"
3343
},
34-
"dependencies": [],
3544
"files": [
3645
{
3746
"name": "$mavenName-$version.jar",
3847
"url": "$mavenName-$version.jar",
39-
"size": 1
48+
"size": $mainJarSize,
49+
"sha512": "$mainJarSha512Checksum",
50+
"sha256": "$mainJarSha256Checksum",
51+
"sha1": "$mainJarSha1Checksum",
52+
"md5": "$mainJarMd5Checksum"
4053
}
4154
]
4255
},
@@ -51,12 +64,44 @@ internal fun ActionCoords.buildModuleFile() =
5164
"org.gradle.usage": "java-runtime",
5265
"org.jetbrains.kotlin.platform.type": "jvm"
5366
},
54-
"dependencies": [],
67+
"dependencies": [
68+
{
69+
"group": "io.github.typesafegithub",
70+
"module": "github-workflows-kt",
71+
"version": {
72+
"requires": "$LATEST_RELASED_LIBRARY_VERSION"
73+
}
74+
}
75+
],
5576
"files": [
5677
{
5778
"name": "$mavenName-$version.jar",
5879
"url": "$mavenName-$version.jar",
59-
"size": 1
80+
"size": $mainJarSize,
81+
"sha512": "$mainJarSha512Checksum",
82+
"sha256": "$mainJarSha256Checksum",
83+
"sha1": "$mainJarSha1Checksum",
84+
"md5": "$mainJarMd5Checksum"
85+
}
86+
]
87+
},
88+
{
89+
"name": "sourcesElements",
90+
"attributes": {
91+
"org.gradle.category": "documentation",
92+
"org.gradle.dependency.bundling": "external",
93+
"org.gradle.docstype": "sources",
94+
"org.gradle.usage": "java-runtime"
95+
},
96+
"files": [
97+
{
98+
"name": "$mavenName-$version-sources.jar",
99+
"url": "$mavenName-$version-sources.jar",
100+
"size": $sourcesJarSize,
101+
"sha512": "$sourcesJarSha512Checksum",
102+
"sha256": "$sourcesJarSha256Checksum",
103+
"sha1": "$sourcesJarSha1Checksum",
104+
"md5": "$sourcesJarMd5Checksum"
60105
}
61106
]
62107
}

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 by lazy { jars.mainJar().size }
20+
val mainJarMd5Checksum by lazy { jars.mainJar().md5Checksum() }
21+
val mainJarSha1Checksum by lazy { jars.mainJar().sha1Checksum() }
22+
val mainJarSha256Checksum by lazy { jars.mainJar().sha256Checksum() }
23+
val mainJarSha512Checksum by lazy { jars.mainJar().sha512Checksum() }
24+
val sourcesJarSize by lazy { jars.sourcesJar().size }
25+
val sourcesJarMd5Checksum by lazy { jars.sourcesJar().md5Checksum() }
26+
val sourcesJarSha1Checksum by lazy { jars.sourcesJar().sha1Checksum() }
27+
val sourcesJarSha256Checksum by lazy { jars.sourcesJar().sha256Checksum() }
28+
val sourcesJarSha512Checksum by lazy { 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)