diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e0d3e3..bc31201 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - `publication.platform` changed to `publishing.platform` - Dokka version to `1.4.30` - `useDateTime` in extension +- Kotlin 1.5 ### Deprecated diff --git a/build.gradle.kts b/build.gradle.kts index 66fd477..47f10dc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } group = "ru.mipt.npm" -version = "0.9.3" +version = "0.9.4" description = "Build tools for DataForge and kscience projects" @@ -20,7 +20,7 @@ repositories { maven("https://dl.bintray.com/kotlin/kotlin-dev") } -val kotlinVersion = "1.4.32" +val kotlinVersion = "1.5.0-M2" 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 46f095f..9fa3180 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt @@ -6,13 +6,13 @@ import org.gradle.api.JavaVersion * Build constants */ object KScienceVersions { - const val kotlinVersion = "1.4.32" + const val kotlinVersion = "1.5.0-M2" const val kotlinxNodeVersion = "0.0.7" const val coroutinesVersion = "1.4.3" const val serializationVersion = "1.1.0" const val atomicVersion = "0.15.1" - const val ktorVersion = "1.5.2" - const val htmlVersion = "0.7.2" + const val ktorVersion = "1.5.3" + const val htmlVersion = "0.7.3" const val dateTimeVersion = "0.1.1" val JVM_TARGET = JavaVersion.VERSION_11 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 93071a2..74ec198 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/internal/common.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/internal/common.kt @@ -8,9 +8,9 @@ import org.gradle.kotlin.dsl.maven import org.jetbrains.kotlin.gradle.plugin.LanguageSettingsBuilder internal fun LanguageSettingsBuilder.applySettings(): Unit { - languageVersion = "1.4" + languageVersion = "1.5" + apiVersion = "1.5" progressiveMode = true - enableLanguageFeature("InlineClasses") useExperimentalAnnotation("kotlin.Experimental") useExperimentalAnnotation("kotlin.ExperimentalUnsignedTypes") useExperimentalAnnotation("kotlin.ExperimentalStdlibApi") @@ -22,6 +22,7 @@ internal fun LanguageSettingsBuilder.applySettings(): Unit { internal fun RepositoryHandler.applyRepos(): Unit { mavenCentral() maven("https://repo.kotlin.link") + maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven") maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-js-wrappers") }