resolve conflicts

This commit is contained in:
LeHaine 2022-10-16 15:06:47 -04:00
commit 741d8ac1ed
No known key found for this signature in database
GPG key ID: 8AEC4F9B9F33E9AC
2 changed files with 6 additions and 2 deletions

View file

@ -110,4 +110,8 @@ android {
minSdk = (findProperty("android.minSdk") as String).toInt()
targetSdk = (findProperty("android.targetSdk") as String).toInt()
}
}
}
rootProject.extensions.configure<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension> {
versions.webpackCli.version = "4.10.0"
}

View file

@ -17,4 +17,4 @@ kotlinx-html-js = { module = "org.jetbrains.kotlinx:kotlinx-html-js", version.re
littlekt-core = { module = "com.lehaine.littlekt:core", version.ref = "littlekt" }
[bundles]
plugins = ["plugin-android", "plugin-kotlin"]
plugins = ["plugin-android", "plugin-kotlin"]