Use targets hierarchy API #4349
Conversation
osipxd
force-pushed
the
osipxd/targets-hierarchy
branch
5 times, most recently
from
bd34159 to
f68b079
Compare
buildSrc/src/main/kotlin/JsConfig.kt
Outdated
| configureJsTestTasks() | ||
| } | ||
|
|
||
| private fun Project.configureJsTasks() { | ||
| private fun Project.configureJsTasks(nodeJsEnabled: Boolean) { |
There was a problem hiding this comment.
minor: probably this could be inclined into DSL above to simplify the buildscript
| sourceSets { | ||
| jvmMain { | ||
| dependencies { | ||
| if (jdk > 6) { |
There was a problem hiding this comment.
FYI: there is no need anymore to provide different versions of stdlib as everything now is available in just stdlib - which is applied by default.
the same for coroutines dependency.
So it's possible to simplify everything and just not add stdlib/coroutines in platform sourceSets, as coroutines are already added in CommonConfig
| val linuxTest by getting { | ||
| findByName("nixTest")?.let { dependsOn(it) } | ||
| common { | ||
| withCompilations { true } |
There was a problem hiding this comment.
AFAIK this line is not needed
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| configureWasmTasks() |
osipxd
force-pushed
the
osipxd/targets-hierarchy
branch
from
f68b079 to
a5a3b17
Compare
@e5l do you remember what problem was there? The only thing I found is that it was reverted as part of the migration to kotlinx-io (#4032) |
|
@osipxd, import, and build failed on the Windows machine because of the long cache path generated by the Kotlin Gradle plugin. We need to check Windows project import in the IDE |
Okay, I have a windows machine, so I will check |
|
Import and build work fine on my Windows PC. Nevertheless, I've enabled Windows build on the CI to check it also there. |
|
Let's give it a try 🤞 |
Subsystem
Infrastructure
Motivation
KTOR-7501 Simplify targets hierarchy configuration
More context here: #4045
Solution
Configured target hierarchy using new targets hierarchy DSL