Moved all wasmJs to runningOnLinuxx in gradle, deleted unneded TODOS and dependencies
This commit is contained in:
1 parent
f548a162e7
commit
c5e91fc8ee
6 files changed
+67
-113
No files matched your search
+12
-36
@@ -81,7 +81,6 @@ kotlin {
|
||||
binaries.executable()
|
||||
|
||||
}
|
||||
|
||||
@OptIn(ExperimentalWasmDsl::class)
|
||||
wasmJs {
|
||||
browser {
|
||||
@@ -95,24 +94,7 @@ kotlin {
|
||||
}
|
||||
}
|
||||
binaries.executable()
|
||||
// browser {
|
||||
// val rootDirPath = project.rootDir.path
|
||||
// val projectDirPath = project.projectDir.path
|
||||
// commonWebpackConfig {
|
||||
// outputFileName = "composeApp.js"
|
||||
// devServer = (devServer ?: KotlinWebpackConfig.DevServer()).apply {
|
||||
//// static = (static ?: mutableListOf()).apply {
|
||||
//// // Serve sources to debug inside browser
|
||||
//// add(rootDirPath)
|
||||
//// add(projectDirPath)
|
||||
//// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// binaries.executable()
|
||||
}
|
||||
|
||||
|
||||
linuxX64("linux") {
|
||||
binaries {
|
||||
executable {
|
||||
@@ -213,6 +195,8 @@ kotlin {
|
||||
dependencies {
|
||||
implementation(kotlin(Deps.Common.test))
|
||||
implementation(kotlin(Deps.Common.testAnnotation))
|
||||
implementation(Deps.Common.coroutinesTest)
|
||||
implementation(kotlin("test"))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -237,23 +221,6 @@ kotlin {
|
||||
}
|
||||
}
|
||||
|
||||
val wasmJsMain by getting {
|
||||
dependencies {
|
||||
// implementation(kotlin(Deps.wasmJs.stdLib))
|
||||
implementation(npm(Deps.wasmJs.Npm.libsodiumWrappers.first, Deps.wasmJs.Npm.libsodiumWrappers.second))
|
||||
}
|
||||
}
|
||||
val wasmJsTest by getting {
|
||||
dependencies {
|
||||
implementation(npm(Deps.wasmJs.Npm.libsodiumWrappers.first, Deps.wasmJs.Npm.libsodiumWrappers.second))
|
||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0")
|
||||
|
||||
implementation(kotlin("test"))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
// val nativeMain by creating {
|
||||
// dependsOn(commonMain)
|
||||
// dependencies {
|
||||
@@ -327,7 +294,16 @@ kotlin {
|
||||
implementation(kotlin(Deps.Js.test))
|
||||
}
|
||||
}
|
||||
|
||||
val wasmJsMain by getting {
|
||||
dependencies {
|
||||
implementation(npm(Deps.wasmJs.Npm.libsodiumWrappers.first, Deps.wasmJs.Npm.libsodiumWrappers.second))
|
||||
}
|
||||
}
|
||||
val wasmJsTest by getting {
|
||||
dependencies {
|
||||
implementation(npm(Deps.wasmJs.Npm.libsodiumWrappers.first, Deps.wasmJs.Npm.libsodiumWrappers.second))
|
||||
}
|
||||
}
|
||||
val linuxMain by getting {
|
||||
dependsOn(nativeMain)
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user