From bc79ad926f2cf451dd68b53cab245c0cb1f3698f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2024 06:45:49 +0000 Subject: [PATCH 1/2] fix(deps): update gradle shadow packages to v8.3.4 --- conventions/build.gradle.kts | 2 +- examples/distro/build.gradle | 2 +- examples/extension/build.gradle | 2 +- gradle-plugins/build.gradle.kts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conventions/build.gradle.kts b/conventions/build.gradle.kts index 437d38177fde..5a8005362897 100644 --- a/conventions/build.gradle.kts +++ b/conventions/build.gradle.kts @@ -57,7 +57,7 @@ dependencies { implementation("com.diffplug.spotless:spotless-plugin-gradle:6.25.0") implementation("com.google.guava:guava:33.3.1-jre") implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18") - implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.3") + implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.4") implementation("org.apache.httpcomponents:httpclient:4.5.14") implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:3.18.1") implementation("org.owasp:dependency-check-gradle:11.0.0") diff --git a/examples/distro/build.gradle b/examples/distro/build.gradle index 9f343d69f1df..a632a143cc3f 100644 --- a/examples/distro/build.gradle +++ b/examples/distro/build.gradle @@ -13,7 +13,7 @@ buildscript { } dependencies { classpath "com.diffplug.spotless:spotless-plugin-gradle:6.25.0" - classpath "com.gradleup.shadow:shadow-gradle-plugin:8.3.3" + classpath "com.gradleup.shadow:shadow-gradle-plugin:8.3.4" classpath "io.opentelemetry.instrumentation:gradle-plugins:2.10.0-alpha-SNAPSHOT" } } diff --git a/examples/extension/build.gradle b/examples/extension/build.gradle index ae9766c2a05a..1317d88152d8 100644 --- a/examples/extension/build.gradle +++ b/examples/extension/build.gradle @@ -10,7 +10,7 @@ plugins { into a single jar. See https://imperceptiblethoughts.com/shadow/ for more details about Shadow plugin. */ - id "com.gradleup.shadow" version "8.3.3" + id "com.gradleup.shadow" version "8.3.4" id "com.diffplug.spotless" version "6.25.0" id "io.opentelemetry.instrumentation.muzzle-generation" version "2.10.0-alpha-SNAPSHOT" diff --git a/gradle-plugins/build.gradle.kts b/gradle-plugins/build.gradle.kts index 64ac86d2c4ab..8e8bf80530eb 100644 --- a/gradle-plugins/build.gradle.kts +++ b/gradle-plugins/build.gradle.kts @@ -39,7 +39,7 @@ dependencies { implementation("org.eclipse.aether:aether-transport-http:${aetherVersion}") implementation("org.apache.maven:maven-aether-provider:3.3.9") - implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.3") + implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.4") testImplementation("org.assertj:assertj-core:3.26.3") From 7e1cc8e57111730a297e71b142626755efc97c8a Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Tue, 29 Oct 2024 09:34:19 +0200 Subject: [PATCH 2/2] build for jdk 11 --- 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 8e8bf80530eb..b638acd678d4 100644 --- a/gradle-plugins/build.gradle.kts +++ b/gradle-plugins/build.gradle.kts @@ -56,13 +56,13 @@ tasks { withType().configureEach { with(options) { - release.set(8) + release.set(11) } } withType(KotlinCompile::class).configureEach { kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "11" } } }