From b889ce9afe07aed800a29a2f51972af10ac0e5ef Mon Sep 17 00:00:00 2001
From: carbotaniuman <41451839+carbotaniuman@users.noreply.github.com>
Date: Sat, 22 Aug 2020 11:08:09 -0500
Subject: [PATCH] Update dependencies and format

---
 build.gradle                                     | 12 ++++++------
 gradle.properties                                |  4 ++--
 src/main/kotlin/mdnet/base/ServerHandler.kt      |  4 ++--
 src/main/kotlin/mdnet/base/server/ImageServer.kt |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4808a71..dfdfeb1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id "java"
-    id "org.jetbrains.kotlin.jvm" version "1.3.72"
-    id "org.jetbrains.kotlin.kapt" version "1.3.72"
+    id "org.jetbrains.kotlin.jvm" version "1.4.0"
+    id "org.jetbrains.kotlin.kapt" version "1.4.0"
     id "application"
     id "com.github.johnrengelman.shadow" version "5.2.0"
     id "com.diffplug.gradle.spotless" version "4.4.0"
@@ -23,7 +23,7 @@ configurations {
 }
 
 dependencies {
-    compileOnly group: "dev.afanasev", name: "sekret-annotation", version: "0.0.3"
+    compileOnly group: "dev.afanasev", name: "sekret-annotation", version: "0.0.7"
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
     implementation "org.jetbrains.kotlin:kotlin-reflect"
@@ -33,16 +33,16 @@ dependencies {
     implementation group: "org.http4k", name: "http4k-core", version: "$http_4k_version"
     implementation group: "org.http4k", name: "http4k-format-jackson", version: "$http_4k_version"
     implementation group: "com.fasterxml.jackson.datatype", name: "jackson-datatype-jsr310", version: "2.11.1"
-    implementation group: "org.http4k", name: "http4k-client-apache", version: "$http_4k_version"
+    implementation group: "org.http4k", name: "http4k-client-apache4", version: "$http_4k_version"
     implementation group: "org.http4k", name: "http4k-server-netty", version: "$http_4k_version"
-    runtimeOnly group: "io.netty", name: "netty-tcnative-boringssl-static", version: "2.0.30.Final"
+    runtimeOnly group: "io.netty", name: "netty-tcnative-boringssl-static", version: "2.0.34.Final"
 
     implementation group: "ch.qos.logback", name: "logback-classic", version: "1.3.0-alpha4"
     implementation group: "org.jetbrains.exposed", name: "exposed-core", version: "$exposed_version"
     implementation group: "org.jetbrains.exposed", name: "exposed-dao", version: "$exposed_version"
     implementation group: "org.jetbrains.exposed", name: "exposed-jdbc", version: "$exposed_version"
 
-    implementation group: "org.xerial", name: "sqlite-jdbc", version: "3.30.1"
+    implementation group: "org.xerial", name: "sqlite-jdbc", version: "3.32.3.2"
 
     implementation "info.picocli:picocli:4.5.0"
     kapt "info.picocli:picocli-codegen:4.5.0"
diff --git a/gradle.properties b/gradle.properties
index 735e665..4939d18 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
-http_4k_version=3.251.0
-exposed_version=0.24.1
\ No newline at end of file
+http_4k_version=3.258.0
+exposed_version=0.26.2
\ No newline at end of file
diff --git a/src/main/kotlin/mdnet/base/ServerHandler.kt b/src/main/kotlin/mdnet/base/ServerHandler.kt
index acca135..6e29c83 100644
--- a/src/main/kotlin/mdnet/base/ServerHandler.kt
+++ b/src/main/kotlin/mdnet/base/ServerHandler.kt
@@ -27,7 +27,7 @@ import mdnet.base.settings.RemoteSettings
 import mdnet.base.settings.ServerSettings
 import org.apache.http.client.config.RequestConfig
 import org.apache.http.impl.client.HttpClients
-import org.http4k.client.ApacheClient
+import org.http4k.client.Apache4Client
 import org.http4k.core.Body
 import org.http4k.core.Method
 import org.http4k.core.Request
@@ -45,7 +45,7 @@ object ServerHandlerJackson : ConfigurableJackson(
 )
 
 class ServerHandler(private val serverSettings: ServerSettings, private val devSettings: DevSettings, private val maxCacheSizeInMebibytes: Long) {
-    private val client = ApacheClient(client = HttpClients.custom()
+    private val client = Apache4Client(client = HttpClients.custom()
         .setDefaultRequestConfig(
             RequestConfig.custom()
                 .apply {
diff --git a/src/main/kotlin/mdnet/base/server/ImageServer.kt b/src/main/kotlin/mdnet/base/server/ImageServer.kt
index 7ba01eb..94323b5 100644
--- a/src/main/kotlin/mdnet/base/server/ImageServer.kt
+++ b/src/main/kotlin/mdnet/base/server/ImageServer.kt
@@ -55,7 +55,7 @@ import mdnet.security.TweetNaclFast
 import org.apache.http.client.config.CookieSpecs
 import org.apache.http.client.config.RequestConfig
 import org.apache.http.impl.client.HttpClients
-import org.http4k.client.ApacheClient
+import org.http4k.client.Apache4Client
 import org.http4k.core.*
 import org.http4k.filter.CachingFilters
 import org.http4k.filter.ServerFilters
@@ -342,7 +342,7 @@ class ImageServer(
 private fun String.isImageMimetype() = this.toLowerCase().startsWith("image/")
 
 fun getServer(cache: DiskLruCache, database: Database, remoteSettings: RemoteSettings, serverSettings: ServerSettings, statistics: AtomicReference<Statistics>, isHandled: AtomicBoolean): Http4kServer {
-    val client = ApacheClient(responseBodyMode = BodyMode.Stream, client = HttpClients.custom()
+    val client = Apache4Client(responseBodyMode = BodyMode.Stream, client = HttpClients.custom()
         .disableConnectionState()
         .setDefaultRequestConfig(
             RequestConfig.custom()