From be75b34d3f123042c6a0721486ef236ccf52a1eb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 18 Jan 2024 11:46:17 +0000 Subject: [PATCH 01/22] Update dependency jacoco to v0.8.11 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 62302cb6..9b6bb3a8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ project_website=https://github.com/melix/jmh-gradle-plugin project_issues=https://github.com/melix/jmh-gradle-plugin/issues project_vcs=https://github.com/melix/jmh-gradle-plugin.git -jacocoVersion = 0.8.10 +jacocoVersion = 0.8.11 jmhVersion = 1.37 shadowVersion = 7.1.2 shadowForkVersion = 8.1.3 From c23a91c748f5c56ef467f19f9c328252120e97e0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 18 Jan 2024 11:49:02 +0000 Subject: [PATCH 02/22] Update actions/setup-java action to v4 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ec5ce79b..2ccf4327 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,7 +15,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 17 From 6b8bb77d8676af00e25226844461bdc1212cf61d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 18 Jan 2024 11:46:14 +0000 Subject: [PATCH 03/22] Update dependency com.gradle.publish:plugin-publish-plugin to v1.2.1 --- build-logic/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts index b2484339..f7114084 100644 --- a/build-logic/build.gradle.kts +++ b/build-logic/build.gradle.kts @@ -23,5 +23,5 @@ repositories { } dependencies { - implementation("com.gradle.publish:plugin-publish-plugin:1.2.0") + implementation("com.gradle.publish:plugin-publish-plugin:1.2.1") } \ No newline at end of file From f5c461e1c050ccd9d2e23eece398772b33950dc6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 18 Jan 2024 11:48:56 +0000 Subject: [PATCH 04/22] Update plugin org.gradle.toolchains.foojay-resolver-convention to v0.8.0 --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 78076e76..8cfc2561 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -24,7 +24,7 @@ pluginManagement { plugins { id("com.gradle.enterprise") version "3.14.1" - id("org.gradle.toolchains.foojay-resolver-convention") version "0.6.0" + id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" } gradleEnterprise { From 2142f495e398382c98611b22c750e0d3bd6a9241 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 18 Jan 2024 12:09:53 +0000 Subject: [PATCH 05/22] Update actions/checkout action to v4 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2ccf4327..f722b9ae 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,7 +14,7 @@ jobs: os: [ ubuntu-latest, windows-latest ] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-java@v4 with: distribution: 'zulu' From d6089861391d182480ff9af33d1cf00a49dd09a7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 18 Jan 2024 12:27:27 +0000 Subject: [PATCH 06/22] Update plugin com.gradle.enterprise to v3.16.1 --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 8cfc2561..1616e302 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -23,7 +23,7 @@ pluginManagement { } plugins { - id("com.gradle.enterprise") version "3.14.1" + id("com.gradle.enterprise") version "3.16.1" id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" } From 97a8db4356f0ea9d6372e5057dec54cca3ce4867 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 18 Jan 2024 11:48:50 +0000 Subject: [PATCH 07/22] Update dependency org.apache.commons:commons-lang3 to v3.14.0 --- .../resources/java-project-with-test-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/funcTest/resources/java-project-with-test-dependencies/build.gradle b/src/funcTest/resources/java-project-with-test-dependencies/build.gradle index fae7a807..5bc1127a 100644 --- a/src/funcTest/resources/java-project-with-test-dependencies/build.gradle +++ b/src/funcTest/resources/java-project-with-test-dependencies/build.gradle @@ -24,7 +24,7 @@ repositories { dependencies { testImplementation 'junit:junit:4.13.2' - testImplementation 'org.apache.commons:commons-lang3:3.13.0' + testImplementation 'org.apache.commons:commons-lang3:3.14.0' } jmh { From a719192c7278516f51ede609ce3a8b7c48f94677 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 18 Jan 2024 11:48:47 +0000 Subject: [PATCH 08/22] Update plugin org.nosphere.apache.rat to v0.8.1 --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 028dc4d8..7f74eed8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,7 +17,7 @@ plugins { jacoco id("me.champeau.buildscan-recipes") version "0.2.3" - id("org.nosphere.apache.rat") version "0.8.0" + id("org.nosphere.apache.rat") version "0.8.1" id("net.nemerosa.versioning") version "3.0.0" id("com.github.kt3k.coveralls") version "2.12.2" id("me.champeau.convention-test") From 467fcb92171c9ab0d04ed4b14f174b031d6feb65 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 18 Jan 2024 11:48:43 +0000 Subject: [PATCH 09/22] Update plugin me.champeau.jmh to v0.7.2 --- samples/simple-java/groovy-dsl/build.gradle | 2 +- samples/simple-java/kotlin-dsl/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/simple-java/groovy-dsl/build.gradle b/samples/simple-java/groovy-dsl/build.gradle index c47192b7..9629091a 100644 --- a/samples/simple-java/groovy-dsl/build.gradle +++ b/samples/simple-java/groovy-dsl/build.gradle @@ -15,7 +15,7 @@ */ plugins { id 'java-library' - id "me.champeau.jmh" version "0.7.1" + id "me.champeau.jmh" version "0.7.2" } repositories { diff --git a/samples/simple-java/kotlin-dsl/build.gradle.kts b/samples/simple-java/kotlin-dsl/build.gradle.kts index d4536668..64d84922 100644 --- a/samples/simple-java/kotlin-dsl/build.gradle.kts +++ b/samples/simple-java/kotlin-dsl/build.gradle.kts @@ -15,7 +15,7 @@ */ plugins { `java-library` - id("me.champeau.jmh") version "0.7.1" + id("me.champeau.jmh") version "0.7.2" } repositories { From 71da7c0873b0908423a46aa6182b8ce80a9a9598 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 18 Jan 2024 11:48:39 +0000 Subject: [PATCH 10/22] Update dependency org.scala-lang:scala-library to v2.13.12 --- src/funcTest/resources/scala-forked-shadow-project/build.gradle | 2 +- src/funcTest/resources/scala-project/build.gradle | 2 +- src/funcTest/resources/scala-shadow-project/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/funcTest/resources/scala-forked-shadow-project/build.gradle b/src/funcTest/resources/scala-forked-shadow-project/build.gradle index cdc16d86..af317d69 100644 --- a/src/funcTest/resources/scala-forked-shadow-project/build.gradle +++ b/src/funcTest/resources/scala-forked-shadow-project/build.gradle @@ -24,7 +24,7 @@ repositories { } dependencies { - implementation 'org.scala-lang:scala-library:2.13.11' + implementation 'org.scala-lang:scala-library:2.13.12' } jmh { diff --git a/src/funcTest/resources/scala-project/build.gradle b/src/funcTest/resources/scala-project/build.gradle index f7a3d71b..c58250b4 100644 --- a/src/funcTest/resources/scala-project/build.gradle +++ b/src/funcTest/resources/scala-project/build.gradle @@ -23,7 +23,7 @@ repositories { } dependencies { - implementation 'org.scala-lang:scala-library:2.13.11' + implementation 'org.scala-lang:scala-library:2.13.12' } jmh { diff --git a/src/funcTest/resources/scala-shadow-project/build.gradle b/src/funcTest/resources/scala-shadow-project/build.gradle index 7faec017..3314bee4 100644 --- a/src/funcTest/resources/scala-shadow-project/build.gradle +++ b/src/funcTest/resources/scala-shadow-project/build.gradle @@ -24,7 +24,7 @@ repositories { } dependencies { - implementation 'org.scala-lang:scala-library:2.13.11' + implementation 'org.scala-lang:scala-library:2.13.12' } jmh { From b800c4c9405afbf30fbe35acaaa23e343674b04c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 18 Jan 2024 11:48:35 +0000 Subject: [PATCH 11/22] Update dependency org.junit.jupiter:junit-jupiter-api to v5.10.1 --- samples/simple-java/groovy-dsl/build.gradle | 2 +- samples/simple-java/kotlin-dsl/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/simple-java/groovy-dsl/build.gradle b/samples/simple-java/groovy-dsl/build.gradle index 9629091a..5caa4c69 100644 --- a/samples/simple-java/groovy-dsl/build.gradle +++ b/samples/simple-java/groovy-dsl/build.gradle @@ -23,7 +23,7 @@ repositories { } dependencies { - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.0' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.1' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' } diff --git a/samples/simple-java/kotlin-dsl/build.gradle.kts b/samples/simple-java/kotlin-dsl/build.gradle.kts index 64d84922..611de06d 100644 --- a/samples/simple-java/kotlin-dsl/build.gradle.kts +++ b/samples/simple-java/kotlin-dsl/build.gradle.kts @@ -23,7 +23,7 @@ repositories { } dependencies { - testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0") + testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.1") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") } From db64901b2e9822978cee448ef1aa4bffffa05dd8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 18 Jan 2024 11:48:31 +0000 Subject: [PATCH 12/22] Update dependency org.jetbrains.kotlin:kotlin-gradle-plugin to v1.9.22 --- src/funcTest/resources/kotlin-project/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/funcTest/resources/kotlin-project/build.gradle b/src/funcTest/resources/kotlin-project/build.gradle index 72f7bec3..d18e460b 100644 --- a/src/funcTest/resources/kotlin-project/build.gradle +++ b/src/funcTest/resources/kotlin-project/build.gradle @@ -18,7 +18,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0' + classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22' } } From 42340eea6ec4c6f99d79727f35b7e112cfc0c57a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 18 Jan 2024 11:48:26 +0000 Subject: [PATCH 13/22] Update dependency org.codehaus.groovy:groovy-all to v3.0.20 --- src/funcTest/resources/groovy-project/build.gradle | 2 +- src/funcTest/resources/mixed-language-project/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/funcTest/resources/groovy-project/build.gradle b/src/funcTest/resources/groovy-project/build.gradle index 2b270e4c..499dc621 100644 --- a/src/funcTest/resources/groovy-project/build.gradle +++ b/src/funcTest/resources/groovy-project/build.gradle @@ -23,7 +23,7 @@ repositories { } dependencies { - implementation 'org.codehaus.groovy:groovy-all:3.0.18' + implementation 'org.codehaus.groovy:groovy-all:3.0.20' } jmh { diff --git a/src/funcTest/resources/mixed-language-project/build.gradle b/src/funcTest/resources/mixed-language-project/build.gradle index 2b270e4c..499dc621 100644 --- a/src/funcTest/resources/mixed-language-project/build.gradle +++ b/src/funcTest/resources/mixed-language-project/build.gradle @@ -23,7 +23,7 @@ repositories { } dependencies { - implementation 'org.codehaus.groovy:groovy-all:3.0.18' + implementation 'org.codehaus.groovy:groovy-all:3.0.20' } jmh { From b4284aa14e6728efee7854ed43d7d11a252944cd Mon Sep 17 00:00:00 2001 From: Zongle Wang Date: Thu, 18 Jan 2024 23:02:34 +0800 Subject: [PATCH 14/22] Use Java 21 on CI --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f722b9ae..bf86c7eb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: 17 + java-version: 21 - uses: gradle/wrapper-validation-action@v1 - name: Setup Gradle uses: gradle/gradle-build-action@v2 From 8252f32ecfc24ee374cd1a4a6f22f07b5149b54a Mon Sep 17 00:00:00 2001 From: Zongle Wang Date: Fri, 19 Jan 2024 00:10:16 +0800 Subject: [PATCH 15/22] Reuse GradleRunner config --- .../me/champeau/jmh/AbstractFuncSpec.groovy | 17 ++++++++++++----- .../groovy/me/champeau/jmh/ParameterSpec.groovy | 4 ++-- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/funcTest/groovy/me/champeau/jmh/AbstractFuncSpec.groovy b/src/funcTest/groovy/me/champeau/jmh/AbstractFuncSpec.groovy index c59bd12b..10dfa444 100644 --- a/src/funcTest/groovy/me/champeau/jmh/AbstractFuncSpec.groovy +++ b/src/funcTest/groovy/me/champeau/jmh/AbstractFuncSpec.groovy @@ -51,6 +51,8 @@ abstract class AbstractFuncSpec extends Specification { testedGradleVersion = gradleVersion } + // TODO: We can remove this and fully enable CC in tests once bump the Shadow version to 8.1.1+. + // TODO: But Kotlin test still fails, it was suppressed in 1bab41646df6f47aea84ea3febeeec1c76cd2e79, need to investigate. protected void withoutConfigurationCache(String reason) { noConfigurationCacheReason = reason } @@ -83,6 +85,7 @@ abstract class AbstractFuncSpec extends Specification { .withPluginClasspath() .withProjectDir(projectDir) .withArguments(arguments) + .withTestKitDir(testKitDir) } protected BuildResult build(String... arguments) { @@ -94,13 +97,17 @@ abstract class AbstractFuncSpec extends Specification { } private List calculateArguments(String... arguments) { - def gradleVersionWithConfigurationCache = testedGradleVersion >= GradleVersion.version('6.6') - if (gradleVersionWithConfigurationCache && noConfigurationCacheReason) { - println("Configuration cache disabled: $noConfigurationCacheReason") - } - (gradleVersionWithConfigurationCache && !noConfigurationCacheReason + (!noConfigurationCacheReason ? ['--stacktrace', '--configuration-cache'] : ['--stacktrace']) + (arguments as List) } + + private static File getTestKitDir() { + def gradleUserHome = System.getenv("GRADLE_USER_HOME") + if (!gradleUserHome) { + gradleUserHome = new File(System.getProperty("user.home"), ".gradle").absolutePath + } + return new File(gradleUserHome, "testkit") + } } diff --git a/src/funcTest/groovy/me/champeau/jmh/ParameterSpec.groovy b/src/funcTest/groovy/me/champeau/jmh/ParameterSpec.groovy index 570fe6c7..23ccfde3 100644 --- a/src/funcTest/groovy/me/champeau/jmh/ParameterSpec.groovy +++ b/src/funcTest/groovy/me/champeau/jmh/ParameterSpec.groovy @@ -42,7 +42,7 @@ class ParameterSpec extends AbstractFuncSpec { usingSample("java-project") when: - def result = build("jmhJar", "--configuration-cache") + def result = build("jmhJar") then: result.task(":jmhJar").outcome == SUCCESS @@ -50,7 +50,7 @@ class ParameterSpec extends AbstractFuncSpec { result.output.contains("Calculating task graph as no cached configuration is available for tasks: jmhJar") when: - result = build("jmhJar", "--configuration-cache") + result = build("jmhJar") then: result.task(":jmhJar").outcome == UP_TO_DATE From f32d5fece10c17f0796989900851970cc22c4ba2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 26 Jan 2024 15:23:19 +0000 Subject: [PATCH 16/22] Update plugin com.gradle.enterprise to v3.16.2 --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 1616e302..7aab2572 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -23,7 +23,7 @@ pluginManagement { } plugins { - id("com.gradle.enterprise") version "3.16.1" + id("com.gradle.enterprise") version "3.16.2" id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" } From 10f69902f5c8e7417a994fb4fd6f4251c4ae234f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 27 Jan 2024 05:00:29 +0000 Subject: [PATCH 17/22] Update gradle/gradle-build-action action to v3 * Update gradle/gradle-build-action action to v3 * Update main.yml --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Zongle Wang --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bf86c7eb..a2011b0a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,7 +21,7 @@ jobs: java-version: 21 - uses: gradle/wrapper-validation-action@v1 - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/actions/setup-gradle@v3 - name: Execute Gradle build run: ./gradlew build From 9918be57e0c5af11f912358d369ac812ddd61fda Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 22:04:52 +0000 Subject: [PATCH 18/22] Update gradle/wrapper-validation-action action to v2 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a2011b0a..25b82ef3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ jobs: with: distribution: 'zulu' java-version: 21 - - uses: gradle/wrapper-validation-action@v1 + - uses: gradle/wrapper-validation-action@v2 - name: Setup Gradle uses: gradle/actions/setup-gradle@v3 From 2c21a68450d54a84534b2633e48af78e83b7d5aa Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 2 Feb 2024 19:44:26 +0000 Subject: [PATCH 19/22] Update dependency gradle to v8.6 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1af9e093..a80b22ce 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.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 4cd1383d6242446817cef0f2a4cc901200070899 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 4 Feb 2024 09:26:55 +0000 Subject: [PATCH 20/22] Update dependency org.junit.jupiter:junit-jupiter-api to v5.10.2 --- samples/simple-java/groovy-dsl/build.gradle | 2 +- samples/simple-java/kotlin-dsl/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/simple-java/groovy-dsl/build.gradle b/samples/simple-java/groovy-dsl/build.gradle index 5caa4c69..a535502a 100644 --- a/samples/simple-java/groovy-dsl/build.gradle +++ b/samples/simple-java/groovy-dsl/build.gradle @@ -23,7 +23,7 @@ repositories { } dependencies { - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.1' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' } diff --git a/samples/simple-java/kotlin-dsl/build.gradle.kts b/samples/simple-java/kotlin-dsl/build.gradle.kts index 611de06d..aaec9bfe 100644 --- a/samples/simple-java/kotlin-dsl/build.gradle.kts +++ b/samples/simple-java/kotlin-dsl/build.gradle.kts @@ -23,7 +23,7 @@ repositories { } dependencies { - testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.1") + testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.2") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") } From 034dbcce22f4fba9a60a696d5d09fa2fcd1c68dd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 22:18:18 +0000 Subject: [PATCH 21/22] Update dependency org.scala-lang:scala-library to v2.13.13 --- src/funcTest/resources/scala-forked-shadow-project/build.gradle | 2 +- src/funcTest/resources/scala-project/build.gradle | 2 +- src/funcTest/resources/scala-shadow-project/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/funcTest/resources/scala-forked-shadow-project/build.gradle b/src/funcTest/resources/scala-forked-shadow-project/build.gradle index af317d69..73ca741a 100644 --- a/src/funcTest/resources/scala-forked-shadow-project/build.gradle +++ b/src/funcTest/resources/scala-forked-shadow-project/build.gradle @@ -24,7 +24,7 @@ repositories { } dependencies { - implementation 'org.scala-lang:scala-library:2.13.12' + implementation 'org.scala-lang:scala-library:2.13.13' } jmh { diff --git a/src/funcTest/resources/scala-project/build.gradle b/src/funcTest/resources/scala-project/build.gradle index c58250b4..8a57729a 100644 --- a/src/funcTest/resources/scala-project/build.gradle +++ b/src/funcTest/resources/scala-project/build.gradle @@ -23,7 +23,7 @@ repositories { } dependencies { - implementation 'org.scala-lang:scala-library:2.13.12' + implementation 'org.scala-lang:scala-library:2.13.13' } jmh { diff --git a/src/funcTest/resources/scala-shadow-project/build.gradle b/src/funcTest/resources/scala-shadow-project/build.gradle index 3314bee4..19033395 100644 --- a/src/funcTest/resources/scala-shadow-project/build.gradle +++ b/src/funcTest/resources/scala-shadow-project/build.gradle @@ -24,7 +24,7 @@ repositories { } dependencies { - implementation 'org.scala-lang:scala-library:2.13.12' + implementation 'org.scala-lang:scala-library:2.13.13' } jmh { From 11c58f668c02580c008d8ebade7eeabcdacb7114 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 19 Feb 2024 15:40:05 +0000 Subject: [PATCH 22/22] Update dependency io.github.goooler.shadow:shadow-gradle-plugin to v8.1.5 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 9b6bb3a8..bd4e2126 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ project_vcs=https://github.com/melix/jmh-gradle-plugin.git jacocoVersion = 0.8.11 jmhVersion = 1.37 shadowVersion = 7.1.2 -shadowForkVersion = 8.1.3 +shadowForkVersion = 8.1.5 spockVersion = 2.3-groovy-3.0 org.gradle.jvmargs=-Xmx4g -Dfile.encoding=UTF-8