Browse Source

Revert "Revert "Add explicit dependencies on modules to make it build with kotlin 1.9.0 (#3374)""

This reverts commit 09bfeab4ea.
pull/3376/head
Igor Demin 1 year ago
parent
commit
17ba8f3a57
  1. 2
      html/buildSrc/gradle.properties
  2. 1
      html/compose-compiler-integration/build.gradle.kts
  3. 2
      html/gradle.properties
  4. 1
      html/integration-core/build.gradle.kts
  5. 694
      html/kotlin-js-store/yarn.lock
  6. 1
      html/test-utils/build.gradle.kts

2
html/buildSrc/gradle.properties

@ -1 +1 @@
kotlin.version=1.8.20 kotlin.version=1.9.0

1
html/compose-compiler-integration/build.gradle.kts

@ -25,6 +25,7 @@ kotlin {
implementation(kotlin("stdlib-js")) implementation(kotlin("stdlib-js"))
implementation(compose.runtime) implementation(compose.runtime)
implementation(project(":html-core")) implementation(project(":html-core"))
implementation(project(":internal-html-core-runtime"))
} }
} }

2
html/gradle.properties

@ -1,4 +1,4 @@
compose.version=1.4.1 compose.version=1.5.0-dev1107
compose.web.buildSamples=false compose.web.buildSamples=false
compose.web.tests.integration.withFirefox compose.web.tests.integration.withFirefox
compose.web.tests.skip.benchmarks=false compose.web.tests.skip.benchmarks=false

1
html/integration-core/build.gradle.kts

@ -42,6 +42,7 @@ kotlin {
dependencies { dependencies {
implementation(kotlin("stdlib-js")) implementation(kotlin("stdlib-js"))
implementation(npm("highlight.js", "10.7.2")) implementation(npm("highlight.js", "10.7.2"))
implementation(project(":internal-html-core-runtime"))
} }
} }

694
html/kotlin-js-store/yarn.lock

File diff suppressed because it is too large Load Diff

1
html/test-utils/build.gradle.kts

@ -24,6 +24,7 @@ kotlin {
sourceSets { sourceSets {
val commonMain by getting { val commonMain by getting {
dependencies { dependencies {
implementation(compose.runtime)
implementation(kotlin("stdlib-common")) implementation(kotlin("stdlib-common"))
implementation(project(":internal-html-core-runtime")) implementation(project(":internal-html-core-runtime"))
} }

Loading…
Cancel
Save