Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump org.mockito.kotlin:mockito-kotlin from 4.1.0 to 5.0.0 #106

Merged
merged 5 commits into from
Jul 3, 2023
Merged

Bump org.mockito.kotlin:mockito-kotlin from 4.1.0 to 5.0.0 #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1b892e5
Bump org.mockito.kotlin:mockito-kotlin from 4.1.0 to 5.0.0
dependabot[bot] Jul 1, 2023
c84a749
Merge branch 'master' into dependabot/gradle/org.mockito.kotlin-mocki…
friduchin Jul 3, 2023
8ccecc5
set jvmTarget to 17 in build.gradle.kts
friduchin Jul 3, 2023
df24990
fix lint violation
friduchin Jul 3, 2023
cdca97b
update changelog about jvmTarget version
friduchin Jul 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
9 changes: 8 additions & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
val kotlinVersion = "1.8.22"
id("org.jetbrains.kotlin.jvm") version kotlinVersion
Expand Down Expand Up @@ -46,7 +48,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")
}

Expand All @@ -64,6 +66,11 @@ tasks {
xml.outputLocation.set(buildDir.resolve("test-results/test/xml/jacocoReport.xml"))
}
}
withType<KotlinCompile> {
kotlinOptions {
jvmTarget = "17"
}
}
}

val javadocJar by tasks.creating(Jar::class) {
Expand Down