This commit is contained in:
Alexander Nozik 2021-05-08 13:57:46 +03:00
parent 239a5c09f1
commit a221951197
5 changed files with 15 additions and 12 deletions

View File

@ -8,7 +8,7 @@ plugins {
} }
group = "ru.mipt.npm" group = "ru.mipt.npm"
version = "0.9.5" version = "0.9.6"
description = "Build tools for DataForge and kscience projects" description = "Build tools for DataForge and kscience projects"

View File

@ -103,7 +103,7 @@ class KScienceExtension(val project: Project) {
) = project.useFx(modules.toList(), configuration, version, platform) ) = project.useFx(modules.toList(), configuration, version, platform)
fun useHtml( fun useHtml(
version: String = KScienceVersions.atomicVersion, version: String = KScienceVersions.htmlVersion,
sourceSet: DependencySourceSet = DependencySourceSet.MAIN, sourceSet: DependencySourceSet = DependencySourceSet.MAIN,
configuration: DependencyConfiguration = DependencyConfiguration.IMPLEMENTATION configuration: DependencyConfiguration = DependencyConfiguration.IMPLEMENTATION
): Unit = project.useCommonDependency( ): Unit = project.useCommonDependency(

View File

@ -7,6 +7,7 @@ import org.gradle.api.Plugin
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.kotlin.dsl.* import org.gradle.kotlin.dsl.*
import org.jetbrains.changelog.ChangelogPlugin import org.jetbrains.changelog.ChangelogPlugin
import org.jetbrains.changelog.ChangelogPluginExtension
import org.jetbrains.dokka.gradle.DokkaPlugin import org.jetbrains.dokka.gradle.DokkaPlugin
import org.jetbrains.dokka.gradle.DokkaTask import org.jetbrains.dokka.gradle.DokkaTask
import ru.mipt.npm.gradle.internal.* import ru.mipt.npm.gradle.internal.*
@ -63,6 +64,13 @@ class KSciencePublishingExtension(val project: Project) {
open class KScienceProjectPlugin : Plugin<Project> { open class KScienceProjectPlugin : Plugin<Project> {
override fun apply(target: Project): Unit = target.run { override fun apply(target: Project): Unit = target.run {
apply<ChangelogPlugin>() apply<ChangelogPlugin>()
if(!isSnapshot()) {
configure<ChangelogPluginExtension> {
version = project.version.toString()
}
}
apply<DokkaPlugin>() apply<DokkaPlugin>()
apply<BinaryCompatibilityValidatorPlugin>() apply<BinaryCompatibilityValidatorPlugin>()

View File

@ -8,17 +8,17 @@ import org.gradle.api.JavaVersion
object KScienceVersions { object KScienceVersions {
const val kotlinVersion = "1.5.0" const val kotlinVersion = "1.5.0"
const val kotlinxNodeVersion = "0.0.7" const val kotlinxNodeVersion = "0.0.7"
const val coroutinesVersion = "1.4.3" const val coroutinesVersion = "1.5.0-RC"
const val serializationVersion = "1.1.0" const val serializationVersion = "1.2.0"
const val atomicVersion = "0.16.1" const val atomicVersion = "0.16.1"
const val ktorVersion = "1.5.3" const val ktorVersion = "1.5.3"
const val htmlVersion = "0.7.3" const val htmlVersion = "0.7.3"
const val dateTimeVersion = "0.1.1" const val dateTimeVersion = "0.2.0"
val JVM_TARGET = JavaVersion.VERSION_11 val JVM_TARGET = JavaVersion.VERSION_11
object Serialization{ object Serialization{
const val xmlVersion = "0.81.2" const val xmlVersion = "0.82.0"
const val bsonVersion = "0.4.4" const val bsonVersion = "0.4.4"
const val yamlKtVersion = "0.9.0" const val yamlKtVersion = "0.9.0"
} }

View File

@ -1,8 +1,6 @@
package ru.mipt.npm.gradle package ru.mipt.npm.gradle
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.kotlin.dsl.maven
import org.gradle.kotlin.dsl.repositories
import ru.mipt.npm.gradle.internal.useCommonDependency import ru.mipt.npm.gradle.internal.useCommonDependency
import ru.mipt.npm.gradle.internal.useDependency import ru.mipt.npm.gradle.internal.useDependency
@ -44,11 +42,8 @@ class SerializationTargets(
fun Project.xml( fun Project.xml(
version: String = KScienceVersions.Serialization.xmlVersion version: String = KScienceVersions.Serialization.xmlVersion
) { ) {
repositories {
maven("https://dl.bintray.com/pdvrieze/maven")
}
useCommonDependency( useCommonDependency(
"net.devrieze:xmlutil-serialization:$version", "io.github.pdvrieze.xmlutil:serialization:$version",
dependencySourceSet = sourceSet, dependencySourceSet = sourceSet,
dependencyConfiguration = configuration dependencyConfiguration = configuration
) )