From 27b7e3f63678a82d9b0f486a8a2e27cd39851586 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 1 Oct 2021 22:29:12 -0700 Subject: [PATCH] Upgraded to Kotlin 1.5.31 and JDK 17. --- .circleci/config.yml | 6 +++--- .github/workflows/gradle.yml | 2 +- build.gradle.kts | 8 ++++---- pom.xml | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 640a7b9..88d64aa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,11 +30,11 @@ defaults_gradle: &defaults_gradle path: build/reports/ jobs: - build_gradle_jdk16: + build_gradle_jdk17: <<: *defaults docker: - - image: cimg/openjdk:16.0 + - image: cimg/openjdk:17.0 <<: *defaults_gradle @@ -51,4 +51,4 @@ workflows: gradle: jobs: - build_gradle_jdk8 - - build_gradle_jdk16 + - build_gradle_jdk17 diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 71b9695..4a473de 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: - java-version: [ 1.8, 11, 16 ] + java-version: [ 1.8, 11, 17 ] steps: - uses: actions/checkout@v2 diff --git a/build.gradle.kts b/build.gradle.kts index bac2c09..668da7f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,17 +4,17 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent plugins { id("com.github.ben-manes.versions") version "0.39.0" - id("io.gitlab.arturbosch.detekt") version "1.18.0" + id("io.gitlab.arturbosch.detekt") version "1.18.1" id("jacoco") id("java") id("java-library") id("maven-publish") id("net.thauvin.erik.gradle.semver") version "1.0.4" - id("org.jetbrains.dokka") version "1.5.0" + id("org.jetbrains.dokka") version "1.5.30" id("org.sonarqube") version "3.3" id("signing") - kotlin("jvm") version "1.5.30" - kotlin("kapt") version "1.5.30" + kotlin("jvm") version "1.5.31" + kotlin("kapt") version "1.5.31" } group = "net.thauvin.erik" diff --git a/pom.xml b/pom.xml index 84153ad..88347c0 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ org.jetbrains.kotlin kotlin-bom - 1.5.30 + 1.5.31 pom import @@ -50,7 +50,7 @@ org.jetbrains.kotlin kotlin-stdlib-jdk8 - 1.5.30 + 1.5.31 compile