From 1b892e5a5822bcd0e74408d6936610d4986012a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Jul 2023 07:33:26 +0000 Subject: [PATCH 1/4] Bump org.mockito.kotlin:mockito-kotlin from 4.1.0 to 5.0.0 Bumps [org.mockito.kotlin:mockito-kotlin](https://github.com/mockito/mockito-kotlin) from 4.1.0 to 5.0.0. - [Release notes](https://github.com/mockito/mockito-kotlin/releases) - [Commits](https://github.com/mockito/mockito-kotlin/compare/4.1.0...5.0.0) --- updated-dependencies: - dependency-name: org.mockito.kotlin:mockito-kotlin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 42aa9d6..f71cf5e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -46,7 +46,7 @@ dependencies { testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.3") testImplementation("org.junit.jupiter:junit-jupiter-engine:5.9.3") testImplementation("org.mockito:mockito-inline:5.2.0") - testImplementation("org.mockito.kotlin:mockito-kotlin:4.1.0") + testImplementation("org.mockito.kotlin:mockito-kotlin:5.0.0") testImplementation("io.kotest:kotest-runner-junit5-jvm:5.6.2") } From 8ccecc5a66f7c7f7a2e7f28cd21ab18e3127b5de Mon Sep 17 00:00:00 2001 From: Daria Makovei <17213278+friduchin@users.noreply.github.com> Date: Mon, 3 Jul 2023 12:09:28 +0200 Subject: [PATCH 2/4] set jvmTarget to 17 in build.gradle.kts --- build.gradle.kts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index 26bcc0b..f3eb94c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + plugins { val kotlinVersion = "1.8.22" id("org.jetbrains.kotlin.jvm") version kotlinVersion @@ -64,6 +66,12 @@ tasks { xml.outputLocation.set(buildDir.resolve("test-results/test/xml/jacocoReport.xml")) } } + withType { + kotlinOptions { + jvmTarget = "17" + } + } + } val javadocJar by tasks.creating(Jar::class) { From df249905ff3a3c8de498aa682892ac8a15f896b9 Mon Sep 17 00:00:00 2001 From: Daria Makovei <17213278+friduchin@users.noreply.github.com> Date: Mon, 3 Jul 2023 12:15:14 +0200 Subject: [PATCH 3/4] fix lint violation --- build.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index f3eb94c..fbaf126 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -71,7 +71,6 @@ tasks { jvmTarget = "17" } } - } val javadocJar by tasks.creating(Jar::class) { From cdca97b0fdcf838a56bada23e758359cdba6c27e Mon Sep 17 00:00:00 2001 From: Daria Makovei <17213278+friduchin@users.noreply.github.com> Date: Mon, 3 Jul 2023 13:38:04 +0200 Subject: [PATCH 4/4] update changelog about jvmTarget version --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c6a846d..7cff614 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [Unreleased] - yyyy-mm-dd ### Breaking changes +- Set target JVM version to 17 ([#106](https://github.com/personio/datadog-synthetic-test-support/pull/106)) ### New features & improvements