kscience/gradle-tools
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 9 Wiki Activity

Fix language settings

Browse Source
This commit is contained in:
Alexander Nozik 2021-09-27 20:18:38 +03:00
parent 0415ed30d5
commit 680bd9ed33
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gradle/libs.versions.toml
View File

@ -1,6 +1,6 @@
[versions] [versions]
tools = "0.10.4" tools = "0.10.4"
kotlin = "1.5.31" kotlin = "1.6.0-M1"
atomicfu = "0.16.2" atomicfu = "0.16.2"
binary-compatibility-validator = "0.7.1" binary-compatibility-validator = "0.7.1"
changelog = "1.3.0" changelog = "1.3.0"
@ -14,11 +14,11 @@ kotlinx-datetime = "0.2.1"
kotlinx-html = "0.7.3" kotlinx-html = "0.7.3"
kotlinx-knit = "0.2.3" kotlinx-knit = "0.2.3"
kotlinx-nodejs = "0.0.7" kotlinx-nodejs = "0.0.7"
kotlinx-serialization = "1.3.0-RC" kotlinx-serialization = "1.3.0"
ktor = "1.6.3" ktor = "1.6.3"
xmlutil = "0.83.0" xmlutil = "0.83.0"
yamlkt = "0.10.2" 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] [libraries]
atomicfu-gradle = { module = "org.jetbrains.kotlinx:atomicfu-gradle-plugin", version.ref = "atomicfu" } atomicfu-gradle = { module = "org.jetbrains.kotlinx:atomicfu-gradle-plugin", version.ref = "atomicfu" }

17
src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt
View File

@ -28,12 +28,11 @@ public open class KScienceCommonPlugin : Plugin<Project> {
configure<KotlinJvmProjectExtension> { configure<KotlinJvmProjectExtension> {
explicitApiWarning() explicitApiWarning()
sourceSets["main"].apply { sourceSets.all {
languageSettings.applySettings() languageSettings.applySettings()
} }
sourceSets["test"].apply { sourceSets["test"].apply {
languageSettings.applySettings()
dependencies { dependencies {
implementation(kotlin("test-junit5")) implementation(kotlin("test-junit5"))
implementation("org.junit.jupiter:junit-jupiter:5.6.1") 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() languageSettings.applySettings()
}
sourceSets["main"].apply {
dependencies { dependencies {
api(project.dependencies.platform("org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:${KScienceVersions.jsBom}")) api(project.dependencies.platform("org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:${KScienceVersions.jsBom}"))
} }
} }
sourceSets["test"].apply { sourceSets["test"].apply {
languageSettings.applySettings()
dependencies { dependencies {
implementation(kotlin("test-js")) implementation(kotlin("test-js"))
} }
@ -138,12 +139,8 @@ public open class KScienceCommonPlugin : Plugin<Project> {
} }
} }
afterEvaluate { sourceSets.all {
targets.all { languageSettings.applySettings()
sourceSets.all {
languageSettings.applySettings()
}
}
} }
(tasks.findByName("jsProcessResources") as? Copy)?.apply { (tasks.findByName("jsProcessResources") as? Copy)?.apply {