Merge branch 'dev' into feature/sync2

This commit is contained in:
2022-09-11 06:05:23 -05:00
202 changed files with 2647 additions and 1956 deletions

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 "7.1.0"
id("com.github.johnrengelman.shadow") version "7.1.2"
id("org.jlleitschuh.gradle.ktlint")
}
@@ -33,9 +33,9 @@ application {
}
dependencies {
val ktorVersion = "1.6.6"
val kotlinVersion = "1.6.0"
val logbackVersion = "1.2.7"
val ktorVersion = "1.6.8"
val kotlinVersion = "1.7.10"
val logbackVersion = "1.4.0"
implementation(project(":uhabits-core"))
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
implementation("io.ktor:ktor-server-netty:$ktorVersion")
@@ -44,9 +44,9 @@ 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.12.0")
implementation("io.prometheus:simpleclient_httpserver:0.12.0")
implementation("io.prometheus:simpleclient_hotspot:0.12.0")
implementation("io.prometheus:simpleclient:0.16.0")
implementation("io.prometheus:simpleclient_httpserver:0.16.0")
implementation("io.prometheus:simpleclient_hotspot:0.16.0")
testImplementation("io.ktor:ktor-server-tests:$ktorVersion")
testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")
testImplementation(kotlin("test"))