Upgrade http4k, Kotlin, Gradle (#7391)

* tidy imports and code
adding virtual hosting to apache server implementation

* upgrade http4k

* readded missed project directory

* upgrade http4k, kotlin, gradle images

frameworks/Kotlin/http4k/apache/build.gradle

@@ -1,6 +1,6 @@
 dependencies {
-    compile project(":core")
-    compile "org.http4k:http4k-server-apache:$http4k_version"
+    api project(":core")
+    api "org.http4k:http4k-server-apache:$http4k_version"
 }
 
 apply plugin: 'application'

frameworks/Kotlin/http4k/apache/src/main/kotlin/Http4kApacheServer.kt

@@ -15,8 +15,8 @@ fun main() {
 }
 
 private class TfbApacheServer(val port: Int) : ServerConfig {
-    override fun toServer(httpHandler: HttpHandler): Http4kServer = object : Http4kServer {
-        val handler = Http4kRequestHandler(httpHandler)
+    override fun toServer(http: HttpHandler): Http4kServer = object : Http4kServer {
+        val handler = Http4kRequestHandler(http)
 
         val server = ServerBootstrap.bootstrap()
             .setListenerPort(port)

frameworks/Kotlin/http4k/apache4/build.gradle

@@ -1,6 +1,6 @@
 dependencies {
-    compile project(":core")
-    compile "org.http4k:http4k-server-apache4:$http4k_version"
+    api project(":core")
+    api "org.http4k:http4k-server-apache4:$http4k_version"
 }
 
 apply plugin: 'application'

frameworks/Kotlin/http4k/build.gradle

@@ -1,49 +1,45 @@
 buildscript {
-    ext.kotlin_version = "1.3.72"
-    ext.http4k_version = "3.260.0"
+    ext.kotlin_version = "1.6.21"
+    ext.http4k_version = "4.25.16.2"
 
     repositories {
         mavenCentral()
-        jcenter()
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
     }
 
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
+        classpath 'com.github.jengelman.gradle.plugins:shadow:6.1.0'
     }
 }
 
 allprojects {
-
     repositories {
         mavenCentral()
-        jcenter()
     }
 
     apply plugin: "kotlin"
 
-    compileKotlin.kotlinOptions.jvmTarget = "1.8"
+    compileKotlin.kotlinOptions.jvmTarget = "11"
 
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
 
     version = project.hasProperty('releaseVersion') ? project.releaseVersion : 'LOCAL'
     group = 'org.http4k'
 
-    compileTestKotlin {
-        kotlinOptions {
-            languageVersion = "1.3"
-        }
-    }
+    compileTestKotlin.kotlinOptions.languageVersion = "1.6"
 }
 
 dependencies {
-    compile project(":core")
-    compile project(":apache")
-    compile project(":jetty")
-    compile project(":ktorcio")
-    compile project(":ktornetty")
-    compile project(":netty")
-    compile project(":ratpack")
-    compile project(":undertow")
+    api(project(":core"))
+    api(project(":apache"))
+    api(project(":jetty"))
+    api(project(":ktorcio"))
+    api(project(":ktornetty"))
+    api(project(":netty"))
+    api(project(":ratpack"))
+    api(project(":undertow"))
 }

frameworks/Kotlin/http4k/core/build.gradle

@@ -1,12 +1,12 @@
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    compile "org.http4k:http4k-core:$http4k_version"
-    compile "org.http4k:http4k-format-jackson:$http4k_version"
-    compile "org.http4k:http4k-template-pebble:$http4k_version"
-    compile "org.apache.commons:commons-lang3:3.11"
-    compile "com.zaxxer:HikariCP:3.4.5"
-    compile "org.postgresql:postgresql:42.2.16"
-    compile "org.cache2k:cache2k-base-bom:1.2.4.Final"
+    api "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    api "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    api "org.http4k:http4k-core:$http4k_version"
+    api "org.http4k:http4k-format-jackson:$http4k_version"
+    api "org.http4k:http4k-template-pebble:$http4k_version"
+    api "org.apache.commons:commons-lang3:3.11"
+    api "com.zaxxer:HikariCP:3.4.5"
+    api "org.postgresql:postgresql:42.2.16"
+    api "org.cache2k:cache2k-base-bom:1.2.4.Final"
 
 }

frameworks/Kotlin/http4k/http4k-apache.dockerfile

@@ -1,4 +1,4 @@
-FROM gradle:6.6.0-jdk11
+FROM gradle:7.4.2-jdk11
 USER root
 WORKDIR /http4k
 COPY build.gradle build.gradle

frameworks/Kotlin/http4k/http4k-apache4.dockerfile

@@ -1,4 +1,4 @@
-FROM gradle:6.6.0-jdk11
+FROM gradle:7.4.2-jdk11
 USER root
 WORKDIR /http4k
 COPY build.gradle build.gradle

frameworks/Kotlin/http4k/http4k-jetty.dockerfile

@@ -1,4 +1,4 @@
-FROM gradle:6.6.0-jdk11
+FROM gradle:7.4.2-jdk11
 USER root
 WORKDIR /http4k
 COPY build.gradle build.gradle

frameworks/Kotlin/http4k/http4k-ktorcio.dockerfile

@@ -1,4 +1,4 @@
-FROM gradle:6.6.0-jdk11
+FROM gradle:7.4.2-jdk11
 USER root
 WORKDIR /http4k
 COPY build.gradle build.gradle

frameworks/Kotlin/http4k/http4k-ktornetty.dockerfile

@@ -1,4 +1,4 @@
-FROM gradle:6.6.0-jdk11
+FROM gradle:7.4.2-jdk11
 USER root
 WORKDIR /http4k
 COPY build.gradle build.gradle

frameworks/Kotlin/http4k/http4k-netty.dockerfile

@@ -1,4 +1,4 @@
-FROM gradle:6.6.0-jdk11
+FROM gradle:7.4.2-jdk11
 USER root
 WORKDIR /http4k
 COPY build.gradle build.gradle

frameworks/Kotlin/http4k/http4k-ratpack.dockerfile

@@ -1,4 +1,4 @@
-FROM gradle:6.6.0-jdk11
+FROM gradle:7.4.2-jdk11
 USER root
 WORKDIR /http4k
 COPY build.gradle build.gradle

frameworks/Kotlin/http4k/http4k-undertow.dockerfile

@@ -1,4 +1,4 @@
-FROM gradle:6.6.0-jdk11
+FROM gradle:7.4.2-jdk11
 USER root
 WORKDIR /http4k
 COPY build.gradle build.gradle

frameworks/Kotlin/http4k/http4k.dockerfile

@@ -1,4 +1,4 @@
-FROM gradle:6.6.0-jdk11
+FROM gradle:7.4.2-jdk11
 USER root
 WORKDIR /http4k
 COPY build.gradle build.gradle

frameworks/Kotlin/http4k/jetty/build.gradle

@@ -1,6 +1,6 @@
 dependencies {
-    compile project(":core")
-    compile "org.http4k:http4k-server-jetty:$http4k_version"
+    api project(":core")
+    api "org.http4k:http4k-server-jetty:$http4k_version"
 }
 
 apply plugin: 'application'

frameworks/Kotlin/http4k/ktorcio/build.gradle

@@ -1,6 +1,6 @@
 dependencies {
-    compile project(":core")
-    compile "org.http4k:http4k-server-ktorcio:$http4k_version"
+    api project(":core")
+    api "org.http4k:http4k-server-ktorcio:$http4k_version"
 }
 
 apply plugin: 'application'

frameworks/Kotlin/http4k/ktornetty/build.gradle

@@ -1,6 +1,6 @@
 dependencies {
-    compile project(":core")
-    compile "org.http4k:http4k-server-ktornetty:$http4k_version"
+    api project(":core")
+    api "org.http4k:http4k-server-ktornetty:$http4k_version"
 }
 
 apply plugin: 'application'

frameworks/Kotlin/http4k/netty/build.gradle

@@ -1,6 +1,6 @@
 dependencies {
-    compile project(":core")
-    compile "org.http4k:http4k-server-netty:$http4k_version"
+    api project(":core")
+    api "org.http4k:http4k-server-netty:$http4k_version"
 }
 
 apply plugin: 'application'

frameworks/Kotlin/http4k/ratpack/build.gradle

@@ -1,6 +1,6 @@
 dependencies {
-    compile project(":core")
-    compile "org.http4k:http4k-server-ratpack:$http4k_version"
+    api project(":core")
+    api "org.http4k:http4k-server-ratpack:$http4k_version"
 }
 
 apply plugin: 'application'

frameworks/Kotlin/http4k/sunhttp/build.gradle

@@ -1,5 +1,5 @@
 dependencies {
-    compile project(":core")
+    api project(":core")
 }
 
 apply plugin: 'application'

frameworks/Kotlin/http4k/undertow/build.gradle

@@ -1,6 +1,6 @@
 dependencies {
-    compile project(":core")
-    compile "org.http4k:http4k-server-undertow:$http4k_version"
+    api project(":core")
+    api "org.http4k:http4k-server-undertow:$http4k_version"
 }
 
 apply plugin: 'application'