Fix jvm-default bug
This commit is contained in:
parent
60f5d15ba1
commit
9cd2eff18e
@ -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`
|
||||
|
@ -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
|
||||
|
@ -42,6 +42,7 @@ open class KScienceCommonPlugin : Plugin<Project> {
|
||||
kotlinOptions {
|
||||
useIR = true
|
||||
jvmTarget = KScienceVersions.JVM_TARGET.toString()
|
||||
freeCompilerArgs = freeCompilerArgs + "-Xjvm-default=all"
|
||||
}
|
||||
}
|
||||
|
||||
@ -96,6 +97,7 @@ open class KScienceCommonPlugin : Plugin<Project> {
|
||||
kotlinOptions {
|
||||
useIR = true
|
||||
jvmTarget = KScienceVersions.JVM_TARGET.toString()
|
||||
freeCompilerArgs = freeCompilerArgs + "-Xjvm-default=all"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -137,19 +137,19 @@ open class KScienceProjectPlugin : Plugin<Project> {
|
||||
val name = subproject.name
|
||||
val path = subproject.path.replaceFirst(":", "").replace(":", "/")
|
||||
val ext = subproject.extensions.findByType<KScienceReadmeExtension>()
|
||||
appendln("<hr/>")
|
||||
appendln("\n* ### [$name]($path)")
|
||||
appendLine("<hr/>")
|
||||
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("<hr/>")
|
||||
appendLine("<hr/>")
|
||||
}
|
||||
|
||||
val rootReadmeProperties: Map<String, Any?> =
|
||||
@ -168,7 +168,7 @@ open class KScienceProjectPlugin : Plugin<Project> {
|
||||
dependsOn(generateReadme)
|
||||
}
|
||||
|
||||
val patchChangelog by tasks.getting
|
||||
//val patchChangelog by tasks.getting
|
||||
|
||||
val release by tasks.creating {
|
||||
group = RELEASE_GROUP
|
||||
|
@ -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}")
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user