lazzexus/Kafkatorio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

try fixing projects must be configuring bug

Browse source
This commit is contained in:
Adam 2022-07-06 16:18:48 +02:00
parent 90dc520d22
commit b9b6065735
3 changed files with 49 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

25
buildSrc/src/main/kotlin/dev/adamko/kafkatorio/lang/kotlin-js.gradle.kts
View file

@ -2,7 +2,11 @@ package dev.adamko.kafkatorio.lang
import dev.adamko.kafkatorio.Versions import dev.adamko.kafkatorio.Versions
import dev.adamko.kafkatorio.relocateKotlinJsStore import dev.adamko.kafkatorio.relocateKotlinJsStore
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
import org.jetbrains.kotlin.gradle.targets.js.npm.NpmProject import org.jetbrains.kotlin.gradle.targets.js.npm.NpmProject
import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension
//import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.RootPackageJsonTask //import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.RootPackageJsonTask
@ -42,4 +46,25 @@ plugins {
// file // file
//} //}
relocateKotlinJsStore() relocateKotlinJsStore()
plugins.withType<NodeJsRootPlugin> {
configure<NodeJsRootExtension> {
nodeVersion = "16.0.0"
}
}
afterEvaluate {
rootProject.extensions.configure<NodeJsRootExtension> {
// https://github.com/rjaros/kvision/issues/410
versions.webpackCli.version = "4.10.0"
versions.webpackDevServer.version = "4.9.2"
}
rootProject.extensions.configure<YarnRootExtension> {
resolution("http-proxy-middleware", "^2.0.6")
}
}

23
buildSrc/src/main/kotlin/dev/adamko/kafkatorio/lang/kotlin-multiplatform.gradle.kts
View file

@ -1,6 +1,9 @@
package dev.adamko.kafkatorio.lang package dev.adamko.kafkatorio.lang
import dev.adamko.kafkatorio.relocateKotlinJsStore import dev.adamko.kafkatorio.relocateKotlinJsStore
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension
plugins { plugins {
@ -11,3 +14,23 @@ plugins {
relocateKotlinJsStore() relocateKotlinJsStore()
plugins.withType<NodeJsRootPlugin> {
configure<NodeJsRootExtension> {
nodeVersion = "16.0.0"
}
}
afterEvaluate {
rootProject.extensions.configure<NodeJsRootExtension> {
// https://github.com/rjaros/kvision/issues/410
versions.webpackCli.version = "4.10.0"
versions.webpackDevServer.version = "4.9.2"
}
rootProject.extensions.configure<YarnRootExtension> {
resolution("http-proxy-middleware", "^2.0.6")
}
}

16
modules/web-map/build.gradle.kts
View file

@ -1,7 +1,5 @@
import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension
plugins { plugins {
@ -17,18 +15,6 @@ kvision {
} }
afterEvaluate {
rootProject.extensions.configure<NodeJsRootExtension> {
// https://github.com/rjaros/kvision/issues/410
versions.webpackCli.version = "4.10.0"
versions.webpackDevServer.version = "4.9.2"
}
rootProject.extensions.configure<YarnRootExtension> {
resolution("http-proxy-middleware", "^2.0.6")
}
}
kotlin { kotlin {
js(IR) { js(IR) {
browser { browser {
@ -124,7 +110,7 @@ kotlin {
test { test {
dependencies { dependencies {
implementation(kotlin("test-js")) implementation(kotlin("test"))
kvision("kvision-testutils") kvision("kvision-testutils")
// implementation(npm("karma", "^6.3.16")) // implementation(npm("karma", "^6.3.16"))