diff --git a/examples/multi-project/app/build.gradle.kts b/examples/multi-project/app/build.gradle.kts index 197707a..024b90e 100644 --- a/examples/multi-project/app/build.gradle.kts +++ b/examples/multi-project/app/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("multiplatform") version "1.9.10" + kotlin("multiplatform") // List of releases: https://gitlab.com/opensavvy/kotlin-vite/-/releases id("dev.opensavvy.vite.kotlin") // version "REPLACE THIS" diff --git a/examples/multi-project/build.gradle.kts b/examples/multi-project/build.gradle.kts index 77eb5fc..48cb32f 100644 --- a/examples/multi-project/build.gradle.kts +++ b/examples/multi-project/build.gradle.kts @@ -1,6 +1,6 @@ plugins { base - kotlin("multiplatform") version "1.9.10" apply false + kotlin("multiplatform") version "2.1.20" apply false } repositories { diff --git a/examples/multi-project/core/build.gradle.kts b/examples/multi-project/core/build.gradle.kts index 2ebf3a8..d7896fb 100644 --- a/examples/multi-project/core/build.gradle.kts +++ b/examples/multi-project/core/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("multiplatform") version "1.9.10" + kotlin("multiplatform") } repositories { diff --git a/examples/simple/build.gradle.kts b/examples/simple/build.gradle.kts index 12d55ce..01b70d4 100644 --- a/examples/simple/build.gradle.kts +++ b/examples/simple/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("multiplatform") version "1.9.10" + kotlin("multiplatform") version "2.1.20" // List of releases: https://gitlab.com/opensavvy/kotlin-vite/-/releases id("dev.opensavvy.vite.kotlin") // version "REPLACE THIS" diff --git a/vite-kotlin/src/main/kotlin/tasks/Copy.kt b/vite-kotlin/src/main/kotlin/tasks/Copy.kt index cc7c1d8..16e3a6d 100644 --- a/vite-kotlin/src/main/kotlin/tasks/Copy.kt +++ b/vite-kotlin/src/main/kotlin/tasks/Copy.kt @@ -20,7 +20,7 @@ internal fun createCopyTask(project: Project, name: String, sourceTask: String, group = KotlinVitePlugin.GROUP description = "Prepares the Vite working directory" - dependsOn("jsPackageJson", ":kotlinNodeJsSetup") + dependsOn("jsPackageJson", "kotlinNodeJsSetup") from(project.tasks.named(sourceTask)) into(destination.map { it.dir("kotlin") }) diff --git a/vite-kotlin/src/main/kotlin/tasks/ViteExecTask.kt b/vite-kotlin/src/main/kotlin/tasks/ViteExecTask.kt index 87e0cba..04c3656 100644 --- a/vite-kotlin/src/main/kotlin/tasks/ViteExecTask.kt +++ b/vite-kotlin/src/main/kotlin/tasks/ViteExecTask.kt @@ -6,27 +6,28 @@ import opensavvy.gradle.vite.kotlin.viteBuildDevDir import opensavvy.gradle.vite.kotlin.viteBuildDistDir import opensavvy.gradle.vite.kotlin.viteBuildProdDir import org.gradle.api.Project -import org.gradle.api.file.RegularFile -import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin.Companion.kotlinNodeJsExtension -import org.jetbrains.kotlin.gradle.targets.js.npm.NpmProject +import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsPlugin +import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin import java.io.File private fun ViteExec.execConventions() { dependsOn(":kotlinNpmInstall") group = KotlinVitePlugin.GROUP - val kotlinEnvironment = project.rootProject.kotlinNodeJsExtension - nodePath.set( - kotlinEnvironment - .requireConfigured() - .let { RegularFile { File(it.nodeExecutable) } } - ) - - vitePath.set( - kotlinEnvironment - .projectPackagesDir.parentFile.resolve(NpmProject.NODE_MODULES) - .let { RegularFile { File("$it/vite/bin/vite.js") } } - ) + fun File.child(name: String) = File(this, name) + + nodePath.set { + File(NodeJsPlugin.apply(project).executable.get()) + } + + vitePath.set { + NodeJsRootPlugin.apply(project.rootProject) + .projectPackagesDirectory.get() + .asFile.parentFile + .child("node_modules") + .child(".bin") + .child("vite") + } } internal fun createExecTasks(project: Project) {