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

bump kvision, remove manual npm version settings (I think it's been fixed now)

Browse source
This commit is contained in:
Adam 2022-09-01 23:18:47 +02:00
parent 02edffa2e9
commit ece583e93c
5 changed files with 94 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,11 +1,11 @@
package dev.adamko.kafkatorio.lang
import dev.adamko.kafkatorio.Versions
//import dev.adamko.kafkatorio.Versions
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.yarn.YarnRootExtension
//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.yarn.YarnRootExtension
//import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.RootPackageJsonTask
@ -50,21 +50,21 @@ plugins {
relocateKotlinJsStore()
plugins.withType<NodeJsRootPlugin> {
configure<NodeJsRootExtension> {
nodeVersion = "16.0.0"
}
}
//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")
}
}
//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")
// }
//}

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

@ -1,9 +1,9 @@
package dev.adamko.kafkatorio.lang
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
//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 {
@ -17,21 +17,21 @@ plugins {
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")
}
}
//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")
// }
//}