Skip to content
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.

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

include project name in archivesBaseName #852

Merged
merged 2 commits into from
Oct 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
- Removed support for the old `org.jetbrains.dokka-android` plugin
- Remove usages of deprecated Gradle API that is scheduled to be removed in Gradle 9.0
- Raised minimum supported Gradle version
- Improve naming of javadoc jars

#### Minimum supported versions
- JDK 11
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ open class JavadocJar : Jar() {
"${prefix}EmptyJavadocJar",
JavadocJar::class.java,
) {
it.archiveBaseName.set("$prefix-javadoc")
it.archiveBaseName.set("${project.name}-$prefix-javadoc")
}

private fun Project.plainJavadocJar(prefix: String): TaskProvider<*> {
return tasks.register("${prefix}PlainJavadocJar", JavadocJar::class.java) {
val task = tasks.named("javadoc")
it.dependsOn(task)
it.from(task)
it.archiveBaseName.set("$prefix-javadoc")
it.archiveBaseName.set("${project.name}-$prefix-javadoc")
}
}

Expand All @@ -47,7 +47,7 @@ open class JavadocJar : Jar() {
}
it.dependsOn(task)
it.from(task)
it.archiveBaseName.set("$prefix-javadoc")
it.archiveBaseName.set("${project.name}-$prefix-javadoc")
}
}
}
Expand Down