diff --git a/CHANGELOG.md b/CHANGELOG.md index 49cde24..cc955e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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). ## [Unreleased] +### Added + +### Changed + +### Deprecated + +### Removed + +### Fixed + +### Security + +## [0.7.0] + ### Added - Changelog plugin automatically applied to `project`. - 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 ### Removed - +- `useDokka` method. Documentation jar should be added manually if needed. ### Fixed diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt index d8f67ee..d919907 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt @@ -20,6 +20,11 @@ open class KScienceCommonPlugin : Plugin { registerKScienceExtension() repositories.applyRepos() + // apply dokka for all projects + if (!plugins.hasPlugin("org.jetbrains.dokka")) { + plugins.apply("org.jetbrains.dokka") + } + //Configuration for K-JVM plugin pluginManager.withPlugin("org.jetbrains.kotlin.jvm") { //logger.info("Applying KScience configuration for JVM project") @@ -122,7 +127,7 @@ open class KScienceCommonPlugin : Plugin { tasks.apply { withType { kotlinOptions { - // useIR = true + // useIR = true jvmTarget = KScienceVersions.JVM_TARGET.toString() } } diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt index 33cbaa1..495d8f3 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt @@ -91,10 +91,6 @@ class KScienceExtension(val project: Project) { ) } - fun useDokka(): Unit = project.run { - plugins.apply("org.jetbrains.dokka") - } - fun useFx( vararg modules: FXModule, configuration: DependencyConfiguration = DependencyConfiguration.COMPILE_ONLY, diff --git a/src/main/kotlin/ru/mipt/npm/gradle/internal/publish.kt b/src/main/kotlin/ru/mipt/npm/gradle/internal/publish.kt index 433b7d4..12bb161 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/internal/publish.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/internal/publish.kt @@ -33,7 +33,7 @@ internal fun Project.configurePublishing() { } publications { - create("kotlinJs", MavenPublication::class) { + create("js", MavenPublication::class) { from(components["kotlin"]) artifact(sourcesJar) } @@ -49,7 +49,7 @@ internal fun Project.configurePublishing() { } publications { - create("kotlinJvm", MavenPublication::class) { + create("jvm", MavenPublication::class) { from(components["kotlin"]) artifact(sourcesJar) }