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

remove node js stuff from gradle (might be causing cache issues?)

Browse source
This commit is contained in:
Adam 2022-06-20 23:57:24 +02:00
parent 4cdbaa9daf
commit 326f081a5e
1 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,7 @@ 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.npm.NpmProject import org.jetbrains.kotlin.gradle.targets.js.npm.NpmProject
import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.RootPackageJsonTask //import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.RootPackageJsonTask
plugins { plugins {
@ -11,15 +11,15 @@ plugins {
id("dev.adamko.kafkatorio.base") id("dev.adamko.kafkatorio.base")
} }
dependencies { //dependencies {
implementation( // implementation(
project.dependencies.platform( // project.dependencies.platform(
"org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:${Versions.kotlinWrappers}" // "org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:${Versions.kotlinWrappers}"
) // )
) // )
} //}
val rootPackageJson by rootProject.tasks.getting(RootPackageJsonTask::class) //val rootPackageJson by rootProject.tasks.getting(RootPackageJsonTask::class)
//fun NpmTask.setNodeModulesPath(path: String): Unit = //fun NpmTask.setNodeModulesPath(path: String): Unit =
// environment.put("NODE_PATH", path) // environment.put("NODE_PATH", path)
@ -30,16 +30,16 @@ val rootPackageJson by rootProject.tasks.getting(RootPackageJsonTask::class)
// https://github.com/node-gradle/gradle-node-plugin/issues/150 // https://github.com/node-gradle/gradle-node-plugin/issues/150
// https://github.com/lamba92/kotlingram/blob/master/examples/js-bot/build.gradle.kts // https://github.com/lamba92/kotlingram/blob/master/examples/js-bot/build.gradle.kts
val nodePath: Directory by extra { //val nodePath: Directory by extra {
val file = rootPackageJson.rootPackageJson.parentFile.normalize() // val file = rootPackageJson.rootPackageJson.parentFile.normalize()
logger.info("Kotlin/JS NODE_PATH: $file") // logger.info("Kotlin/JS NODE_PATH: $file")
project.layout.dir(project.provider { file }).get() // project.layout.dir(project.provider { file }).get()
} //}
val nodeModulesDir: Directory by extra { //val nodeModulesDir: Directory by extra {
val file = nodePath.dir(NpmProject.NODE_MODULES) // val file = nodePath.dir(NpmProject.NODE_MODULES)
logger.info("Kotlin/JS NODE_MODULES: $file") // logger.info("Kotlin/JS NODE_MODULES: $file")
file // file
} //}
relocateKotlinJsStore() relocateKotlinJsStore()