isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 09:08:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into feature/sync

Browse Source
This commit is contained in:
Alinson S. Xavier
2021-08-22 05:13:37 -05:00
parent 7f1a1add8c f15c660d33
commit e8a4a9740e
165 changed files with 2313 additions and 1415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
uhabits-server/build.gradle.kts
View File

@@ -22,7 +22,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
plugins {
application
id("kotlin")
id("com.github.johnrengelman.shadow") version "6.1.0"
id("com.github.johnrengelman.shadow") version "7.0.0"
}
@@ -33,9 +33,9 @@ application {
}
dependencies {
val ktorVersion = "1.5.4"
val kotlinVersion = "1.5.0"
val logbackVersion = "1.2.3"
val ktorVersion = "1.6.2"
val kotlinVersion = "1.5.21"
val logbackVersion = "1.2.5"
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
implementation("io.ktor:ktor-server-netty:$ktorVersion")
implementation("ch.qos.logback:logback-classic:$logbackVersion")
@@ -43,11 +43,13 @@ dependencies {
implementation("io.ktor:ktor-html-builder:$ktorVersion")
implementation("io.ktor:ktor-jackson:$ktorVersion")
implementation("org.jetbrains:kotlin-css-jvm:1.0.0-pre.148-kotlin-1.4.30")
implementation("io.prometheus:simpleclient:0.10.0")
implementation("io.prometheus:simpleclient_httpserver:0.10.0")
implementation("io.prometheus:simpleclient_hotspot:0.10.0")
implementation("io.prometheus:simpleclient:0.11.0")
implementation("io.prometheus:simpleclient_httpserver:0.11.0")
implementation("io.prometheus:simpleclient_hotspot:0.11.0")
testImplementation("io.ktor:ktor-server-tests:$ktorVersion")
testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")
testImplementation(kotlin("test"))
testImplementation(kotlin("test-junit"))
}
tasks.withType<ShadowJar> {