From 4e88eb792b517f4e9884e7050fbe8429e5c53754 Mon Sep 17 00:00:00 2001 From: Tobias Gesellchen Date: Wed, 11 Oct 2023 23:09:52 +0200 Subject: [PATCH] Substitute Groovy 3.x with Groovy 4.x --- build.gradle.kts | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index accff77..6836f1f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,6 +7,8 @@ plugins { id("io.github.gradle-nexus.publish-plugin") version "1.3.0" } +val groovyVersion = "4.0.15" + val dependencyVersions = listOf( "com.squareup.okio:okio:3.8.0", "com.squareup.okio:okio-jvm:3.8.0", @@ -19,7 +21,7 @@ val dependencyVersions = listOf( ) val dependencyVersionsByGroup = mapOf( - "org.codehaus.groovy" to "3.0.17", + "org.apache.groovy" to groovyVersion, ) subprojects { @@ -33,6 +35,19 @@ subprojects { useVersion(forcedVersion) } } + dependencySubstitution { + all { + requested.let { + if (it is ModuleComponentSelector && it.group == "org.codehaus.groovy") { + logger.lifecycle("substituting $it with 'org.apache.groovy:*:${groovyVersion}'") + useTarget( + "org.apache.groovy:${it.module}:${groovyVersion}", + "Changed Maven coordinates since Groovy 4" + ) + } + } + } + } } } }