Fix jvm-default bug

This commit is contained in:
Alexander Nozik 2021-04-14 18:18:53 +03:00
parent 60f5d15ba1
commit 9cd2eff18e
6 changed files with 15 additions and 14 deletions

View File

@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased] ## [Unreleased]
### Added ### Added
- Disable API validation for snapshots - Disable API validation for snapshots
- `-Xjvm-default=all` on JVM
### Changed ### Changed
- `publication.platform` changed to `publishing.platform` - `publication.platform` changed to `publishing.platform`

View File

@ -13,14 +13,12 @@ version = "0.9.5-dev"
description = "Build tools for DataForge and kscience projects" description = "Build tools for DataForge and kscience projects"
repositories { repositories {
mavenCentral()
gradlePluginPortal() gradlePluginPortal()
jcenter()
maven("https://repo.kotlin.link") 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 { java {
targetCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8

View File

@ -42,6 +42,7 @@ open class KScienceCommonPlugin : Plugin<Project> {
kotlinOptions { kotlinOptions {
useIR = true useIR = true
jvmTarget = KScienceVersions.JVM_TARGET.toString() jvmTarget = KScienceVersions.JVM_TARGET.toString()
freeCompilerArgs = freeCompilerArgs + "-Xjvm-default=all"
} }
} }
@ -96,6 +97,7 @@ open class KScienceCommonPlugin : Plugin<Project> {
kotlinOptions { kotlinOptions {
useIR = true useIR = true
jvmTarget = KScienceVersions.JVM_TARGET.toString() jvmTarget = KScienceVersions.JVM_TARGET.toString()
freeCompilerArgs = freeCompilerArgs + "-Xjvm-default=all"
} }
} }
} }

View File

@ -137,19 +137,19 @@ open class KScienceProjectPlugin : Plugin<Project> {
val name = subproject.name val name = subproject.name
val path = subproject.path.replaceFirst(":", "").replace(":", "/") val path = subproject.path.replaceFirst(":", "").replace(":", "/")
val ext = subproject.extensions.findByType<KScienceReadmeExtension>() val ext = subproject.extensions.findByType<KScienceReadmeExtension>()
appendln("<hr/>") appendLine("<hr/>")
appendln("\n* ### [$name]($path)") appendLine("\n* ### [$name]($path)")
if (ext != null) { if (ext != null) {
appendln("> ${ext.description}") appendLine("> ${ext.description}")
appendln(">\n> **Maturity**: ${ext.maturity}") appendLine(">\n> **Maturity**: ${ext.maturity}")
val featureString = ext.featuresString(itemPrefix = "> - ", pathPrefix = "$path/") val featureString = ext.featuresString(itemPrefix = "> - ", pathPrefix = "$path/")
if (featureString.isNotBlank()) { if (featureString.isNotBlank()) {
appendln(">\n> **Features:**") appendLine(">\n> **Features:**")
appendln(featureString) appendLine(featureString)
} }
} }
} }
appendln("<hr/>") appendLine("<hr/>")
} }
val rootReadmeProperties: Map<String, Any?> = val rootReadmeProperties: Map<String, Any?> =
@ -168,7 +168,7 @@ open class KScienceProjectPlugin : Plugin<Project> {
dependsOn(generateReadme) dependsOn(generateReadme)
} }
val patchChangelog by tasks.getting //val patchChangelog by tasks.getting
val release by tasks.creating { val release by tasks.creating {
group = RELEASE_GROUP group = RELEASE_GROUP

View File

@ -80,7 +80,7 @@ class KScienceReadmeExtension(val project: Project) {
*/ */
fun featuresString(itemPrefix: String = " - ", pathPrefix: String = "") = buildString { fun featuresString(itemPrefix: String = " - ", pathPrefix: String = "") = buildString {
features.forEach { features.forEach {
appendln("$itemPrefix[${it.name}]($pathPrefix${it.ref ?: "#"}) : ${it.description}") appendLine("$itemPrefix[${it.name}]($pathPrefix${it.ref ?: "#"}) : ${it.description}")
} }
} }

View File

@ -6,7 +6,7 @@ import org.gradle.api.JavaVersion
* Build constants * Build constants
*/ */
object KScienceVersions { object KScienceVersions {
const val kotlinVersion = "1.5.0-M2" const val kotlinVersion = "1.5.0-RC"
const val kotlinxNodeVersion = "0.0.7" const val kotlinxNodeVersion = "0.0.7"
const val coroutinesVersion = "1.4.3" const val coroutinesVersion = "1.4.3"
const val serializationVersion = "1.1.0" const val serializationVersion = "1.1.0"