summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--buildSrc/src/main/kotlin/experiment-conventions.gradle.kts2
-rw-r--r--buildSrc/src/main/kotlin/jacoco-aggregation.gradle.kts11
-rw-r--r--buildSrc/src/main/kotlin/jacoco-conventions.gradle.kts5
-rw-r--r--gradle/wrapper/gradle-wrapper.properties2
4 files changed, 2 insertions, 18 deletions
diff --git a/buildSrc/src/main/kotlin/experiment-conventions.gradle.kts b/buildSrc/src/main/kotlin/experiment-conventions.gradle.kts
index 26780205..c1750a40 100644
--- a/buildSrc/src/main/kotlin/experiment-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/experiment-conventions.gradle.kts
@@ -1,5 +1,3 @@
-import gradle.kotlin.dsl.accessors._9bf86420fccbde1948375f641de89b70.sourceSets
-
/*
* Copyright (c) 2021 AtLarge Research
*
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<JacocoReport>("codeCoverageReport") {
group = "Coverage reports"
description = "Generates an aggregate report based on all subprojects"
diff --git a/buildSrc/src/main/kotlin/jacoco-conventions.gradle.kts b/buildSrc/src/main/kotlin/jacoco-conventions.gradle.kts
index 5c7aea83..e0bc2ce4 100644
--- a/buildSrc/src/main/kotlin/jacoco-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/jacoco-conventions.gradle.kts
@@ -25,11 +25,6 @@ plugins {
jacoco
}
-jacoco {
- // Necessary for Kotlin 1.5.0. See https://github.com/jacoco/jacoco/issues/1155
- toolVersion = "0.8.7"
-}
-
tasks.jacocoTestReport {
reports {
html.isEnabled = true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0f80bbf5..69a97150 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists