From 0f7e0bdbec732b23141f6bbe11b3b2299ca22813 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Thu, 6 May 2021 16:41:53 +0200 Subject: build: Update Jacoco to version 0.8.7 This change updates the Gradle build configuration to use Jacoco 0.8.7, which is necessary for Kotlin 1.5.0 to work nicely with Jacoco. --- buildSrc/src/main/kotlin/jacoco-aggregation.gradle.kts | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'buildSrc/src/main/kotlin/jacoco-aggregation.gradle.kts') diff --git a/buildSrc/src/main/kotlin/jacoco-aggregation.gradle.kts b/buildSrc/src/main/kotlin/jacoco-aggregation.gradle.kts index 3e8aa741..1ea5de4c 100644 --- a/buildSrc/src/main/kotlin/jacoco-aggregation.gradle.kts +++ b/buildSrc/src/main/kotlin/jacoco-aggregation.gradle.kts @@ -1,3 +1,5 @@ +import gradle.kotlin.dsl.accessors._a850a9ab866951e91ee43960bbc39582.jacoco + /* * MIT License * @@ -32,6 +34,11 @@ repositories { mavenCentral() } +jacoco { + // Necessary for Kotlin 1.5.0. See https://github.com/jacoco/jacoco/issues/1155 + toolVersion = "0.8.7" +} + tasks.register("codeCoverageReport") { group = "Coverage reports" description = "Generates an aggregate report based on all subprojects" -- cgit v1.2.3 From 341e1074b0f47e108e6e3f8cf5b3c20773ab0015 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Tue, 15 Jun 2021 12:47:39 +0200 Subject: build: Upgrade to Gradle 7.1 This change upgrades the Gradle build system to version 7.1. --- buildSrc/src/main/kotlin/jacoco-aggregation.gradle.kts | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'buildSrc/src/main/kotlin/jacoco-aggregation.gradle.kts') diff --git a/buildSrc/src/main/kotlin/jacoco-aggregation.gradle.kts b/buildSrc/src/main/kotlin/jacoco-aggregation.gradle.kts index 1ea5de4c..d6bbd2b4 100644 --- a/buildSrc/src/main/kotlin/jacoco-aggregation.gradle.kts +++ b/buildSrc/src/main/kotlin/jacoco-aggregation.gradle.kts @@ -1,9 +1,5 @@ -import gradle.kotlin.dsl.accessors._a850a9ab866951e91ee43960bbc39582.jacoco - /* - * MIT License - * - * Copyright (c) 2019 atlarge-research + * Copyright (c) 2021 AtLarge Research * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -34,11 +30,6 @@ repositories { mavenCentral() } -jacoco { - // Necessary for Kotlin 1.5.0. See https://github.com/jacoco/jacoco/issues/1155 - toolVersion = "0.8.7" -} - tasks.register("codeCoverageReport") { group = "Coverage reports" description = "Generates an aggregate report based on all subprojects" -- cgit v1.2.3 From 5649bdc3fe77b40a112d8478460aab30ee08de58 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Thu, 17 Jun 2021 14:33:56 +0200 Subject: build: Update dependencies This change updates the project dependencies to follow the latest available version where possible. --- buildSrc/src/main/kotlin/jacoco-aggregation.gradle.kts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'buildSrc/src/main/kotlin/jacoco-aggregation.gradle.kts') diff --git a/buildSrc/src/main/kotlin/jacoco-aggregation.gradle.kts b/buildSrc/src/main/kotlin/jacoco-aggregation.gradle.kts index d6bbd2b4..5afd3e0d 100644 --- a/buildSrc/src/main/kotlin/jacoco-aggregation.gradle.kts +++ b/buildSrc/src/main/kotlin/jacoco-aggregation.gradle.kts @@ -35,10 +35,10 @@ tasks.register("codeCoverageReport") { description = "Generates an aggregate report based on all subprojects" reports { - xml.isEnabled = true - xml.destination = file("${buildDir}/reports/jacoco/report.xml") + xml.required.set(true) + xml.outputLocation.set(file("${buildDir}/reports/jacoco/report.xml")) - html.isEnabled = true + html.required.set(true) } subprojects { -- cgit v1.2.3