From ecb7aa32c74489b28373f702bc31c5769d1b59c6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 2 May 2023 09:35:42 +0000 Subject: [PATCH 1/3] Update dependency gradle to v8 --- gradle/wrapper/gradle-wrapper.properties | 2 +- info/gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 508322917b..37aef8d3f0 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-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/info/gradle/wrapper/gradle-wrapper.properties b/info/gradle/wrapper/gradle-wrapper.properties index 774fae8767..fae08049a6 100644 --- a/info/gradle/wrapper/gradle-wrapper.properties +++ b/info/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 4f54e0ebebb9907e661ebfff765523fbbd6a2fd6 Mon Sep 17 00:00:00 2001 From: Nariman Abdullin Date: Tue, 2 May 2023 12:53:19 +0300 Subject: [PATCH 2/3] supported change in compilerOptions in Gradle 8.x --- gradle/plugins/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/plugins/build.gradle.kts b/gradle/plugins/build.gradle.kts index e51ffc142a..f2125efba9 100644 --- a/gradle/plugins/build.gradle.kts +++ b/gradle/plugins/build.gradle.kts @@ -39,7 +39,7 @@ dependencies { } tasks.withType { - kotlinOptions { - freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlin.RequiresOptIn" + compilerOptions { + freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn") } } From 7de36f4cf80bf68ae096ec0e1e01790e7cb3b10a Mon Sep 17 00:00:00 2001 From: Nariman Abdullin Date: Tue, 2 May 2023 13:00:54 +0300 Subject: [PATCH 3/3] upgraded jacoco.testkit to version which supports Gradle 8.x --- diktat-gradle-plugin/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diktat-gradle-plugin/build.gradle.kts b/diktat-gradle-plugin/build.gradle.kts index a3d0d17ea5..1f7c71b7b7 100644 --- a/diktat-gradle-plugin/build.gradle.kts +++ b/diktat-gradle-plugin/build.gradle.kts @@ -5,7 +5,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("org.cqfn.diktat.buildutils.kotlin-jvm-configuration") id("org.cqfn.diktat.buildutils.code-quality-convention") - id("pl.droidsonroids.jacoco.testkit") version "1.0.9" + id("pl.droidsonroids.jacoco.testkit") version "1.0.11" id("org.gradle.test-retry") version "1.5.2" id("com.gradle.plugin-publish") version "1.2.0" }