From 5cd86474de03c734945eb0fbcf4ed4c011356105 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Fri, 4 Jun 2021 18:21:12 +0300 Subject: [PATCH] Update kotlin to 1.5.10 --- build.gradle.kts | 4 ++-- src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt | 4 ++-- src/main/kotlin/ru/mipt/npm/gradle/SerializationTargets.kt | 1 + src/main/kotlin/ru/mipt/npm/gradle/internal/common.kt | 1 - 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index d13f0b2..76d7f9c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } group = "ru.mipt.npm" -version = "0.9.9" +version = "0.9.10" description = "Build tools for DataForge and kscience projects" @@ -22,7 +22,7 @@ repositories { maven("https://repo.kotlin.link") } -val kotlinVersion = "1.5.0" +val kotlinVersion = "1.5.10" java { targetCompatibility = JavaVersion.VERSION_1_8 diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt index 76c2a9a..df0b3d5 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt @@ -11,9 +11,9 @@ object KScienceVersions { const val coroutinesVersion = "1.5.0" const val serializationVersion = "1.2.1" const val atomicVersion = "0.16.1" - const val ktorVersion = "1.5.4" + const val ktorVersion = "1.6.0" const val htmlVersion = "0.7.3" - const val dateTimeVersion = "0.2.0" + const val dateTimeVersion = "0.2.1" val JVM_TARGET = JavaVersion.VERSION_11 diff --git a/src/main/kotlin/ru/mipt/npm/gradle/SerializationTargets.kt b/src/main/kotlin/ru/mipt/npm/gradle/SerializationTargets.kt index 531a608..a87ee2b 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/SerializationTargets.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/SerializationTargets.kt @@ -59,6 +59,7 @@ class SerializationTargets( ) } + @Deprecated("To be removed") fun Project.bson( version: String = KScienceVersions.Serialization.bsonVersion ) { 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 930ddb6..9b8b60e 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/internal/common.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/internal/common.kt @@ -22,7 +22,6 @@ internal fun LanguageSettingsBuilder.applySettings(): Unit { internal fun RepositoryHandler.applyRepos(): Unit { mavenCentral() maven("https://repo.kotlin.link") - maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-js-wrappers") } internal fun Copy.fromJsDependencies(configurationName: String) = project.run {