diff --git a/.dockerignore b/.dockerignore index fa32247d..48a8b5af 100644 --- a/.dockerignore +++ b/.dockerignore @@ -102,7 +102,6 @@ temp-data/ # =================================================================== # Kotlin Multiplatform specific # =================================================================== -**/kotlin-js-store/ **/build/js/ **/build/compileSync/ **/build/klib/ @@ -119,7 +118,6 @@ temp-data/ # =================================================================== **/prometheus-data/ **/grafana-data/ -**/logs/ **/*.log.* **/log/ @@ -138,21 +136,15 @@ temp-data/ # =================================================================== # OS specific files # =================================================================== -.DS_Store .DS_Store? ._* .Spotlight-V100 .Trashes ehthumbs.db -Thumbs.db # =================================================================== # JetBrains IDE # =================================================================== -.idea/ -*.iws -*.iml -*.ipr out/ .idea_modules/ @@ -203,14 +195,12 @@ secrets/ # =================================================================== TODO*.md NOTES*.md -**/temp/ **/.junie/ # =================================================================== # Keep essential files (override exclusions) # =================================================================== # Gradle wrapper -!gradle/wrapper/gradle-wrapper.jar !gradle/wrapper/gradle-wrapper.properties # Essential configuration files for builds diff --git a/client/common-ui/src/commonTest/kotlin/at/mocode/client/data/service/PingResponseTest.kt b/client/common-ui/src/commonTest/kotlin/at/mocode/client/data/service/PingResponseTest.kt index 62a89669..299fecb0 100644 --- a/client/common-ui/src/commonTest/kotlin/at/mocode/client/data/service/PingResponseTest.kt +++ b/client/common-ui/src/commonTest/kotlin/at/mocode/client/data/service/PingResponseTest.kt @@ -1,7 +1,5 @@ package at.mocode.client.data.service -import kotlinx.serialization.encodeToString -import kotlinx.serialization.decodeFromString import kotlinx.serialization.json.Json import kotlin.test.Test import kotlin.test.assertEquals diff --git a/client/common-ui/src/commonTest/kotlin/at/mocode/client/data/service/PingServiceTest.kt b/client/common-ui/src/commonTest/kotlin/at/mocode/client/data/service/PingServiceTest.kt index 9bf90fae..16bcdee7 100644 --- a/client/common-ui/src/commonTest/kotlin/at/mocode/client/data/service/PingServiceTest.kt +++ b/client/common-ui/src/commonTest/kotlin/at/mocode/client/data/service/PingServiceTest.kt @@ -134,7 +134,7 @@ class PingServiceTest { @Test fun `should properly encapsulate HttpClient lifecycle`() { // Given - var client: HttpClient? = null + val client: HttpClient? = null // When val service = PingService() diff --git a/client/common-ui/src/commonTest/kotlin/at/mocode/client/ui/viewmodel/PingViewModelTest.kt b/client/common-ui/src/commonTest/kotlin/at/mocode/client/ui/viewmodel/PingViewModelTest.kt index 17df789f..444bd650 100644 --- a/client/common-ui/src/commonTest/kotlin/at/mocode/client/ui/viewmodel/PingViewModelTest.kt +++ b/client/common-ui/src/commonTest/kotlin/at/mocode/client/ui/viewmodel/PingViewModelTest.kt @@ -2,8 +2,9 @@ package at.mocode.client.ui.viewmodel import at.mocode.client.data.service.PingResponse import at.mocode.client.data.service.PingService -import kotlinx.coroutines.* -import kotlinx.coroutines.test.* +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.cancel import kotlin.test.* @OptIn(kotlinx.coroutines.ExperimentalCoroutinesApi::class) diff --git a/client/web-app/build.gradle.kts b/client/web-app/build.gradle.kts index 67f60f9c..44af44f4 100644 --- a/client/web-app/build.gradle.kts +++ b/client/web-app/build.gradle.kts @@ -50,10 +50,6 @@ kotlin { } } -compose.experimental { - web.application {} -} - // Web-specific optimizations tasks.named("jsBrowserDevelopmentWebpack") { outputs.upToDateWhen { false } diff --git a/client/web-app/src/jsTest/kotlin/at/mocode/client/web/MainTest.kt b/client/web-app/src/jsTest/kotlin/at/mocode/client/web/MainTest.kt index 96f3b723..43765a29 100644 --- a/client/web-app/src/jsTest/kotlin/at/mocode/client/web/MainTest.kt +++ b/client/web-app/src/jsTest/kotlin/at/mocode/client/web/MainTest.kt @@ -3,7 +3,6 @@ package at.mocode.client.web import kotlin.test.Test import kotlin.test.assertNotNull import kotlin.test.assertTrue -import kotlin.test.assertEquals class MainTest { diff --git a/config/monitoring/prometheus.dev.yml b/config/monitoring/prometheus.dev.yml index 58400dca..900ae610 100644 --- a/config/monitoring/prometheus.dev.yml +++ b/config/monitoring/prometheus.dev.yml @@ -114,7 +114,7 @@ scrape_configs: # Only scrape services that have prometheus.scrape=true - source_labels: [__meta_consul_service_metadata_prometheus_scrape] action: keep - regex: true + regex: "true" # Use service name as job name - source_labels: [__meta_consul_service] @@ -123,12 +123,12 @@ scrape_configs: # Use custom metrics path if specified - source_labels: [__meta_consul_service_metadata_prometheus_path] target_label: __metrics_path__ - regex: (.+) + regex: "(.+)" # Use custom port if specified - source_labels: [__address__, __meta_consul_service_metadata_prometheus_port] target_label: __address__ - regex: ([^:]+)(?::\d+)?;(\d+) + regex: "([^:]+)(?::\d+)?;(\d+)" replacement: $1:$2 # ===================================================================