fix compose-html build.gradle.kts for tests

JetBrains · Jan 22, 2025 · f9c8448 · f9c8448
1 parent c2243da
commit f9c8448
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/html/compose-compiler-integration/main-template/build.gradle.kts b/html/compose-compiler-integration/main-template/build.gradle.kts
@@ -1,12 +1,13 @@
 plugins {
     kotlin("multiplatform")
     id("org.jetbrains.compose")
+    id("org.jetbrains.kotlin.plugin.compose")
 }
 
 repositories {
-    mavenLocal()
     mavenCentral()
     maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
+    mavenLocal()
 }
 
 kotlin {
@@ -22,8 +23,11 @@ kotlin {
                 implementation(kotlin("stdlib-common"))
                 implementation(compose.runtime)
                 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")
diff --git a/html/compose-compiler-integration/main-template/gradle/wrapper/gradle-wrapper.properties b/html/compose-compiler-integration/main-template/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 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
 zipStorePath=wrapper/dists
diff --git a/html/compose-compiler-integration/main-template/lib/build.gradle.kts b/html/compose-compiler-integration/main-template/lib/build.gradle.kts
@@ -1,12 +1,13 @@
 plugins {
     kotlin("multiplatform")// version "1.5.10"
     id("org.jetbrains.compose")// version (System.getenv("COMPOSE_INTEGRATION_VERSION") ?: "0.0.0-SNASPHOT")
+    id("org.jetbrains.kotlin.plugin.compose")
 }
 
 repositories {
-    mavenLocal()
     mavenCentral()
     maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
+    mavenLocal()
 }
 
 kotlin {
@@ -21,8 +22,12 @@ kotlin {
             dependencies {
                 implementation(kotlin("stdlib-common"))
                 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")
diff --git a/html/compose-compiler-integration/main-template/settings.gradle.kts b/html/compose-compiler-integration/main-template/settings.gradle.kts
@@ -1,10 +1,10 @@
 pluginManagement {
     repositories {
-        mavenLocal()
         gradlePluginPortal()
         maven {
             url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev")
         }
+        mavenLocal()
     }
 
     resolutionStrategy {