From 9a0e32ad10df5fae1a00fbb7e5136a8da9e199f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Kautler?= Date: Mon, 19 Aug 2024 15:48:05 +0200 Subject: [PATCH] fix(abg): use correct coordinates in generated POM file --- .../workflows/mavenbinding/PomBuilding.kt | 15 +++++++-------- .../mavenbinding/VersionArtifactsBuilding.kt | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/maven-binding-builder/src/main/kotlin/io/github/typesafegithub/workflows/mavenbinding/PomBuilding.kt b/maven-binding-builder/src/main/kotlin/io/github/typesafegithub/workflows/mavenbinding/PomBuilding.kt index f3f5aa1216..731a2a6707 100644 --- a/maven-binding-builder/src/main/kotlin/io/github/typesafegithub/workflows/mavenbinding/PomBuilding.kt +++ b/maven-binding-builder/src/main/kotlin/io/github/typesafegithub/workflows/mavenbinding/PomBuilding.kt @@ -1,13 +1,12 @@ package io.github.typesafegithub.workflows.mavenbinding +import io.github.typesafegithub.workflows.actionbindinggenerator.domain.ActionCoords + internal const val LATEST_RELASED_LIBRARY_VERSION = "2.3.0" -internal fun buildPomFile( - owner: String, - name: String, - version: String, -): String { - val nameForRepo = name.substringBefore("/") +internal fun ActionCoords.buildPomFile(): String { + val nameForRepo = name.substringBefore("__") + val nameForDisplay = name.replace("___", " with ").replace("__", "/") return """ @@ -15,8 +14,8 @@ internal fun buildPomFile( $owner $name $version - $name - Auto-generated binding for $owner/$name@$version. + $nameForDisplay + Auto-generated binding for $owner/$nameForDisplay@$version. https://github.com/$owner/$nameForRepo scm:git:git://github.com/$owner/$nameForRepo.git/ diff --git a/maven-binding-builder/src/main/kotlin/io/github/typesafegithub/workflows/mavenbinding/VersionArtifactsBuilding.kt b/maven-binding-builder/src/main/kotlin/io/github/typesafegithub/workflows/mavenbinding/VersionArtifactsBuilding.kt index 55812ec00c..ded2045d3c 100644 --- a/maven-binding-builder/src/main/kotlin/io/github/typesafegithub/workflows/mavenbinding/VersionArtifactsBuilding.kt +++ b/maven-binding-builder/src/main/kotlin/io/github/typesafegithub/workflows/mavenbinding/VersionArtifactsBuilding.kt @@ -15,7 +15,7 @@ data class JarArtifact( fun ActionCoords.buildVersionArtifacts(types: String? = null): Map? { val jars = buildJars(owner = owner, name = name.replace("__", "/"), version = version, types = types) ?: return null - val pom = buildPomFile(owner = owner, name = name.replace("__", "/"), version = version) + val pom = buildPomFile() val module = buildModuleFile() return mapOf( "$name-$version.jar" to JarArtifact(jars.mainJar),