From 9812eb6de9d9c16bf9ee4c3b7ef27d629219c87b Mon Sep 17 00:00:00 2001 From: Youssef Shoaib Date: Fri, 26 Jun 2026 16:50:58 +0100 Subject: [PATCH] Upgrade to Gradle 9.6.1 --- compiler-plugin/build.gradle.kts | 14 +++++++------- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/compiler-plugin/build.gradle.kts b/compiler-plugin/build.gradle.kts index f02ee60..75790b4 100644 --- a/compiler-plugin/build.gradle.kts +++ b/compiler-plugin/build.gradle.kts @@ -38,15 +38,15 @@ idea { module.generatedSourceDirs.add(testGenDirectory.get().asFile) } -val testArtifacts: Configuration by configurations.creating +val testArtifacts: Configuration = configurations.create("testArtifact") -val annotationsRuntimeClasspath by configurations.dependencyScope("annotationsRuntimeClasspath") { +val annotationsRuntimeClasspath = configurations.dependencyScope("annotationsRuntimeClasspath") { isTransitive = false } -val annotationsJvmRuntimeClasspath by configurations.resolvable("annotationsJvmRuntimeClasspath") { +val annotationsJvmRuntimeClasspath = configurations.resolvable("annotationsJvmRuntimeClasspath") { extendsFrom(annotationsRuntimeClasspath) } -val annotationsJsRuntimeClasspath by configurations.resolvable("annotationsJsRuntimeClasspath") { +val annotationsJsRuntimeClasspath = configurations.resolvable("annotationsJsRuntimeClasspath") { extendsFrom(annotationsRuntimeClasspath) attributes { attribute(Usage.USAGE_ATTRIBUTE, objects.named(KotlinUsages.KOTLIN_RUNTIME)) @@ -93,8 +93,8 @@ tasks.test { useJUnitPlatform() workingDir = rootDir - systemProperty("annotationsRuntime.jvm.classpath", annotationsJvmRuntimeClasspath.asPath) - systemProperty("annotationsRuntime.js.classpath", annotationsJsRuntimeClasspath.asPath) + systemProperty("annotationsRuntime.jvm.classpath", annotationsJvmRuntimeClasspath.get().asPath) + systemProperty("annotationsRuntime.js.classpath", annotationsJsRuntimeClasspath.get().asPath) // Properties required to run the internal test framework. setLibraryProperty("org.jetbrains.kotlin.test.kotlin-stdlib", "kotlin-stdlib") @@ -126,7 +126,7 @@ kotlin { } } -val generateTests by tasks.registering(JavaExec::class) { +val generateTests = tasks.register("generateTests") { inputs.dir(testDataDir) .withPropertyName("testData") .withPathSensitivity(PathSensitivity.RELATIVE) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b52fb7e..a9db115 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-9.5.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500