Skip to content

Commit

Permalink
Fix build errors
Browse files Browse the repository at this point in the history
  • Loading branch information
DRSchlaubi committed Aug 28, 2024
1 parent 25f3477 commit 3934f45
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 1 deletion.
24 changes: 23 additions & 1 deletion app/shared/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ kotlin {

jsMain {
dependencies {
api("org.jetbrains.kotlin:kotlinx-atomicfu-runtime:1.9.21")
api("org.jetbrains.kotlin:kotlinx-atomicfu-runtime:2.0.20")
}
}

Expand Down Expand Up @@ -119,3 +119,25 @@ android {
sourceCompatibility = JavaVersion.VERSION_1_8
}
}

tasks {
afterEvaluate {
val compilationTasks = kotlin.targets.flatMap {
buildList {
if (it.name != "android") {
add("compileKotlin${it.name.replaceFirstChar { it.titlecase() }}")
val sourcesJarName = "${it.name}SourcesJar"
add(sourcesJarName)
} else {
add("compileDebugKotlinAndroid")
add("compileReleaseKotlinAndroid")
}
}
}
for (task in compilationTasks) {
named(task) {
dependsOn("kspCommonMainKotlinMetadata")
}
}
}
}
5 changes: 5 additions & 0 deletions app/web/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ kotlin {
browser()
binaries.executable()
compilations.all {
packageJson {
devDependencies += "html-webpack-plugin" to "5.6.0"
devDependencies += "browserify" to "17.0.0"
}
compileTaskProvider.configure {
compilerOptions {
freeCompilerArgs.addAll(
Expand All @@ -37,6 +41,7 @@ kotlin {
implementation(compose.material)
implementation(compose.components.resources)
implementation(compose.materialIconsExtended)
implementation(npm("@discord/embedded-app-sdk", "1.4.2"))
}
}
}
Expand Down

0 comments on commit 3934f45

Please sign in to comment.