Browse Source

Kotlin updates Gradle and Java 11 (#4796)

Radoslav Petrov 6 years ago
parent
commit
f4c05cf531

+ 1 - 1
frameworks/Kotlin/hexagon/gradle.properties

@@ -4,7 +4,7 @@ hexagonVersion=0.25.10
 hikariVersion=3.3.1
 jettyVersion=9.4.15.v20190215
 kotlinCoroutinesVersion=1.1.1
-kotlinVersion=1.3.30
+kotlinVersion=1.3.31
 logbackVersion=1.2.3
 name=hexagon
 postgresqlVersion=42.2.5

+ 1 - 1
frameworks/Kotlin/hexagon/hexagon-jetty-postgresql.dockerfile

@@ -2,7 +2,7 @@
 #
 # BUILD
 #
-FROM gradle:5.3.1-jdk11 AS gradle_build
+FROM gradle:5.4.1-jdk11 AS gradle_build
 USER root
 WORKDIR /hexagon
 

+ 1 - 1
frameworks/Kotlin/hexagon/hexagon-resin-mongodb.dockerfile

@@ -1,7 +1,7 @@
 #
 # BUILD
 #
-FROM gradle:5.3.1-jdk11 AS gradle_build
+FROM gradle:5.4.1-jdk11 AS gradle_build
 USER root
 WORKDIR /hexagon
 

+ 1 - 1
frameworks/Kotlin/hexagon/hexagon-resin-postgresql.dockerfile

@@ -1,7 +1,7 @@
 #
 # BUILD
 #
-FROM gradle:5.3.1-jdk11 AS gradle_build
+FROM gradle:5.4.1-jdk11 AS gradle_build
 USER root
 WORKDIR /hexagon
 

+ 1 - 1
frameworks/Kotlin/hexagon/hexagon.dockerfile

@@ -2,7 +2,7 @@
 #
 # BUILD
 #
-FROM gradle:5.3.1-jdk11 AS gradle_build
+FROM gradle:5.4.1-jdk11 AS gradle_build
 USER root
 WORKDIR /hexagon
 

+ 1 - 1
frameworks/Kotlin/http4k/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = "1.3.11"
+    ext.kotlin_version = "1.3.31"
     ext.http4k_version = "3.106.0"
 
     repositories {

+ 3 - 3
frameworks/Kotlin/http4k/core/build.gradle

@@ -5,7 +5,7 @@ dependencies {
     compile "org.http4k:http4k-format-jackson:$http4k_version"
     compile "org.http4k:http4k-template-pebble:$http4k_version"
     compile "org.apache.commons:commons-lang3:3.7"
-    compile "com.zaxxer:HikariCP:3.2.0"
-    compile "org.postgresql:postgresql:42.2.2"
-    compile "io.reactiverse:reactive-pg-client:0.11.1"
+    compile "com.zaxxer:HikariCP:3.3.1"
+    compile "org.postgresql:postgresql:42.2.5"
+    compile "io.reactiverse:reactive-pg-client:0.11.3"
 }

+ 1 - 1
frameworks/Kotlin/http4k/http4k-apache.dockerfile

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

+ 1 - 1
frameworks/Kotlin/http4k/http4k-ktorcio.dockerfile

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

+ 1 - 1
frameworks/Kotlin/http4k/http4k-netty.dockerfile

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

+ 1 - 1
frameworks/Kotlin/http4k/http4k-undertow.dockerfile

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

+ 1 - 1
frameworks/Kotlin/http4k/http4k.dockerfile

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

+ 4 - 4
frameworks/Kotlin/ktor/ktor-asyncdb/build.gradle

@@ -22,9 +22,9 @@ dependencies {
     compile "org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.9.1"
     compile "io.ktor:ktor-server-netty:$ktor_version"
     compile "io.ktor:ktor-html-builder:$ktor_version"
-    compile "com.github.jasync-sql:jasync-postgresql:0.8.54"
-    compile "io.reactiverse:reactive-pg-client:0.11.1"
-    compile 'io.vertx:vertx-lang-kotlin-coroutines:3.6.2'
+    compile "com.github.jasync-sql:jasync-postgresql:0.9.39"
+    compile "io.reactiverse:reactive-pg-client:0.11.3"
+    compile 'io.vertx:vertx-lang-kotlin-coroutines:3.7.0'
 }
 
 compileKotlin {
@@ -38,4 +38,4 @@ shadowJar {
     baseName = "bench"
     classifier = null
     version = null
-}
+}

+ 2 - 2
frameworks/Kotlin/ktor/ktor-asyncdb/gradle.properties

@@ -1,4 +1,4 @@
 kotlin.code.style=official
 
-kotlin_version=1.3.11
-ktor_version=1.0.1
+kotlin_version=1.3.31
+ktor_version=1.2.0

+ 2 - 2
frameworks/Kotlin/ktor/ktor-cio.dockerfile

@@ -1,10 +1,10 @@
-FROM maven:3.5.3-jdk-10-slim as maven
+FROM maven:3.6.1-jdk-11-slim as maven
 WORKDIR /ktor
 COPY ktor/pom.xml pom.xml
 COPY ktor/src src
 RUN mvn clean package -q
 
-FROM openjdk:10-jre-slim
+FROM openjdk:11.0.3-jre-stretch
 WORKDIR /ktor
 COPY --from=maven /ktor/target/tech-empower-framework-benchmark-1.0-SNAPSHOT-cio-bundle.jar app.jar
 CMD ["java", "-jar", "app.jar"]

+ 1 - 1
frameworks/Kotlin/ktor/ktor-jasync.dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:11-slim
+FROM openjdk:11.0.3-jre-stretch
 WORKDIR /app
 COPY ktor-asyncdb/gradle gradle
 COPY ktor-asyncdb/build.gradle build.gradle

+ 2 - 2
frameworks/Kotlin/ktor/ktor-jetty.dockerfile

@@ -1,10 +1,10 @@
-FROM maven:3.5.3-jdk-10-slim as maven
+FROM maven:3.6.1-jdk-11-slim as maven
 WORKDIR /ktor
 COPY ktor/pom.xml pom.xml
 COPY ktor/src src
 RUN mvn clean package -q
 
-FROM openjdk:10-jre-slim
+FROM openjdk:11.0.3-jre-stretch
 WORKDIR /ktor
 COPY --from=maven /ktor/target/tech-empower-framework-benchmark-1.0-SNAPSHOT-jetty-bundle.jar app.jar
 CMD ["java", "-jar", "app.jar"]

+ 1 - 1
frameworks/Kotlin/ktor/ktor-reactivepg.dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:11-slim
+FROM openjdk:11.0.3-jre-stretch
 WORKDIR /app
 COPY ktor-asyncdb/gradle gradle
 COPY ktor-asyncdb/build.gradle build.gradle

+ 2 - 2
frameworks/Kotlin/ktor/ktor.dockerfile

@@ -1,10 +1,10 @@
-FROM maven:3.5.3-jdk-10-slim as maven
+FROM maven:3.6.1-jdk-11-slim as maven
 WORKDIR /ktor
 COPY ktor/pom.xml pom.xml
 COPY ktor/src src
 RUN mvn clean package -q
 
-FROM openjdk:10-jre-slim
+FROM openjdk:11.0.3-jre-stretch
 WORKDIR /ktor
 COPY --from=maven /ktor/target/tech-empower-framework-benchmark-1.0-SNAPSHOT-netty-bundle.jar app.jar
 CMD ["java", "-server","-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-XX:+AlwaysPreTouch", "-jar", "app.jar"]