Skip to content

Commit e58e0c6

Browse files
committed
Only wasm is used with compose by default
1 parent b533dc4 commit e58e0c6

File tree

3 files changed

+12
-15
lines changed

3 files changed

+12
-15
lines changed

dependencies/build.gradle.kts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,5 @@ dependencies {
9393
kotlinWasmDependency("org.jetbrains.compose.material:material:1.6.0-alpha01")
9494
kotlinWasmDependency("org.jetbrains.compose.components:components-resources:1.6.0-alpha01")
9595

96-
kotlinJsDependency("org.jetbrains.compose.runtime:runtime:1.6.0-alpha01")
97-
kotlinJsDependency("org.jetbrains.compose.ui:ui:1.6.0-alpha01")
98-
kotlinJsDependency("org.jetbrains.compose.animation:animation:1.6.0-alpha01")
99-
kotlinJsDependency("org.jetbrains.compose.animation:animation-graphics:1.6.0-alpha01")
100-
kotlinJsDependency("org.jetbrains.compose.foundation:foundation:1.6.0-alpha01")
101-
kotlinJsDependency("org.jetbrains.compose.material:material:1.6.0-alpha01")
102-
kotlinJsDependency("org.jetbrains.compose.components:components-resources:1.6.0-alpha01")
103-
10496
compilerPlugins("org.jetbrains.compose.compiler:compiler-hosted:1.5.4")
10597
}

indexation/src/main/kotlin/Main.kt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,17 @@ fun main(args: Array<String>) {
1212

1313
WebIndexationBuilder(
1414
kotlinEnvironment = kotlinEnvironment,
15-
configuration = kotlinEnvironment.jsConfiguration,
15+
inputConfiguration = kotlinEnvironment.jsConfiguration,
1616
libraries = kotlinEnvironment.JS_LIBRARIES,
17-
compilerPlugins = false
17+
compilerPlugins = false,
18+
platformConfiguration = kotlinEnvironment.jsConfiguration
1819
).writeIndexesToFile(outputPathJs)
1920

2021
WebIndexationBuilder(
2122
kotlinEnvironment = kotlinEnvironment,
22-
configuration = kotlinEnvironment.wasmConfiguration,
23+
inputConfiguration = kotlinEnvironment.wasmConfiguration,
2324
libraries = kotlinEnvironment.WASM_LIBRARIES,
24-
compilerPlugins = true
25+
compilerPlugins = true,
26+
platformConfiguration = kotlinEnvironment.wasmConfiguration
2527
).writeIndexesToFile(outputPathWasm)
2628
}

indexation/src/main/kotlin/WebIndexationBuilder.kt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,14 @@ import java.io.File
1111

1212
class WebIndexationBuilder(
1313
private val kotlinEnvironment: KotlinEnvironment,
14-
private val configuration: CompilerConfiguration,
14+
inputConfiguration: CompilerConfiguration,
1515
private val libraries: List<String>,
16-
private val compilerPlugins: Boolean
16+
private val compilerPlugins: Boolean,
17+
private val platformConfiguration: CompilerConfiguration
1718
): IndexationBuilder() {
1819

20+
private val configuration = inputConfiguration.copy()
21+
1922
override fun getAllIndexes(): List<ImportInfo> =
2023
kotlinEnvironment.environment { coreEnvironment ->
2124
val project = coreEnvironment.project
@@ -34,7 +37,7 @@ class WebIndexationBuilder(
3437
configuration,
3538
libraries.filter { isKotlinLibrary(File(it)) },
3639
friendDependencies = emptyList(),
37-
analyzer = AnalyzerWithCompilerReport(kotlinEnvironment.jsConfiguration),
40+
analyzer = AnalyzerWithCompilerReport(platformConfiguration),
3841
)
3942

4043
val mds = sourceModule.allDependencies.map {

0 commit comments

Comments
 (0)