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

This commit is contained in:
Nassim Jahnke 2021-10-11 21:05:31 +02:00
commit e9d1d257ea
No known key found for this signature in database
GPG Key ID: 6BE3B555EBC5982B
2 changed files with 2 additions and 2 deletions

View File

@ -8,5 +8,5 @@ repositories {
dependencies { dependencies {
// version must be manually kept in sync with the one in root project settings.gradle.kts // 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")
} }

View File

@ -18,7 +18,7 @@ dependencyResolutionManagement {
pluginManagement { pluginManagement {
plugins { plugins {
id("net.kyori.blossom") version "1.2.0" 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"
} }
} }