Remove useDokka

This commit is contained in:
Alexander Nozik 2020-11-27 20:26:58 +03:00
parent 3416598434
commit 83ab554955
4 changed files with 23 additions and 8 deletions

View File

@ -6,6 +6,20 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased] ## [Unreleased]
### Added
### Changed
### Deprecated
### Removed
### Fixed
### Security
## [0.7.0]
### Added ### Added
- Changelog plugin automatically applied to `project`. - Changelog plugin automatically applied to `project`.
- Feature matrix and Readme generation task for a `project` plugin. - Feature matrix and Readme generation task for a `project` plugin.
@ -27,7 +41,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Publish plugin - Publish plugin
### Removed ### Removed
- `useDokka` method. Documentation jar should be added manually if needed.
### Fixed ### Fixed

View File

@ -20,6 +20,11 @@ open class KScienceCommonPlugin : Plugin<Project> {
registerKScienceExtension() registerKScienceExtension()
repositories.applyRepos() repositories.applyRepos()
// apply dokka for all projects
if (!plugins.hasPlugin("org.jetbrains.dokka")) {
plugins.apply("org.jetbrains.dokka")
}
//Configuration for K-JVM plugin //Configuration for K-JVM plugin
pluginManager.withPlugin("org.jetbrains.kotlin.jvm") { pluginManager.withPlugin("org.jetbrains.kotlin.jvm") {
//logger.info("Applying KScience configuration for JVM project") //logger.info("Applying KScience configuration for JVM project")

View File

@ -91,10 +91,6 @@ class KScienceExtension(val project: Project) {
) )
} }
fun useDokka(): Unit = project.run {
plugins.apply("org.jetbrains.dokka")
}
fun useFx( fun useFx(
vararg modules: FXModule, vararg modules: FXModule,
configuration: DependencyConfiguration = DependencyConfiguration.COMPILE_ONLY, configuration: DependencyConfiguration = DependencyConfiguration.COMPILE_ONLY,

View File

@ -33,7 +33,7 @@ internal fun Project.configurePublishing() {
} }
publications { publications {
create("kotlinJs", MavenPublication::class) { create("js", MavenPublication::class) {
from(components["kotlin"]) from(components["kotlin"])
artifact(sourcesJar) artifact(sourcesJar)
} }
@ -49,7 +49,7 @@ internal fun Project.configurePublishing() {
} }
publications { publications {
create("kotlinJvm", MavenPublication::class) { create("jvm", MavenPublication::class) {
from(components["kotlin"]) from(components["kotlin"])
artifact(sourcesJar) artifact(sourcesJar)
} }