From c05bfab4de8c427b90b5bc09e5eb5245cfb9a57a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2024 16:59:47 +0000 Subject: [PATCH 1/2] Update plugin org.jetbrains.kotlin.jvm to v2.1.0 --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index c9295ad7e..c69ecb086 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,6 +1,6 @@ pluginManagement { plugins { - kotlin("jvm") version "2.0.21" + kotlin("jvm") version "2.1.0" } } From 34cf4f0266ac7d55356b0b8a4d3d62fc6c8c6b42 Mon Sep 17 00:00:00 2001 From: Florian Dreier Date: Fri, 29 Nov 2024 10:03:31 +0100 Subject: [PATCH 2/2] Updated com.xpdustry.kotlin-shadow-relocator plugin --- buildSrc/build.gradle.kts | 8 +------- .../kotlin/com.teamscale.shadow-convention.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 6c15dca0d..328e18b73 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -4,17 +4,11 @@ plugins { repositories { gradlePluginPortal() - maven("https://maven.xpdustry.com/releases") { - name = "xpdustry-releases" - mavenContent { releasesOnly() } - } } dependencies { implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.5") - implementation("com.xpdustry.ksr:com.xpdustry.ksr.gradle.plugin:1.0.0") { - exclude(group = "com.github.johnrengelman") - } + implementation("com.xpdustry:kotlin-shadow-relocator:2.0.0") implementation("org.ow2.asm:asm:9.7.1") implementation("org.ow2.asm:asm-commons:9.7.1") diff --git a/buildSrc/src/main/kotlin/com.teamscale.shadow-convention.gradle.kts b/buildSrc/src/main/kotlin/com.teamscale.shadow-convention.gradle.kts index 3ebff6747..b0a7f27b0 100644 --- a/buildSrc/src/main/kotlin/com.teamscale.shadow-convention.gradle.kts +++ b/buildSrc/src/main/kotlin/com.teamscale.shadow-convention.gradle.kts @@ -6,7 +6,7 @@ plugins { // https://github.com/GradleUp/shadow id("com.gradleup.shadow") // https://github.com/xpdustry/kotlin-shadow-relocator - id("com.xpdustry.ksr") + id("com.xpdustry.kotlin-shadow-relocator") } tasks.named("shadowJar") {