Browse Source

fix compose-html build.gradle.kts for tests

pull/5210/head
Oleksandr.Karpovich 11 months ago
parent
commit
f9c8448768
  1. 8
      html/compose-compiler-integration/main-template/build.gradle.kts
  2. 2
      html/compose-compiler-integration/main-template/gradle/wrapper/gradle-wrapper.properties
  3. 9
      html/compose-compiler-integration/main-template/lib/build.gradle.kts
  4. 2
      html/compose-compiler-integration/main-template/settings.gradle.kts

8
html/compose-compiler-integration/main-template/build.gradle.kts

@ -1,12 +1,13 @@
plugins { plugins {
kotlin("multiplatform") kotlin("multiplatform")
id("org.jetbrains.compose") id("org.jetbrains.compose")
id("org.jetbrains.kotlin.plugin.compose")
} }
repositories { repositories {
mavenLocal()
mavenCentral() mavenCentral()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
mavenLocal()
} }
kotlin { kotlin {
@ -22,8 +23,11 @@ kotlin {
implementation(kotlin("stdlib-common")) implementation(kotlin("stdlib-common"))
implementation(compose.runtime) implementation(compose.runtime)
implementation(project(":lib")) implementation(project(":lib"))
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0-RC") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
} }
} }
} }
} }
tasks.findByName("jsBrowserProductionWebpack")!!.mustRunAfter("jsDevelopmentExecutableCompileSync")
tasks.findByName("jsNodeRun")!!.mustRunAfter("jsProductionExecutableCompileSync")

2
html/compose-compiler-integration/main-template/gradle/wrapper/gradle-wrapper.properties vendored

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

9
html/compose-compiler-integration/main-template/lib/build.gradle.kts

@ -1,12 +1,13 @@
plugins { plugins {
kotlin("multiplatform")// version "1.5.10" kotlin("multiplatform")// version "1.5.10"
id("org.jetbrains.compose")// version (System.getenv("COMPOSE_INTEGRATION_VERSION") ?: "0.0.0-SNASPHOT") id("org.jetbrains.compose")// version (System.getenv("COMPOSE_INTEGRATION_VERSION") ?: "0.0.0-SNASPHOT")
id("org.jetbrains.kotlin.plugin.compose")
} }
repositories { repositories {
mavenLocal()
mavenCentral() mavenCentral()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
mavenLocal()
} }
kotlin { kotlin {
@ -21,8 +22,12 @@ kotlin {
dependencies { dependencies {
implementation(kotlin("stdlib-common")) implementation(kotlin("stdlib-common"))
implementation(compose.runtime) implementation(compose.runtime)
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0-RC") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
} }
} }
} }
} }
tasks.findByName("jsBrowserProductionWebpack")!!.mustRunAfter("jsDevelopmentExecutableCompileSync")
tasks.findByName("jsNodeRun")!!.mustRunAfter("jsProductionExecutableCompileSync")

2
html/compose-compiler-integration/main-template/settings.gradle.kts

@ -1,10 +1,10 @@
pluginManagement { pluginManagement {
repositories { repositories {
mavenLocal()
gradlePluginPortal() gradlePluginPortal()
maven { maven {
url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev")
} }
mavenLocal()
} }
resolutionStrategy { resolutionStrategy {

Loading…
Cancel
Save