Merge pull request #11 from linked-planet/maintenance/upgrade-versions

upgrade versions

Author: weickmanna

.github/workflows/ktorbase-example.yml

@@ -4,13 +4,15 @@ on:
   push:
     branches:
       - master
+  schedule:
+    - cron: "0 1 * * *"
 
 jobs:
 
   github-build-and-test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.gradle/caches
@@ -19,11 +21,10 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-example-ktorbase-
 
-      # ktor prevents compile-time 11, see: https://youtrack.jetbrains.com/issue/KTOR-619
-      - name: Set up JDK 8
-        uses: actions/setup-java@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '11'
           distribution: 'adopt'
 
       - name: Initialize
@@ -53,10 +54,10 @@ jobs:
         run: cd /tmp/com.linked-planet.ktor-example && ./gradlew build
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Docker Build and Push
         working-directory: /tmp/com.linked-planet.ktor-example

.github/workflows/ktorbase.yml

@@ -1,15 +1,22 @@
 name: KtorBase
 
-on: [ push ]
+on:
+  push:
+    branches:
+      - '**'
+  schedule:
+    - cron: "0 1 * * *"
+  release:
+    types: [ published ]
 
 jobs:
 
   build-and-test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.gradle/caches
@@ -18,30 +25,29 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-ktorbase-
 
-      # ktor prevents compile-time 11, see: https://youtrack.jetbrains.com/issue/KTOR-619
-      - name: Set up JDK 8
-        uses: actions/setup-java@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '11'
           distribution: 'adopt'
 
       - name: Gradle Build
         run: ./gradlew build
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Docker Build and Push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           context: .
           push: true

Dockerfile

@@ -1,7 +1,7 @@
 FROM openjdk:11-jre
 
 # install prometheus jmx exporter
-ENV JMX_PROMETHEUS_VERSION="0.15.0"
+ENV JMX_PROMETHEUS_VERSION="0.17.2"
 ENV JMX_PROMETHEUS_PORT=9404
 RUN mkdir -p /opt/jmx_exporter
 RUN wget --no-verbose \

README.md

@@ -137,19 +137,8 @@ want to use something else.
 The build is configured to use [Sassy CSS][sass].  
 (*see [Sass vs. SCSS: which syntax is better?][sassy-vs-scss]*)
 
-There are some utility classes
-that can be used to enable developer features like letting specific
-routes fail, or introducing random HTTP delay. We find these
-useful for testing how our applications behave in error situations.
-There might be more elegant ways or tools for doing this - use them
-at your own discretion, or delete them if you don't want them:
-- [DevOptions](frontend/src/main/kotlin/com/linkedplanet/ktorbase/DevOptions.kt)
-- [GlobalOptions](frontend/src/main/kotlin/com/linkedplanet/ktorbase/GlobalOptions.kt)
-- [Async](frontend/src/main/kotlin/com/linkedplanet/ktorbase/util/Async.kt)
-
-We don't claim that these are the best ways to handle these situations. So far,
-they worked for us very reliably. If you know how to do things in a better way,
-please tell us :-)
+For further information regarding frontend development, see
+[linked-planet UI-Kit][ui-kit].
 
 
 ## Deployment
@@ -164,12 +153,6 @@ please tell us :-)
 - If you don't use Docker either, delete the [docker-build](docker-build) directory
   and the [Dockerfile](Dockerfile)
 
-### Java Version
-We are running on JRE 11, but the application is compiled with JDK 8 due to the following
-ktor issues:
-- https://github.com/ktorio/ktor/issues/1137
-- https://github.com/ktorio/ktor/issues/321
-
 ### Configuration
 AWS configuration parameters are stored within the repository in JSON files per
 environment (see [ktorbase-test.json](aws/templates/ktorbase-test.json)).
@@ -223,3 +206,4 @@ This template is distributed without any warranty. See <http://creativecommons.o
 [kotlin-fullstack-sample]: https://github.com/Kotlin/kotlin-full-stack-application-demo
 [jetty]: https://www.eclipse.org/jetty/
 [aws-prometheus]: https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/ContainerInsights-Prometheus.html
+[ui-kit]: https://github.com/linked-planet/ui-kit

backend/build.gradle.kts

@@ -2,15 +2,15 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 val kotlinVersion: String by project
-val jvmTarget: String by project
 
 plugins {
     kotlin("jvm")
     application
-    id("com.github.johnrengelman.shadow") version "7.0.0"
+    id("com.github.johnrengelman.shadow") version "7.1.2"
 }
 
 val ktorVersion = "1.5.4"
+val log4jVersion = "2.19.0"
 dependencies {
     implementation(kotlin("stdlib-jdk8", kotlinVersion))
     implementation(project(":common"))
@@ -25,17 +25,16 @@ dependencies {
     implementation("io.ktor", "ktor-client-logging-jvm", ktorVersion)
     implementation("com.link-time.ktor", "ktor-onelogin-saml", "1.2.0-ktor-1.4.2")
 
-    implementation("org.apache.logging.log4j", "log4j-api", "2.14.0")
-    implementation("org.apache.logging.log4j", "log4j-core", "2.14.0")
-    implementation("org.apache.logging.log4j", "log4j-slf4j-impl", "2.14.0")
+    implementation("org.apache.logging.log4j", "log4j-api", log4jVersion)
+    implementation("org.apache.logging.log4j", "log4j-core", log4jVersion)
+    implementation("org.apache.logging.log4j", "log4j-slf4j-impl", log4jVersion)
 
-    testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.7.1")
-    testRuntime("org.junit.jupiter", "junit-jupiter-engine", "5.7.1")
-    testImplementation("io.rest-assured", "rest-assured", "4.3.3")
+    testImplementation(kotlin("test"))
+    testImplementation("io.rest-assured", "rest-assured", "5.3.0")
 }
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = jvmTarget
+    kotlinOptions.jvmTarget = "11"
     kotlinOptions.freeCompilerArgs = listOf("-Xuse-experimental=kotlin.Experimental")
 }
 
@@ -66,7 +65,7 @@ task("updateBuildVersion") {
 }
 
 sourceSets {
-    create("integrationTest") {
+    create("integration") {
         kotlin {
             compileClasspath += main.get().output + configurations.testRuntimeClasspath.get()
             runtimeClasspath += output + compileClasspath
@@ -77,8 +76,7 @@ sourceSets {
 val integrationTest = task<Test>("integrationTest") {
     description = "Run all integration tests"
     group = "verification"
-    testClassesDirs = sourceSets["integrationTest"].output.classesDirs
-    classpath = sourceSets["integrationTest"].runtimeClasspath
+    testClassesDirs = sourceSets["integration"].output.classesDirs
+    classpath = sourceSets["integration"].runtimeClasspath
     mustRunAfter(tasks["test"])
-    useJUnitPlatform()
 }

backend/src/integrationTest/kotlin/BackendConfig.kt renamed to backend/src/integration/kotlin/BackendConfig.kt

@@ -3,7 +3,8 @@ import io.restassured.RestAssured
 import io.restassured.RestAssured.given
 import io.restassured.http.ContentType
 import io.restassured.response.ValidatableResponse
-import org.junit.jupiter.api.*
+import org.junit.BeforeClass
+import kotlin.test.Test
 
 /*
  * Meant to run against the fully built application, deployed e.g. as Docker Container.
@@ -34,7 +35,7 @@ class IntegrationTest {
     }
 
     companion object {
-        @BeforeAll
+        @BeforeClass
         @JvmStatic
         fun configureRestAssured() {
             RestAssured.baseURI = BackendConfig.baseUrl

backend/src/integrationTest/kotlin/IntegrationTest.kt renamed to backend/src/integration/kotlin/IntegrationTest.kt

@@ -1,24 +1,25 @@
-import org.gradle.util.GradleVersion
-
 println("Gradle Version: " + GradleVersion.current().toString())
 println("Java Version: " + JavaVersion.current().toString())
 
-group = "com.linked-planet"
-version = "0.1.0-SNAPSHOT"
+plugins {
+    kotlin("multiplatform") version "1.7.22" apply false
 
-ext.set("kotlinVersion", "1.4.32")
-ext.set("jvmTarget", "1.8") // ktor prevents compile-time 11, see: https://youtrack.jetbrains.com/issue/KTOR-619
+    // derive gradle version from git tag
+    id("pl.allegro.tech.build.axion-release") version "1.14.3"
 
-plugins {
-    kotlin("multiplatform") version "1.4.32" apply false
-    id("com.github.hierynomus.license") version "0.16.1"
-    id("com.github.hierynomus.license-report") version "0.16.1"
-    id("com.github.ben-manes.versions") version "0.38.0"
+    // provide & configure tasks: dependencyUpdates, useLatestVersions
+    id("com.github.ben-manes.versions") version "0.44.0"
+    id("se.ascp.gradle.gradle-versions-filter") version "0.1.16"
+    id("se.patrikerdes.use-latest-versions") version "0.2.18"
 }
 
+group = "com.linked-planet"
+version = scmVersion.version
+
+ext.set("kotlinVersion", "1.7.22")
+
 allprojects {
     repositories {
         mavenCentral()
-        maven { url = uri("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-js-wrappers") }
     }
 }

backend/src/integrationTest/resources/test.conf renamed to backend/src/integration/resources/test.conf

@@ -1,6 +1,4 @@
 val kotlinVersion: String by project
-val jvmTarget: String by project
-val copyJvmTarget = jvmTarget
 
 plugins {
     kotlin("multiplatform")