Merge remote-tracking branch 'origin/master' into dev

build-logic/build.gradle.kts

@@ -8,5 +8,5 @@ repositories {
 
 dependencies {
     // version must be manually kept in sync with the one in root project settings.gradle.kts
-    implementation("gradle.plugin.com.github.jengelman.gradle.plugins", "shadow", "7.0.0")
+    implementation("gradle.plugin.com.github.johnrengelman", "shadow", "7.1.0")
 }

settings.gradle.kts

@@ -18,7 +18,7 @@ dependencyResolutionManagement {
 pluginManagement {
     plugins {
         id("net.kyori.blossom") version "1.2.0"
-        id("com.github.johnrengelman.shadow") version "7.0.0"
+        id("com.github.johnrengelman.shadow") version "7.1.0"
     }
 }