From 1fa05926afe94b76e0bd67f8e20c7b1da4f7d614 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Sat, 6 Feb 2021 16:23:01 +0300 Subject: [PATCH] 0.7.6; Update versions --- build.gradle.kts | 2 +- src/main/kotlin/ru/mipt/npm/gradle/KScienceReadmeExtension.kt | 2 +- src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt | 3 ++- src/main/kotlin/ru/mipt/npm/gradle/internal/common.kt | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index d6b7caa..7573a8c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,7 +6,7 @@ plugins { } group = "ru.mipt.npm" -version = "0.7.5" +version = "0.7.6" repositories { gradlePluginPortal() diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceReadmeExtension.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceReadmeExtension.kt index 2281106..cf8c027 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceReadmeExtension.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceReadmeExtension.kt @@ -15,7 +15,7 @@ enum class Maturity { class KScienceReadmeExtension(val project: Project) { - var description: String = "" + var description: String = project.description ?: "" var maturity: Maturity = Maturity.EXPERIMENTAL set(value) { field = value diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt index be90f41..e867cce 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt @@ -12,12 +12,13 @@ object KScienceVersions { const val serializationVersion = "1.1.0-RC" const val atomicVersion = "0.15.1" const val ktorVersion = "1.5.1" + const val htmlVersion = "0.7.2" val JVM_TARGET = JavaVersion.VERSION_11 object Serialization{ const val xmlVersion = "0.80.1" const val bsonVersion = "0.4.4" - const val yamlKtVersion = "0.8.0" + const val yamlKtVersion = "0.9.0" } } diff --git a/src/main/kotlin/ru/mipt/npm/gradle/internal/common.kt b/src/main/kotlin/ru/mipt/npm/gradle/internal/common.kt index c0787d5..ab26d38 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/internal/common.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/internal/common.kt @@ -21,7 +21,6 @@ internal fun LanguageSettingsBuilder.applySettings(): Unit { internal fun RepositoryHandler.applyRepos(): Unit { mavenCentral() - jcenter() maven("https://dl.bintray.com/kotlin/kotlin-eap") maven("https://dl.bintray.com/kotlin/kotlin-dev") maven("https://kotlin.bintray.com/kotlinx") @@ -29,6 +28,7 @@ internal fun RepositoryHandler.applyRepos(): Unit { maven("https://dl.bintray.com/mipt-npm/kscience") maven("https://dl.bintray.com/mipt-npm/dev") maven("https://dl.bintray.com/mipt-npm/dataforge") + maven("https://repo.kotlin.link") } internal fun Copy.fromJsDependencies(configurationName: String) = project.afterEvaluate {