Skip to content

Commit 9e4bbf8

Browse files
VampireVampire
committed
Review Feedback Vol. 1
1 parent 39de9a3 commit 9e4bbf8

File tree

2 files changed

+113
-125
lines changed

2 files changed

+113
-125
lines changed

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

Lines changed: 95 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -3,120 +3,108 @@ package io.github.typesafegithub.workflows.mavenbinding
33
import io.github.typesafegithub.workflows.actionbindinggenerator.domain.ActionCoords
44

55
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 """
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+
) = """
17+
{
18+
"formatVersion": "1.1",
19+
"component": {
20+
"group": "$owner",
21+
"module": "$mavenName",
22+
"version": "$version",
23+
"attributes": {
24+
"org.gradle.status": "release"
25+
}
26+
},
27+
"createdBy": {
28+
"gradle": {
29+
"version": "8.7"
30+
}
31+
},
32+
"variants": [
2833
{
29-
"formatVersion": "1.1",
30-
"component": {
31-
"group": "$owner",
32-
"module": "$mavenName",
33-
"version": "$version",
34-
"attributes": {
35-
"org.gradle.status": "release"
36-
}
34+
"name": "apiElements",
35+
"attributes": {
36+
"org.gradle.category": "library",
37+
"org.gradle.dependency.bundling": "external",
38+
"org.gradle.jvm.environment": "standard-jvm",
39+
"org.gradle.jvm.version": 11,
40+
"org.gradle.libraryelements": "jar",
41+
"org.gradle.usage": "java-api",
42+
"org.jetbrains.kotlin.platform.type": "jvm"
3743
},
38-
"createdBy": {
39-
"gradle": {
40-
"version": "8.7"
44+
"files": [
45+
{
46+
"name": "$mavenName-$version.jar",
47+
"url": "$mavenName-$version.jar",
48+
"size": $mainJarSize,
49+
"sha512": "$mainJarSha512Checksum",
50+
"sha256": "$mainJarSha256Checksum",
51+
"sha1": "$mainJarSha1Checksum",
52+
"md5": "$mainJarMd5Checksum"
4153
}
54+
]
55+
},
56+
{
57+
"name": "runtimeElements",
58+
"attributes": {
59+
"org.gradle.category": "library",
60+
"org.gradle.dependency.bundling": "external",
61+
"org.gradle.jvm.environment": "standard-jvm",
62+
"org.gradle.jvm.version": 11,
63+
"org.gradle.libraryelements": "jar",
64+
"org.gradle.usage": "java-runtime",
65+
"org.jetbrains.kotlin.platform.type": "jvm"
4266
},
43-
"variants": [
67+
"dependencies": [
4468
{
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-
},
69+
"group": "io.github.typesafegithub",
70+
"module": "github-workflows-kt",
71+
"version": {
72+
"requires": "$LATEST_RELASED_LIBRARY_VERSION"
73+
}
74+
}
75+
],
76+
"files": [
6777
{
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-
},
78+
"name": "$mavenName-$version.jar",
79+
"url": "$mavenName-$version.jar",
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": [
9997
{
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-
]
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"
118105
}
119106
]
120107
}
121-
""".trimIndent()
122-
}
108+
]
109+
}
110+
""".trimIndent()

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ fun buildVersionArtifacts(actionCoords: ActionCoords): Map<String, Artifact>? {
1616
with(actionCoords) {
1717
val jars = buildJars() ?: return null
1818
val pom = buildPomFile()
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() }
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() }
2929
val module by lazy {
3030
buildModuleFile(
3131
mainJarSize,
@@ -42,15 +42,15 @@ fun buildVersionArtifacts(actionCoords: ActionCoords): Map<String, Artifact>? {
4242
}
4343
return mapOf(
4444
"$mavenName-$version.jar" to JarArtifact(jars.mainJar),
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),
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 },
4949
"$mavenName-$version-sources.jar" to JarArtifact(jars.sourcesJar),
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),
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 },
5454
"$mavenName-$version.pom" to TextArtifact { pom },
5555
"$mavenName-$version.pom.md5" to TextArtifact { pom.md5Checksum() },
5656
"$mavenName-$version.pom.sha1" to TextArtifact { pom.sha1Checksum() },

0 commit comments

Comments
 (0)