From 6b19bcd3e23cade276fcd8ebacf3178282656657 Mon Sep 17 00:00:00 2001 From: Big Andy <8012398+big-andy-coates@users.noreply.github.com> Date: Fri, 2 Feb 2024 10:54:04 +0000 Subject: [PATCH 1/2] Upgrade to Gradle 8.5 --- docs-examples/gradle/wrapper/gradle-wrapper.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs-examples/gradle/wrapper/gradle-wrapper.properties b/docs-examples/gradle/wrapper/gradle-wrapper.properties index bdc9a83b..3499ded5 100644 --- a/docs-examples/gradle/wrapper/gradle-wrapper.properties +++ b/docs-examples/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bdc9a83b..3499ded5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 4f8d4d0f62d7fae35824d4ad7bd613980afbadb9 Mon Sep 17 00:00:00 2001 From: Big Andy <8012398+big-andy-coates@users.noreply.github.com> Date: Fri, 2 Feb 2024 12:15:41 +0000 Subject: [PATCH 2/2] Fix deprecated --- .../src/main/kotlin/creek-coverage-convention.gradle.kts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/kotlin/creek-coverage-convention.gradle.kts b/buildSrc/src/main/kotlin/creek-coverage-convention.gradle.kts index 8b5a19f4..caa657d0 100644 --- a/buildSrc/src/main/kotlin/creek-coverage-convention.gradle.kts +++ b/buildSrc/src/main/kotlin/creek-coverage-convention.gradle.kts @@ -17,9 +17,9 @@ /** * Standard coverage configuration of Creek projects, utilising Jacoco and Coveralls.io * - *

Version: 1.2 - * - *

Apply to root project only + *

Versions: + * - 1.3: remove deprecated use of $buildDir + * - 1.2: Apply to root project only */ plugins { @@ -64,7 +64,7 @@ val coverage = tasks.register("coverage") { coveralls { sourceDirs = allprojects.flatMap{it.sourceSets.main.get().allSource.srcDirs}.map{it.toString()} - jacocoReportPath = "$buildDir/reports/jacoco/coverage/coverage.xml" + jacocoReportPath = layout.buildDirectory.file("reports/jacoco/coverage/coverage.xml") } tasks.coveralls {