Fix language settings
This commit is contained in:
parent
0415ed30d5
commit
680bd9ed33
@ -1,6 +1,6 @@
|
||||
[versions]
|
||||
tools = "0.10.4"
|
||||
kotlin = "1.5.31"
|
||||
kotlin = "1.6.0-M1"
|
||||
atomicfu = "0.16.2"
|
||||
binary-compatibility-validator = "0.7.1"
|
||||
changelog = "1.3.0"
|
||||
@ -14,11 +14,11 @@ kotlinx-datetime = "0.2.1"
|
||||
kotlinx-html = "0.7.3"
|
||||
kotlinx-knit = "0.2.3"
|
||||
kotlinx-nodejs = "0.0.7"
|
||||
kotlinx-serialization = "1.3.0-RC"
|
||||
kotlinx-serialization = "1.3.0"
|
||||
ktor = "1.6.3"
|
||||
xmlutil = "0.83.0"
|
||||
yamlkt = "0.10.2"
|
||||
jsBom = "0.0.1-pre.243-kotlin-1.5.30"
|
||||
jsBom = "0.0.1-pre.248-kotlin-1.5.31"
|
||||
|
||||
[libraries]
|
||||
atomicfu-gradle = { module = "org.jetbrains.kotlinx:atomicfu-gradle-plugin", version.ref = "atomicfu" }
|
||||
|
@ -28,12 +28,11 @@ public open class KScienceCommonPlugin : Plugin<Project> {
|
||||
configure<KotlinJvmProjectExtension> {
|
||||
explicitApiWarning()
|
||||
|
||||
sourceSets["main"].apply {
|
||||
sourceSets.all {
|
||||
languageSettings.applySettings()
|
||||
}
|
||||
|
||||
sourceSets["test"].apply {
|
||||
languageSettings.applySettings()
|
||||
dependencies {
|
||||
implementation(kotlin("test-junit5"))
|
||||
implementation("org.junit.jupiter:junit-jupiter:5.6.1")
|
||||
@ -69,15 +68,17 @@ public open class KScienceCommonPlugin : Plugin<Project> {
|
||||
}
|
||||
}
|
||||
|
||||
sourceSets["main"].apply {
|
||||
sourceSets.all {
|
||||
languageSettings.applySettings()
|
||||
}
|
||||
|
||||
sourceSets["main"].apply {
|
||||
dependencies {
|
||||
api(project.dependencies.platform("org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:${KScienceVersions.jsBom}"))
|
||||
}
|
||||
}
|
||||
|
||||
sourceSets["test"].apply {
|
||||
languageSettings.applySettings()
|
||||
dependencies {
|
||||
implementation(kotlin("test-js"))
|
||||
}
|
||||
@ -138,13 +139,9 @@ public open class KScienceCommonPlugin : Plugin<Project> {
|
||||
}
|
||||
}
|
||||
|
||||
afterEvaluate {
|
||||
targets.all {
|
||||
sourceSets.all {
|
||||
languageSettings.applySettings()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
(tasks.findByName("jsProcessResources") as? Copy)?.apply {
|
||||
fromJsDependencies("jsRuntimeClasspath")
|
||||
|
Loading…
Reference in New Issue
Block a user