diff --git a/CHANGELOG.md b/CHANGELOG.md index 12fa02e..8638d24 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Added - Disable API validation for snapshots +- `-Xjvm-default=all` on JVM ### Changed - `publication.platform` changed to `publishing.platform` diff --git a/build.gradle.kts b/build.gradle.kts index 59ded7b..f09f6c3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,14 +13,12 @@ version = "0.9.5-dev" description = "Build tools for DataForge and kscience projects" repositories { + mavenCentral() gradlePluginPortal() - jcenter() maven("https://repo.kotlin.link") - maven("https://kotlin.bintray.com/kotlinx") - maven("https://dl.bintray.com/kotlin/kotlin-dev") } -val kotlinVersion = "1.5.0-M2" +val kotlinVersion = "1.5.0-RC" java { targetCompatibility = JavaVersion.VERSION_1_8 diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt index d3b1b65..33a9556 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt @@ -42,6 +42,7 @@ open class KScienceCommonPlugin : Plugin { kotlinOptions { useIR = true jvmTarget = KScienceVersions.JVM_TARGET.toString() + freeCompilerArgs = freeCompilerArgs + "-Xjvm-default=all" } } @@ -96,6 +97,7 @@ open class KScienceCommonPlugin : Plugin { kotlinOptions { useIR = true jvmTarget = KScienceVersions.JVM_TARGET.toString() + freeCompilerArgs = freeCompilerArgs + "-Xjvm-default=all" } } } diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt index 87fa030..8d33965 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt @@ -137,19 +137,19 @@ open class KScienceProjectPlugin : Plugin { val name = subproject.name val path = subproject.path.replaceFirst(":", "").replace(":", "/") val ext = subproject.extensions.findByType() - appendln("
") - appendln("\n* ### [$name]($path)") + appendLine("
") + appendLine("\n* ### [$name]($path)") if (ext != null) { - appendln("> ${ext.description}") - appendln(">\n> **Maturity**: ${ext.maturity}") + appendLine("> ${ext.description}") + appendLine(">\n> **Maturity**: ${ext.maturity}") val featureString = ext.featuresString(itemPrefix = "> - ", pathPrefix = "$path/") if (featureString.isNotBlank()) { - appendln(">\n> **Features:**") - appendln(featureString) + appendLine(">\n> **Features:**") + appendLine(featureString) } } } - appendln("
") + appendLine("
") } val rootReadmeProperties: Map = @@ -168,7 +168,7 @@ open class KScienceProjectPlugin : Plugin { dependsOn(generateReadme) } - val patchChangelog by tasks.getting + //val patchChangelog by tasks.getting val release by tasks.creating { group = RELEASE_GROUP diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceReadmeExtension.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceReadmeExtension.kt index 25b362c..0b79d45 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceReadmeExtension.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceReadmeExtension.kt @@ -80,7 +80,7 @@ class KScienceReadmeExtension(val project: Project) { */ fun featuresString(itemPrefix: String = " - ", pathPrefix: String = "") = buildString { features.forEach { - appendln("$itemPrefix[${it.name}]($pathPrefix${it.ref ?: "#"}) : ${it.description}") + appendLine("$itemPrefix[${it.name}]($pathPrefix${it.ref ?: "#"}) : ${it.description}") } } diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt index 9fa3180..f868033 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt @@ -6,7 +6,7 @@ import org.gradle.api.JavaVersion * Build constants */ object KScienceVersions { - const val kotlinVersion = "1.5.0-M2" + const val kotlinVersion = "1.5.0-RC" const val kotlinxNodeVersion = "0.0.7" const val coroutinesVersion = "1.4.3" const val serializationVersion = "1.1.0"