mirror of
https://github.com/littlektframework/littlekt-game-template.git
synced 2025-03-19 13:50:33 -06:00
resolve conflicts
This commit is contained in:
commit
741d8ac1ed
2 changed files with 6 additions and 2 deletions
|
@ -110,4 +110,8 @@ android {
|
||||||
minSdk = (findProperty("android.minSdk") as String).toInt()
|
minSdk = (findProperty("android.minSdk") as String).toInt()
|
||||||
targetSdk = (findProperty("android.targetSdk") 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"
|
||||||
|
}
|
||||||
|
|
|
@ -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" }
|
littlekt-core = { module = "com.lehaine.littlekt:core", version.ref = "littlekt" }
|
||||||
|
|
||||||
[bundles]
|
[bundles]
|
||||||
plugins = ["plugin-android", "plugin-kotlin"]
|
plugins = ["plugin-android", "plugin-kotlin"]
|
||||||
|
|
Loading…
Add table
Reference in a new issue