Skip to content

Commit 6fea6ff

Browse files
committed
~
1 parent 4d224ea commit 6fea6ff

File tree

5 files changed

+4
-61
lines changed

5 files changed

+4
-61
lines changed

build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ tasks.withType<KotlinCompile> {
129129
}
130130
dependsOn(":executors:jar")
131131
dependsOn(":indexation:run")
132-
dependsOn(":cache-maker:run")
133132
buildPropertyFile()
134133
}
135134
println("Using Kotlin compiler ${libs.versions.kotlin.get()}")

cache-maker/build.gradle.kts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,6 @@ tasks.withType<JavaExec> {
3131
val composeCacheComposeWasm = "$rootName${File.separator}$cachesComposeWasm"
3232
outputs.dir(cachesComposeWasmFolder)
3333

34-
debugOptions {
35-
enabled = true
36-
port = 5005
37-
server = true
38-
suspend = false
39-
}
40-
4134
args = listOf(
4235
kotlinVersion,
4336
libJVMFolder.asFile.absolutePath,

cache-maker/src/main/kotlin/CacheBuilder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class CacheBuilder(
1212
private val kotlinEnvironment: KotlinEnvironment,
1313
) {
1414
fun compileCache(outputForCache: String) {
15-
val moduleName = "moduleId"
15+
val moduleName = "playground"
1616
usingTempDirectory { outputDir ->
1717
val resource = this::class.java.classLoader.getResource("File.kt")!!.path
1818

common/src/main/kotlin/com/compiler/server/common/components/KotlinEnvironment.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,13 @@ class KotlinEnvironment(
7171
.map { it.absolutePath }
7272
.filter { isKotlinLibrary(File(it)) }
7373
val WASM_LIBRARIES = additionalWasmClasspath
74-
.map { it.path }
74+
.map { it.absolutePath }
7575
.filter { isKotlinLibrary(File(it)) }
7676
val COMPOSE_WASM_LIBRARIES = additionalComposeWasmClasspath
77-
.map { it.path }
77+
.map { it.absolutePath }
7878
.filter { isKotlinLibrary(File(it)) }
7979
val COMPOSE_WASM_COMPILER_PLUGINS = composeWasmCompilerPlugins
80-
.map { it.path }
80+
.map { it.absolutePath }
8181

8282
val composeWasmCompilerPluginOptions = composeWasmCompilerPluginsOptions
8383
.map { "plugin:${it.id}:${it.option}=${it.value}" }

dependencies/build.gradle.kts

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -60,44 +60,6 @@ val kotlinComposeWasmDependency: Configuration by configurations.creating {
6060
}
6161
}
6262

63-
val kotlinComposeWasmIcCache: Configuration by configurations.creating {
64-
isTransitive = false
65-
attributes {
66-
attribute(
67-
KotlinPlatformType.attribute,
68-
KotlinPlatformType.wasm
69-
)
70-
attribute(
71-
KotlinWasmTargetAttribute.wasmTargetAttribute,
72-
KotlinWasmTargetAttribute.js
73-
)
74-
attribute(
75-
LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE,
76-
objects.named(LibraryElements::class.java, "compose-wasm-cache")
77-
)
78-
}
79-
}
80-
81-
val kotlinComposeWasmCopied: Configuration by configurations.creating {
82-
isCanBeResolved = false
83-
isCanBeConsumed = true
84-
85-
attributes {
86-
attribute(
87-
KotlinPlatformType.attribute,
88-
KotlinPlatformType.wasm
89-
)
90-
attribute(
91-
KotlinWasmTargetAttribute.wasmTargetAttribute,
92-
KotlinWasmTargetAttribute.js
93-
)
94-
attribute(
95-
LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE,
96-
objects.named(LibraryElements::class.java, "compose-wasm-copied")
97-
)
98-
}
99-
}
100-
10163
val composeWasmCompilerPlugins: Configuration by configurations.creating {
10264
isTransitive = false
10365
}
@@ -134,15 +96,6 @@ val copyComposeWasmCompilerPlugins by tasks.creating(Copy::class) {
13496
into(libComposeWasmCompilerPluginsFolder)
13597
}
13698

137-
//val copyComposeWasmIcCaches by tasks.creating(Copy::class) {
138-
// from(kotlinComposeWasmIcCache)
139-
// into(cachesComposeWasmFolder)
140-
//}
141-
142-
artifacts.add(kotlinComposeWasmCopied.name, libComposeWasmFolder) {
143-
builtBy(copyComposeWasmDependencies)
144-
}
145-
14699
plugins {
147100
kotlin("jvm")
148101
}
@@ -171,6 +124,4 @@ dependencies {
171124
kotlinComposeWasmDependency(libs.bundles.compose)
172125

173126
composeWasmCompilerPlugins(libs.kotlin.compose.compiler.plugin)
174-
175-
kotlinComposeWasmIcCache(project(":cache-maker"))
176127
}

0 commit comments

Comments
 (0)