From 894c53531a4cafd0d5ad2d803a0d2149ff0b5f8a Mon Sep 17 00:00:00 2001 From: Victor Turansky Date: Mon, 25 Jan 2021 04:10:59 +0300 Subject: [PATCH 1/2] Kotlin DSL - rename "example-frontend-js" build script --- js/example-frontend-js/{build.gradle => build.gradle.kts} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename js/example-frontend-js/{build.gradle => build.gradle.kts} (100%) diff --git a/js/example-frontend-js/build.gradle b/js/example-frontend-js/build.gradle.kts similarity index 100% rename from js/example-frontend-js/build.gradle rename to js/example-frontend-js/build.gradle.kts From 83b09260370255b707faefe6f36dcdafbb6cc73f Mon Sep 17 00:00:00 2001 From: Victor Turansky Date: Mon, 25 Jan 2021 04:25:58 +0300 Subject: [PATCH 2/2] Kotlin DSL - 'example-frontend-js' --- js/example-frontend-js/build.gradle.kts | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/js/example-frontend-js/build.gradle.kts b/js/example-frontend-js/build.gradle.kts index 7abde63964..6ca6f93cde 100644 --- a/js/example-frontend-js/build.gradle.kts +++ b/js/example-frontend-js/build.gradle.kts @@ -2,32 +2,26 @@ * Copyright 2016-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. */ -project.kotlin { +kotlin { js(LEGACY) { binaries.executable() browser { distribution { - directory = new File(directory.parentFile, "dist") + directory = directory.parentFile.resolve("dist") } - webpackTask { - cssSupport.enabled = true - } - runTask { + commonWebpackConfig { cssSupport.enabled = true } testTask { useKarma { useChromeHeadless() - webpackConfig.cssSupport.enabled = true } } } } +} - sourceSets { - main.dependencies { - implementation "org.jetbrains.kotlinx:kotlinx-html-js:$html_version" - implementation(npm("html-webpack-plugin", "3.2.0")) - } - } +dependencies { + implementation("org.jetbrains.kotlinx:kotlinx-html-js:${version("html")}") + implementation(devNpm("html-webpack-plugin", "3.2.0")) }