diff --git a/web/build.gradle.kts b/web/build.gradle.kts index 3c18e3cce6..5ce9c8ddd7 100644 --- a/web/build.gradle.kts +++ b/web/build.gradle.kts @@ -2,6 +2,10 @@ import org.gradle.api.tasks.testing.AbstractTestTask import org.gradle.api.tasks.testing.logging.TestExceptionFormat import org.jetbrains.compose.gradle.kotlinKarmaConfig +plugins { + kotlin("multiplatform") apply false +} + val COMPOSE_WEB_VERSION: String by project val COMPOSE_REPO_USERNAME: String? by project val COMPOSE_REPO_KEY: String? by project @@ -24,12 +28,16 @@ rootProject.plugins.withType().nodeVersion = "16.13.1" } -subprojects { +subprojects { apply(plugin = "maven-publish") group = "org.jetbrains.compose.web" version = COMPOSE_WEB_VERSION + tasks.withType() { + kotlinOptions.jvmTarget = "11" + } + pluginManager.withPlugin("maven-publish") { configure { repositories { @@ -116,4 +124,3 @@ subprojects { } } } - diff --git a/web/settings.gradle.kts b/web/settings.gradle.kts index ba5d2c96ed..bd278bba7f 100644 --- a/web/settings.gradle.kts +++ b/web/settings.gradle.kts @@ -1,4 +1,3 @@ - pluginManagement { val COMPOSE_CORE_VERSION: String by settings println("[build] compose core version: $COMPOSE_CORE_VERSION") @@ -24,13 +23,12 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - repos?.forEach { urlPath -> maven { url = uri(urlPath) } } - + mavenLocal() maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") } diff --git a/web/widgets/build.gradle.kts b/web/widgets/build.gradle.kts index d0e0e70b18..8f5a9fcc5f 100644 --- a/web/widgets/build.gradle.kts +++ b/web/widgets/build.gradle.kts @@ -49,3 +49,7 @@ kotlin { } } } + +rootProject.plugins.withType { + rootProject.the().nodeVersion = "16.0.0" +}