Upgrade to kotlin 1.9.22 (#99)

Makefile

@@ -1,4 +1,4 @@
-VERSION=1.20.0
+VERSION=1.21.0
 
 default: versioncheck
 

README.md

@@ -113,8 +113,8 @@ scrape_configs:
 The docker images are available via:
 
 ```bash
-docker pull pambrose/prometheus-proxy:1.20.0
-docker pull pambrose/prometheus-agent:1.20.0
+docker pull pambrose/prometheus-proxy:1.21.0
+docker pull pambrose/prometheus-agent:1.21.0
 ```
 
 Start a proxy container with:
@@ -123,15 +123,15 @@ Start a proxy container with:
 docker run --rm -p 8082:8082 -p 8092:8092 -p 50051:50051 -p 8080:8080 \
         --env ADMIN_ENABLED=true \
         --env METRICS_ENABLED=true \
-        pambrose/prometheus-proxy:1.20.0
+        pambrose/prometheus-proxy:1.21.0
 ```
 
 Start an agent container with:
 
 ```bash
 docker run --rm -p 8083:8083 -p 8093:8093 \
         --env AGENT_CONFIG='https://raw.githubusercontent.com/pambrose/prometheus-proxy/master/examples/simple.conf' \
-        pambrose/prometheus-agent:1.20.0
+        pambrose/prometheus-agent:1.21.0
 ```
 
 Using the config
@@ -149,7 +149,7 @@ is in your current directory, run an agent container with:
 docker run --rm -p 8083:8083 -p 8093:8093 \
     --mount type=bind,source="$(pwd)"/prom-agent.conf,target=/app/prom-agent.conf \
     --env AGENT_CONFIG=prom-agent.conf \
-    pambrose/prometheus-agent:1.20.0
+    pambrose/prometheus-agent:1.21.0
 ```
 
 **Note:** The `WORKDIR` of the proxy and agent images is `/app`, so make sure to use `/app` as the base directory in the
@@ -297,15 +297,15 @@ docker run --rm -p 8082:8082 -p 8092:8092 -p 50440:50440 -p 8080:8080 \
     --env PROXY_CONFIG=tls-no-mutual-auth.conf \
     --env ADMIN_ENABLED=true \
     --env METRICS_ENABLED=true \
-    pambrose/prometheus-proxy:1.20.0
+    pambrose/prometheus-proxy:1.21.0
 
 docker run --rm -p 8083:8083 -p 8093:8093 \
     --mount type=bind,source="$(pwd)"/testing/certs,target=/app/testing/certs \
     --mount type=bind,source="$(pwd)"/examples/tls-no-mutual-auth.conf,target=/app/tls-no-mutual-auth.conf \
     --env AGENT_CONFIG=tls-no-mutual-auth.conf \
     --env PROXY_HOSTNAME=mymachine.lan:50440 \
     --name docker-agent \
-    pambrose/prometheus-agent:1.20.0
+    pambrose/prometheus-agent:1.21.0
 ```
 
 **Note:** The `WORKDIR` of the proxy and agent images is `/app`, so make sure to use `/app` as the base directory in the

bin/docker-agent.sh

@@ -3,4 +3,4 @@
 docker run --rm -p 8083:8083 -p 8093:8093 \
   --env AGENT_CONFIG='https://raw.githubusercontent.com/pambrose/prometheus-proxy/master/examples/simple.conf' \
   --env PROXY_HOSTNAME=mymachine.lan \
-  pambrose/prometheus-agent:1.20.0
+  pambrose/prometheus-agent:1.21.0

bin/docker-proxy.sh

@@ -2,4 +2,4 @@
 
 docker run --rm -p 8082:8082 -p 8092:8092 -p 50051:50051 -p 8080:8080 \
   --env PROXY_CONFIG='https://raw.githubusercontent.com/pambrose/prometheus-proxy/master/examples/simple.conf' \
-  pambrose/prometheus-proxy:1.20.0
+  pambrose/prometheus-proxy:1.21.0

build.gradle

@@ -2,20 +2,20 @@ plugins {
     id 'idea'
     id 'java'
     id 'maven-publish'
-    id 'org.jetbrains.kotlin.jvm' version '1.9.21'
+    id 'org.jetbrains.kotlin.jvm' version '1.9.22'
     id 'com.google.protobuf' version '0.9.4'   // Keep in sync with grpc
-    id 'org.jmailen.kotlinter' version "4.1.0"
+    id 'org.jmailen.kotlinter' version "4.1.1"
     id "com.github.ben-manes.versions" version '0.50.0'
     id 'com.github.johnrengelman.shadow' version '8.1.1'
-    id 'com.github.gmazzo.buildconfig' version '4.2.0'
+    id 'com.github.gmazzo.buildconfig' version '5.3.2'
     id 'org.jetbrains.kotlinx.kover' version '0.7.5'
     // Turn these off until jacoco fixes their kotlin 1.5.0 SMAP issue
     // id 'jacoco'
     // id 'com.github.kt3k.coveralls' version '2.12.0'
 }
 
 group = 'io.prometheus'
-version = '1.20.0'
+version = '1.21.0'
 
 sourceCompatibility = JavaVersion.VERSION_17
 targetCompatibility = JavaVersion.VERSION_17
@@ -70,14 +70,14 @@ dependencies {
 
     implementation "io.prometheus:simpleclient:$prometheus_version"
 
-    implementation 'io.ktor:ktor-client-jvm:2.3.6'
-    implementation 'io.ktor:ktor-client-cio-jvm:2.3.6'
-    implementation 'io.ktor:ktor-client-auth-jvm:2.3.6'
-    implementation 'io.ktor:ktor-network-jvm:2.3.6'
-    implementation 'io.ktor:ktor-network-tls-jvm:2.3.6'
+    implementation "io.ktor:ktor-client-jvm:$ktor_version"
+    implementation "io.ktor:ktor-client-cio-jvm:$ktor_version"
+    implementation "io.ktor:ktor-client-auth-jvm:$ktor_version"
+    implementation "io.ktor:ktor-network-jvm:$ktor_version"
+    implementation "io.ktor:ktor-network-tls-jvm:$ktor_version"
 
-    implementation 'io.ktor:ktor-server-jvm:2.3.6'
-    implementation 'io.ktor:ktor-server-cio-jvm:2.3.6'
+    implementation "io.ktor:ktor-server-jvm:$ktor_version"
+    implementation "io.ktor:ktor-server-cio-jvm:$ktor_version"
     implementation "io.ktor:ktor-server-call-logging:$ktor_version"
     implementation "io.ktor:ktor-server-compression:$ktor_version"
 

etc/compose/proxy.yml

@@ -1,6 +1,6 @@
 prometheus-proxy:
   autoredeploy: true
-  image: 'pambrose/prometheus-proxy:1.20.0'
+  image: 'pambrose/prometheus-proxy:1.21.0'
   ports:
     - '8080:8080'
     - '8082:8082'

gradle.properties

@@ -11,14 +11,14 @@ org.gradle.jvmargs=-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF
 annotation_version=1.3.2
 dropwizard_version=4.2.23
 gengrpc_version=1.4.1
-grpc_version=1.60.0
+grpc_version=1.60.1
 jcommander_version=1.82
-jetty_version=10.0.18
+jetty_version=10.0.19
 junit_version=5.10.1
 kluent_version=1.73
-kotlin_version=1.9.21
+kotlin_version=1.9.22
 krotodc_version=1.0.6
-ktor_version=2.3.6
+ktor_version=2.3.7
 logback_version=1.4.14
 logging_version=4.0.0-beta-2
 # Keep in sync with grpc
@@ -29,5 +29,5 @@ protoc_version=3.24.0
 serialization_version=1.6.2
 slf4j_version=2.0.9
 typesafe_version=1.4.3
-utils_version=1.43.0
-zipkin_version=5.16.0
+utils_version=1.44.0
+zipkin_version=5.17.1