From 5a311e5e5be826e4f948bd598438d36412e2069f Mon Sep 17 00:00:00 2001 From: gradle-update-robot Date: Sat, 1 Feb 2025 12:31:05 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20Gradle=20Wrappe?= =?UTF-8?q?r=20from=208.11.1=20to=208.12.1=20(#786)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: gradle-update-robot --- gradle/wrapper/gradle-wrapper.properties | 4 ++-- gradlew | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index eb1a55be0..d71047787 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=f397b287023acdba1e9f6fc5ea72d22dd63669d59ed4a289a29b1a76eee151c6 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionSha256Sum=8d97a97984f6cbd2b85fe4c60a743440a347544bf18818048e611f5288d46c94 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6d6..f3b75f3b0 100755 --- a/gradlew +++ b/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum From 0decaa616c0503b0c1767f5171b389aae1bb51cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Lamarque?= Date: Tue, 25 Feb 2025 10:45:42 +0100 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=92=9A=20Fix=20`execute`=20function's?= =?UTF-8?q?=20visibility=20in=20custom=20Gradle=20tasks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ref: #786 --- .../main/kotlin/org/kotools/samples/CheckSampleReferences.kt | 2 +- .../src/main/kotlin/org/kotools/samples/CheckSampleSources.kt | 2 +- .../src/main/kotlin/org/kotools/samples/ExtractSamples.kt | 2 +- .../src/main/kotlin/org/kotools/samples/InlineSamples.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle/plugins/src/main/kotlin/org/kotools/samples/CheckSampleReferences.kt b/gradle/plugins/src/main/kotlin/org/kotools/samples/CheckSampleReferences.kt index 2346ec024..91d4ec832 100644 --- a/gradle/plugins/src/main/kotlin/org/kotools/samples/CheckSampleReferences.kt +++ b/gradle/plugins/src/main/kotlin/org/kotools/samples/CheckSampleReferences.kt @@ -30,7 +30,7 @@ public abstract class CheckSampleReferences : DefaultTask() { public abstract val extractedSamplesDirectory: DirectoryProperty @TaskAction - private fun execute() { + internal fun execute() { val samplesDirectory: Directory = this.extractedSamplesDirectory.get() this.sourceDirectory.asFileTree.asSequence() .filterNotNull() diff --git a/gradle/plugins/src/main/kotlin/org/kotools/samples/CheckSampleSources.kt b/gradle/plugins/src/main/kotlin/org/kotools/samples/CheckSampleSources.kt index 81bdad460..07b67c7c7 100644 --- a/gradle/plugins/src/main/kotlin/org/kotools/samples/CheckSampleSources.kt +++ b/gradle/plugins/src/main/kotlin/org/kotools/samples/CheckSampleSources.kt @@ -18,7 +18,7 @@ public abstract class CheckSampleSources : DefaultTask() { public abstract val sourceDirectory: DirectoryProperty @TaskAction - private fun execute(): Unit = this.sourceDirectory.asFileTree.asSequence() + internal fun execute(): Unit = this.sourceDirectory.asFileTree.asSequence() .filterNotNull() .mapNotNull(SampleSourceFile.Companion::orNull) .forEach(SampleSourceFile::checkSingleClass) diff --git a/gradle/plugins/src/main/kotlin/org/kotools/samples/ExtractSamples.kt b/gradle/plugins/src/main/kotlin/org/kotools/samples/ExtractSamples.kt index 1d9e11e38..714708fdf 100644 --- a/gradle/plugins/src/main/kotlin/org/kotools/samples/ExtractSamples.kt +++ b/gradle/plugins/src/main/kotlin/org/kotools/samples/ExtractSamples.kt @@ -24,7 +24,7 @@ public abstract class ExtractSamples : DefaultTask() { public abstract val outputDirectory: DirectoryProperty @TaskAction - private fun execute() { + internal fun execute() { val directory: Directory = this.outputDirectory.get() this.sourceDirectory.asFileTree.asSequence() .filterNotNull() diff --git a/gradle/plugins/src/main/kotlin/org/kotools/samples/InlineSamples.kt b/gradle/plugins/src/main/kotlin/org/kotools/samples/InlineSamples.kt index 804076b57..0e39e6aad 100644 --- a/gradle/plugins/src/main/kotlin/org/kotools/samples/InlineSamples.kt +++ b/gradle/plugins/src/main/kotlin/org/kotools/samples/InlineSamples.kt @@ -32,7 +32,7 @@ public abstract class InlineSamples : DefaultTask() { public abstract val extractedSamplesDirectory: DirectoryProperty @TaskAction - private fun execute(): Unit = this.sourceDirectory.asFileTree.asSequence() + internal fun execute(): Unit = this.sourceDirectory.asFileTree.asSequence() .filterNotNull() .filter { "Main/" in it.path || "main/" in it.path } .filter { it.name.endsWith(".kt") }