Skip to content

fix(publish): fetch javadoc for 2 digit release numbers #282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 8, 2024
Merged

fix(publish): fetch javadoc for 2 digit release numbers #282

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8678fbd
update
buenaflor Oct 8, 2024
5d60df2
update
buenaflor Oct 8, 2024
c2aa95a
update
buenaflor Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 24 additions & 17 deletions buildSrc/src/main/java/Publication.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@ import org.gradle.api.distribution.DistributionContainer
import org.gradle.api.file.CopySpec
import java.io.File

private object Consts {
val taskRegex = Regex("(.*)DistZip")
}
Comment on lines -6 to -8
Copy link
Contributor Author

@buenaflor buenaflor Oct 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dead code, suprised detekt doesn't detect this

Copy link
Member

@romtsn romtsn Oct 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

doesnt detekt 😜


val sep = File.separator
val sep: String = File.separator

// configure distZip tasks for multiplatform
fun DistributionContainer.configureForMultiplatform(project: Project) {
Expand All @@ -26,13 +22,16 @@ fun DistributionContainer.configureForMultiplatform(project: Project) {
}
from("build${sep}kotlinToolingMetadata") {
rename {
it.replace("kotlin-tooling-metadata.json", "${project.name}-$version-kotlin-tooling-metadata.json")
it.replace(
"kotlin-tooling-metadata.json",
"${project.name}-$version-kotlin-tooling-metadata.json"
)
}
}
from("build${sep}libs") {
include("${project.name}-?.?.*")
include("${project.name}-kotlin*")
include("${project.name}-metadata*")
withJavadoc(project.name)
rename {
it.replace("multiplatform-kotlin", "multiplatform").replace("-metadata", "")
}
Expand Down Expand Up @@ -188,34 +187,42 @@ private fun CopySpec.fromKlib(projectName: String, target: String, version: Stri
from("build${sep}classes${sep}kotlin${sep}${target}${sep}main${sep}cinterop") {
include("*.klib")
rename {
it.replaceRange(pos, pos, "-${target.toLowerCase()}-$version")
it.replaceRange(pos, pos, "-${target.lowercase()}-$version")
}
}
from("build${sep}classes${sep}kotlin${sep}${target}${sep}main${sep}klib") {
rename {
"$projectName-${target.toLowerCase()}-$version.klib"
"$projectName-${target.lowercase()}-$version.klib"
}
}
}

private fun CopySpec.renameModule(projectName: String, renameTo: String = "", version: String) {
var target = ""
if (!renameTo.isEmpty()) {
if (renameTo.isNotEmpty()) {
target = "-$renameTo"
}
rename {
it.replace("module.json", "$projectName$target-$version.module")
}
}

private fun CopySpec.withJavadoc(projectName: String, renameTo: String) {
private fun CopySpec.withJavadoc(projectName: String, renameTo: String = "") {
include("*javadoc*")
rename {
if (it.contains("javadoc")) {
val pos = projectName.length
it.replaceRange(pos, pos, "-$renameTo")
} else {
it
rename { fileName ->
when {
"javadoc" in fileName -> {
val newName = buildString {
append(fileName.substring(0, projectName.length))
if (renameTo.isNotEmpty()) {
append('-')
append(renameTo)
}
append(fileName.substring(projectName.length))
}
newName
}
else -> fileName
}
}
}
Loading