From 326f081a5e4c3a08467ae9e482397d6a88bed87b Mon Sep 17 00:00:00 2001 From: Adam <897017+aSemy@users.noreply.github.com> Date: Mon, 20 Jun 2022 23:57:24 +0200 Subject: [PATCH] remove node js stuff from gradle (might be causing cache issues?) --- .../kafkatorio/lang/kotlin-js.gradle.kts | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/lang/kotlin-js.gradle.kts b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/lang/kotlin-js.gradle.kts index 68bf4cf..6d2168b 100644 --- a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/lang/kotlin-js.gradle.kts +++ b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/lang/kotlin-js.gradle.kts @@ -3,7 +3,7 @@ package dev.adamko.kafkatorio.lang import dev.adamko.kafkatorio.Versions import dev.adamko.kafkatorio.relocateKotlinJsStore 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 { @@ -11,15 +11,15 @@ plugins { id("dev.adamko.kafkatorio.base") } -dependencies { - implementation( - project.dependencies.platform( - "org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:${Versions.kotlinWrappers}" - ) - ) -} +//dependencies { +// implementation( +// project.dependencies.platform( +// "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 = // 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/lamba92/kotlingram/blob/master/examples/js-bot/build.gradle.kts -val nodePath: Directory by extra { - val file = rootPackageJson.rootPackageJson.parentFile.normalize() - logger.info("Kotlin/JS NODE_PATH: $file") - project.layout.dir(project.provider { file }).get() -} +//val nodePath: Directory by extra { +// val file = rootPackageJson.rootPackageJson.parentFile.normalize() +// logger.info("Kotlin/JS NODE_PATH: $file") +// project.layout.dir(project.provider { file }).get() +//} -val nodeModulesDir: Directory by extra { - val file = nodePath.dir(NpmProject.NODE_MODULES) - logger.info("Kotlin/JS NODE_MODULES: $file") - file -} +//val nodeModulesDir: Directory by extra { +// val file = nodePath.dir(NpmProject.NODE_MODULES) +// logger.info("Kotlin/JS NODE_MODULES: $file") +// file +//} relocateKotlinJsStore()