From 14ac2ce315c404c90ac9901252cfa6c35721bd4a Mon Sep 17 00:00:00 2001 From: Goooler Date: Fri, 10 Jan 2025 09:48:26 +0800 Subject: [PATCH 1/2] Add Isolated Projects flags for functional tests https://docs.gradle.org/8.13/userguide/isolated_projects.html#how_do_i_use_it --- .../github/jengelman/gradle/plugins/shadow/BasePluginTest.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/BasePluginTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/BasePluginTest.kt index f5908ae2e..70b26ba4f 100644 --- a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/BasePluginTest.kt +++ b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/BasePluginTest.kt @@ -425,6 +425,8 @@ abstract class BasePluginTest { "--stacktrace", // https://docs.gradle.org/current/userguide/configuration_cache.html#config_cache:usage:parallel "-Dorg.gradle.configuration-cache.parallel=true", + // https://docs.gradle.org/current/userguide/isolated_projects.html#how_do_i_use_it + "-Dorg.gradle.unsafe.isolated-projects=true", ) fun String.toProperties(): Properties = Properties().apply { load(byteInputStream()) } From 116787f16762b340193dad8439e907823f0fb21e Mon Sep 17 00:00:00 2001 From: Goooler Date: Thu, 27 Feb 2025 14:40:08 +0800 Subject: [PATCH 2/2] Fix `publishMultiProjectShadowJar` --- .../gradle/plugins/shadow/PublishingTest.kt | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/PublishingTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/PublishingTest.kt index 0c740a109..0fc797823 100644 --- a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/PublishingTest.kt +++ b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/PublishingTest.kt @@ -284,16 +284,16 @@ class PublishingTest : BasePluginTest() { include 'a', 'b', 'c' """.trimIndent(), ) - projectScriptPath.writeText( - """ - subprojects { - apply plugin: 'java' - apply plugin: 'maven-publish' - version = '1.0' - group = 'my' - } - """.trimIndent(), - ) + projectScriptPath.writeText("") + val subProjectCommon = """ + plugins { + id 'java' + } + version = '1.0' + group = 'my' + """.trimIndent() + path("a/build.gradle").writeText(subProjectCommon) + path("b/build.gradle").writeText(subProjectCommon) path("a/src/main/resources/aa.properties").writeText("aa") path("a/src/main/resources/aa2.properties").writeText("aa2")