diff --git a/web/core/build.gradle b/web/core/build.gradle.kts similarity index 77% rename from web/core/build.gradle rename to web/core/build.gradle.kts index ec87a46066..863929c57e 100644 --- a/web/core/build.gradle +++ b/web/core/build.gradle.kts @@ -20,27 +20,27 @@ kotlin { } sourceSets { - commonMain { + val commonMain by getting { dependencies { implementation(compose.runtime) implementation(kotlin("stdlib-common")) } } - jsMain { + val jsMain by getting { dependencies { implementation(kotlin("stdlib-js")) - implementation(npm('css-typed-om', '0.4.0')) + implementation(npm("css-typed-om", "0.4.0")) } } - jsTest { + val jsTest by getting { dependencies { - implementation kotlin("test-js") + implementation(kotlin("test-js")) } } - jvmMain { + val jvmMain by getting { dependencies { implementation(compose.desktop.currentOs) } diff --git a/web/integration/build.gradle b/web/integration/build.gradle.kts similarity index 78% rename from web/integration/build.gradle rename to web/integration/build.gradle.kts index 0de6cf2e77..ec34431dde 100644 --- a/web/integration/build.gradle +++ b/web/integration/build.gradle.kts @@ -6,14 +6,14 @@ plugins { kotlin { jvm { - jvmTest { + tasks.named("jvmTest") { testLogging.showStandardStreams = true useJUnitPlatform() systemProperty( "COMPOSE_WEB_INTEGRATION_TESTS_DISTRIBUTION", - new File(buildDir, "developmentExecutable") + File(buildDir, "developmentExecutable") ) } } @@ -32,7 +32,7 @@ kotlin { } sourceSets { - commonMain { + val commonMain by getting { dependencies { implementation(compose.runtime) implementation(project(":web-core")) @@ -40,20 +40,20 @@ kotlin { } } - jsMain { + val jsMain by getting { dependencies { implementation(kotlin("stdlib-js")) - implementation(npm('highlight.js', '10.7.2')) + implementation(npm("highlight.js", "10.7.2")) } } - jsTest { + val jsTest by getting { dependencies { - implementation kotlin("test-js") + implementation(kotlin("test-js")) } } - jvmTest { + val jvmTest by getting { dependencies { implementation("org.slf4j:slf4j-api:1.7.30") implementation("org.slf4j:slf4j-simple:1.7.30") @@ -71,4 +71,6 @@ kotlin { } } -jvmTest.dependsOn(jsBrowserDevelopmentWebpack) +tasks.named("jvmTest") { + dependsOn(tasks.named("jsBrowserDevelopmentWebpack")) +} diff --git a/web/settings.gradle b/web/settings.gradle.kts similarity index 75% rename from web/settings.gradle rename to web/settings.gradle.kts index 95ba4862ca..e25f796cfd 100644 --- a/web/settings.gradle +++ b/web/settings.gradle.kts @@ -6,13 +6,13 @@ pluginManagement { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") } maven { - url("https://packages.jetbrains.team/maven/p/ui/dev") + url = uri("https://packages.jetbrains.team/maven/p/ui/dev") } } } -include "web-core" -include "web-integration" +include("web-core") +include("web-integration") project(":web-core").projectDir = file("$rootDir/core") project(":web-integration").projectDir = file("$rootDir/integration")