diff --git a/build.gradle.kts b/build.gradle.kts index 99fbf72fd..8fa0f9d65 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -167,7 +167,7 @@ testing.suites { // Prettify test failure output in console. result.exception?.message?.lineSequence()?.firstOrNull()?.let(logger::error) } - } + }, ) } } diff --git a/gradle/build-logic/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/buildlogic/GenerateDocTests.kt b/gradle/build-logic/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/buildlogic/GenerateDocTests.kt index bd8e4b8e4..f4dc4cb4b 100644 --- a/gradle/build-logic/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/buildlogic/GenerateDocTests.kt +++ b/gradle/build-logic/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/buildlogic/GenerateDocTests.kt @@ -48,7 +48,7 @@ abstract class GenerateDocTests : DefaultTask() { lineNumber = line, snippet = matcher.group(2), sourceLocation = "${file.toURI()}:$line", - ) + ), ) } } @@ -112,7 +112,7 @@ abstract class GenerateDocTests : DefaultTask() { |} | """ - .trimMargin() + .trimMargin(), ) } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 78e9c0ef0..5aa62edcf 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -26,7 +26,7 @@ pluginPublish = { module = "com.gradle.plugin-publish:com.gradle.plugin-publish. androidx-gradlePluginLints = "androidx.lint:lint-gradle:1.0.0" # Dummy to get renovate updates, the version is used in rootProject build.gradle with spotless. -ktfmt = "com.facebook:ktfmt:0.64" +ktfmt = "org.jetbrains.kotlinx:ktfmt:0.65" r8 = "com.android.tools:r8:9.5.23" junit-bom = "org.junit:junit-bom:6.1.3" @@ -38,5 +38,5 @@ android-lint = "com.android.lint:9.4.1" jetbrains-dokka = "org.jetbrains.dokka:2.3.0-Beta" mavenPublish = "com.vanniktech.maven.publish:0.37.0" pluginPublish = { id = "com.gradle.plugin-publish", version.ref = "pluginPublish" } -spotless = "com.diffplug.spotless:8.10.3" +spotless = "com.diffplug.spotless:8.10.4" buildConfig = "com.github.gmazzo.buildconfig:6.1.2" diff --git a/src/documentTest/kotlin/com/github/jengelman/gradle/plugins/shadow/SnippetExecutable.kt b/src/documentTest/kotlin/com/github/jengelman/gradle/plugins/shadow/SnippetExecutable.kt index 244bc6851..b72b5fca9 100644 --- a/src/documentTest/kotlin/com/github/jengelman/gradle/plugins/shadow/SnippetExecutable.kt +++ b/src/documentTest/kotlin/com/github/jengelman/gradle/plugins/shadow/SnippetExecutable.kt @@ -49,7 +49,7 @@ sealed interface SnippetExecutable { |enableFeaturePreview 'STABLE_CONFIGURATION_CACHE' |enableFeaturePreview 'TYPESAFE_PROJECT_ACCESSORS' """ - .trimMargin() + .trimMargin(), ) val pluginsBlock = """ diff --git a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/ApplicationPluginTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/ApplicationPluginTest.kt index 43bd49982..d469463fa 100644 --- a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/ApplicationPluginTest.kt +++ b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/ApplicationPluginTest.kt @@ -119,7 +119,7 @@ class ApplicationPluginTest : BasePluginTest() { |Hello, World! (bar) from Main |Refs: junit.framework.Test |""" - .trimMargin() + .trimMargin(), ) } @@ -144,7 +144,7 @@ class ApplicationPluginTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) var result = runWithSuccess(runShadowPath) @@ -169,7 +169,7 @@ class ApplicationPluginTest : BasePluginTest() { | args 'bar' |} """ - .trimMargin() + .trimMargin(), ) result = runWithSuccess(":run") @@ -186,7 +186,7 @@ class ApplicationPluginTest : BasePluginTest() { | mainClass = 'my.Main2' // Different from application.mainClass. |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(runShadowPath) // Run without errors. @@ -278,7 +278,7 @@ class ApplicationPluginTest : BasePluginTest() { |applicationName = '${applicationNames.first}' |executableDir = '${executableDirs.first}' """ - .trimMargin() + .trimMargin(), ) runWithSuccess(installShadowDistPath, shadowDistZipPath) @@ -328,13 +328,13 @@ class ApplicationPluginTest : BasePluginTest() { |} | """ - .trimMargin() + .trimMargin(), ) settingsScript.writeText( getDefaultSettingsBuildScript( startBlock = settingsBlock, endBlock = "rootProject.name = 'myapp'", - ) + ), ) } 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 cf98e3770..a948761ea 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 @@ -249,7 +249,7 @@ abstract class BasePluginTest { """ |include 'client', 'server' """ - .trimMargin() + .trimMargin(), ) projectScript.deleteExisting() @@ -259,7 +259,7 @@ abstract class BasePluginTest { |package client; |public class Client {} """ - .trimMargin() + .trimMargin(), ) path("client/build.gradle") .writeText( @@ -270,7 +270,7 @@ abstract class BasePluginTest { |} | """ - .trimMargin() + .trimMargin(), ) path("server/src/main/java/server/Server.java") @@ -280,7 +280,7 @@ abstract class BasePluginTest { |import client.Client; |public class Server {} """ - .trimMargin() + .trimMargin(), ) path("server/build.gradle") .writeText( @@ -294,7 +294,7 @@ abstract class BasePluginTest { |} | """ - .trimMargin() + .trimMargin(), ) if (!clientShadowed) return @@ -306,7 +306,7 @@ abstract class BasePluginTest { |} | """ - .trimMargin() + .trimMargin(), ) path("server/src/main/java/server/Server.java") .writeText( @@ -316,7 +316,7 @@ abstract class BasePluginTest { |import client.junit.framework.Test; |public class Server {} """ - .trimMargin() + .trimMargin(), ) val replaced = path("server/build.gradle") @@ -338,7 +338,7 @@ abstract class BasePluginTest { |} | """ - .trimMargin() + .trimMargin(), ) path("src/main/java/my/plugin/MyPlugin.java") @@ -353,7 +353,7 @@ abstract class BasePluginTest { | } |} """ - .trimMargin() + .trimMargin(), ) } diff --git a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/CachingTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/CachingTest.kt index 94f140d6f..d84c60a7a 100644 --- a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/CachingTest.kt +++ b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/CachingTest.kt @@ -34,7 +34,7 @@ class CachingTest : BasePluginTest() { | implementation 'my:b:1.0' |} """ - .trimMargin() + .trimMargin(), ) assertCompositeExecutions { @@ -56,7 +56,7 @@ class CachingTest : BasePluginTest() { | implementation 'my:b:1.0' |} |""" - .trimMargin() + .trimMargin(), ) assertCompositeExecutions { @@ -69,7 +69,7 @@ class CachingTest : BasePluginTest() { | archiveBaseName = "foo" |} """ - .trimMargin() + .trimMargin(), ) assertExecutionsFromCacheAndUpToDate() @@ -89,7 +89,7 @@ class CachingTest : BasePluginTest() { | duplicatesStrategy = DuplicatesStrategy.$strategy |} """ - .trimMargin() + .trimMargin(), ) assertCompositeExecutions() @@ -111,7 +111,7 @@ class CachingTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) val assertions = { valueFoo: String, valueBar: String -> @@ -153,7 +153,7 @@ class CachingTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) assertCompositeExecutions { getMainAttr(mainClassAttributeKey).isEqualTo(mainClassName) } @@ -176,7 +176,7 @@ class CachingTest : BasePluginTest() { | mainClass = '$mainClassName' |} """ - .trimMargin() + .trimMargin(), ) assertCompositeExecutions { getMainAttr(mainClassAttributeKey).isEqualTo(mainClassName) } @@ -198,7 +198,7 @@ class CachingTest : BasePluginTest() { | implementation 'my:b:1.0' |} |""" - .trimMargin() + .trimMargin(), ) assertCompositeExecutions { @@ -219,7 +219,7 @@ class CachingTest : BasePluginTest() { |} | """ - .trimMargin() + .trimMargin(), ) assertCompositeExecutions { @@ -239,7 +239,7 @@ class CachingTest : BasePluginTest() { |} | """ - .trimMargin() + .trimMargin(), ) assertCompositeExecutions { @@ -253,7 +253,7 @@ class CachingTest : BasePluginTest() { |} | """ - .trimMargin() + .trimMargin(), ) assertCompositeExecutions { @@ -276,7 +276,7 @@ class CachingTest : BasePluginTest() { | implementation 'junit:junit:3.8.2' |} |""" - .trimMargin() + .trimMargin(), ) assertCompositeExecutions { @@ -297,7 +297,7 @@ class CachingTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) assertCompositeExecutions { @@ -316,7 +316,7 @@ class CachingTest : BasePluginTest() { |package server; |public class Server {} """ - .trimMargin() + .trimMargin(), ) assertCompositeExecutions(jarPathProvider = { outputServerShadowedJar }) { @@ -340,7 +340,7 @@ class CachingTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) assertCompositeExecutions(jarPathProvider = { outputServerShadowedJar }) { @@ -433,7 +433,7 @@ class CachingTest : BasePluginTest() { | implementation 'junit:junit:3.8.2' |} |""" - .trimMargin() + .trimMargin(), ) val mainClassEntry = writeClass(withImports = true) @@ -453,7 +453,7 @@ class CachingTest : BasePluginTest() { | relocate 'junit.framework', 'foo.junit.framework' |} """ - .trimMargin() + .trimMargin(), ) val relocatedEntries = junitEntries.map { it.replace("junit/framework/", "foo/junit/framework/") }.toTypedArray() @@ -483,7 +483,7 @@ class CachingTest : BasePluginTest() { |} | """ - .trimMargin() + .trimMargin(), ) val mainClassEntry = writeClass(withImports = true) val fooEntries = @@ -536,8 +536,8 @@ class CachingTest : BasePluginTest() { """ |path = 'META-INF/foo' """ - .trimMargin() - ) + .trimMargin(), + ), ) assertions() @@ -557,7 +557,7 @@ class CachingTest : BasePluginTest() { |} | """ - .trimMargin() + .trimMargin(), ) assertCompositeExecutions() @@ -567,7 +567,7 @@ class CachingTest : BasePluginTest() { |${transform()} | """ - .trimMargin() + .trimMargin(), ) assertCompositeExecutions() @@ -578,7 +578,7 @@ class CachingTest : BasePluginTest() { | transform(${CustomResourceTransformer::class.java.name}) |} """ - .trimMargin() + .trimMargin(), ) assertExecutionSuccess() @@ -635,7 +635,7 @@ class CachingTest : BasePluginTest() { """ |include 'client', 'server' """ - .trimMargin() + .trimMargin(), ) projectScript.deleteExisting() @@ -649,7 +649,7 @@ class CachingTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) path("client/src/main/java/client/Unused.java") .writeText( @@ -657,7 +657,7 @@ class CachingTest : BasePluginTest() { |package client; |public class Unused {} """ - .trimMargin() + .trimMargin(), ) path("client/src/main/java/client/Reflective.java") .writeText( @@ -665,7 +665,7 @@ class CachingTest : BasePluginTest() { |package client; |public class Reflective {} """ - .trimMargin() + .trimMargin(), ) path("client/build.gradle") .writeText( @@ -673,7 +673,7 @@ class CachingTest : BasePluginTest() { |${getDefaultProjectBuildScript("java")} | """ - .trimMargin() + .trimMargin(), ) path("server/src/main/java/server/Server.java") @@ -687,7 +687,7 @@ class CachingTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) path("server/build.gradle") .writeText( @@ -705,7 +705,7 @@ class CachingTest : BasePluginTest() { |} | """ - .trimMargin() + .trimMargin(), ) } } diff --git a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/FilteringTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/FilteringTest.kt index 25c137088..30e300c30 100644 --- a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/FilteringTest.kt +++ b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/FilteringTest.kt @@ -22,7 +22,7 @@ class FilteringTest : BasePluginTest() { | implementation 'my:b:1.0' |} |""" - .trimMargin() + .trimMargin(), ) } @@ -43,7 +43,7 @@ class FilteringTest : BasePluginTest() { | exclude 'a2.properties' |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -64,7 +64,7 @@ class FilteringTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) val dependency = if (useAccessor) "libs.my.d" else "'my:d:1.0'" projectScript.appendText( @@ -78,7 +78,7 @@ class FilteringTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -99,7 +99,7 @@ class FilteringTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) path("src/main/java/my/Passed.java") .writeText( @@ -107,7 +107,7 @@ class FilteringTest : BasePluginTest() { |package my; |public class Passed {} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -137,7 +137,7 @@ class FilteringTest : BasePluginTest() { | exclude($clientProject) |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(serverShadowJarPath) @@ -154,7 +154,7 @@ class FilteringTest : BasePluginTest() { | exclude(project(':client')) |} """ - .trimMargin() + .trimMargin(), ) path("client/build.gradle").appendText("version = '1.0.0+1'") @@ -172,7 +172,7 @@ class FilteringTest : BasePluginTest() { | exclude { it.moduleGroup == 'junit' } |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(serverShadowJarPath) @@ -203,7 +203,7 @@ class FilteringTest : BasePluginTest() { | exclude 'a2.properties' |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -227,7 +227,7 @@ class FilteringTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -250,7 +250,7 @@ class FilteringTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) diff --git a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/FindResourceInClasspathTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/FindResourceInClasspathTest.kt index 23533615f..76b8637b1 100644 --- a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/FindResourceInClasspathTest.kt +++ b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/FindResourceInClasspathTest.kt @@ -30,7 +30,7 @@ class FindResourceInClasspathTest : BasePluginTest() { | exclude("a.properties") |} """ - .trimMargin() + .trimMargin(), ) assertThat(runWithSuccess(":find1").output) diff --git a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/JavaPluginsTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/JavaPluginsTest.kt index c9cfc9b5f..20449eaad 100644 --- a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/JavaPluginsTest.kt +++ b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/JavaPluginsTest.kt @@ -76,7 +76,7 @@ class JavaPluginsTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) val result = runWithSuccess(ASSEMBLE_TASK_NAME) @@ -94,7 +94,7 @@ class JavaPluginsTest : BasePluginTest() { | addShadowJarToAssembleLifecycle = false |} """ - .trimMargin() + .trimMargin(), ) val result = runWithSuccess(ASSEMBLE_TASK_NAME) @@ -132,7 +132,7 @@ class JavaPluginsTest : BasePluginTest() { | --relocation-prefix Prefix used for auto relocation of packages in the dependencies. | --rerun Causes the task to be re-run even if up-to-date. """ - .trimMargin() + .trimMargin(), ) } @@ -216,7 +216,7 @@ class JavaPluginsTest : BasePluginTest() { """ |include 'client', 'server' """ - .trimMargin() + .trimMargin(), ) projectScript.deleteExisting() @@ -226,7 +226,7 @@ class JavaPluginsTest : BasePluginTest() { |package client; |public class Client {} """ - .trimMargin() + .trimMargin(), ) path("client/build.gradle") .writeText( @@ -252,7 +252,7 @@ class JavaPluginsTest : BasePluginTest() { |} | """ - .trimMargin() + .trimMargin(), ) path("server/src/main/java/server/Server.java") @@ -263,7 +263,7 @@ class JavaPluginsTest : BasePluginTest() { |import client.junit.framework.Test; |public class Server {} """ - .trimMargin() + .trimMargin(), ) path("server/build.gradle") .writeText( @@ -275,7 +275,7 @@ class JavaPluginsTest : BasePluginTest() { |} | """ - .trimMargin() + .trimMargin(), ) // Running server:jar to ensure it compiles against the shadowed client @@ -316,7 +316,7 @@ class JavaPluginsTest : BasePluginTest() { |} | """ - .trimMargin() + .trimMargin(), ) path("consumer/build.gradle") @@ -334,7 +334,7 @@ class JavaPluginsTest : BasePluginTest() { |} | """ - .trimMargin() + .trimMargin(), ) val result = runWithSuccess(":consumer:printClasspathFiles") @@ -357,7 +357,7 @@ class JavaPluginsTest : BasePluginTest() { | implementation sourceSets.custom.output |} """ - .trimMargin() + .trimMargin(), ) path("client/src/custom/java/client/Custom1.java") .writeText( @@ -365,7 +365,7 @@ class JavaPluginsTest : BasePluginTest() { |package client; |public class Custom1 {} """ - .trimMargin() + .trimMargin(), ) path("client/src/custom/java/client/Custom2.java") .writeText( @@ -373,7 +373,7 @@ class JavaPluginsTest : BasePluginTest() { |package client; |public class Custom2 {} """ - .trimMargin() + .trimMargin(), ) path("client/src/custom/resources/Foo.bar").writeText("Foo=Bar") @@ -409,7 +409,7 @@ class JavaPluginsTest : BasePluginTest() { |} | """ - .trimMargin() + .trimMargin(), ) path("server/build.gradle") .appendText( @@ -418,7 +418,7 @@ class JavaPluginsTest : BasePluginTest() { | addMultiReleaseAttribute = $addAttribute |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(serverShadowJarPath) @@ -447,7 +447,7 @@ class JavaPluginsTest : BasePluginTest() { | ${implementationFiles(resJar)} |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -467,7 +467,7 @@ class JavaPluginsTest : BasePluginTest() { | compileOnly 'my:b:1.0' |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -501,7 +501,7 @@ class JavaPluginsTest : BasePluginTest() { | runtimeOnly 'my:runtime-only:1.0' |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -526,7 +526,7 @@ class JavaPluginsTest : BasePluginTest() { | implementation 'junit:junit:3.8.2' |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -551,7 +551,7 @@ class JavaPluginsTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -573,7 +573,7 @@ class JavaPluginsTest : BasePluginTest() { | shadow 'junit:junit:3.8.2' |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -595,7 +595,7 @@ class JavaPluginsTest : BasePluginTest() { | entryCompression = ${ZipEntryCompression::class.java.canonicalName}.$method |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -615,7 +615,7 @@ class JavaPluginsTest : BasePluginTest() { | compileOnly 'my:b:1.0' |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -688,7 +688,7 @@ class JavaPluginsTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(testShadowJarTask) @@ -703,7 +703,7 @@ class JavaPluginsTest : BasePluginTest() { |Hello, World! (foo) from Main |Refs: junit.framework.Test |""" - .trimMargin() + .trimMargin(), ) } } @@ -735,7 +735,7 @@ class JavaPluginsTest : BasePluginTest() { | logger.lifecycle("Has ShadowBasePlugin: " + hasShadowBasePlugin) |} """ - .trimMargin() + .trimMargin(), ) val result = runWithSuccess(testShadowJarTask) @@ -752,7 +752,7 @@ class JavaPluginsTest : BasePluginTest() { |Hello, World! (foo) from Main |Refs: junit.framework.Test |""" - .trimMargin() + .trimMargin(), ) } } @@ -774,7 +774,7 @@ class JavaPluginsTest : BasePluginTest() { | configurations = project.configurations.named('runtimeClasspath').map { [it] } |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess("jar", dependencyShadowJar) @@ -801,14 +801,14 @@ class JavaPluginsTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) val result = runWithFailure(customShadowJar) assertThat(result.output) .contains( - "R8 minimization requires a non-empty R8 classpath. Apply the Shadow plugin or configure the shadowR8 configuration." + "R8 minimization requires a non-empty R8 classpath. Apply the Shadow plugin or configure the shadowR8 configuration.", ) } @@ -822,7 +822,7 @@ class JavaPluginsTest : BasePluginTest() { | ${implementationFiles(nonExistentDir)} |} """ - .trimMargin() + .trimMargin(), ) val result = runWithSuccess(shadowJarPath) @@ -839,7 +839,7 @@ class JavaPluginsTest : BasePluginTest() { | ${implementationFiles(badJarPath)} |} """ - .trimMargin() + .trimMargin(), ) val result = runWithFailure(shadowJarPath) @@ -857,7 +857,7 @@ class JavaPluginsTest : BasePluginTest() { | ${implementationFiles(fooAarPath)} |} """ - .trimMargin() + .trimMargin(), ) val result = runWithFailure(shadowJarPath) @@ -884,7 +884,7 @@ class JavaPluginsTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -925,7 +925,7 @@ class JavaPluginsTest : BasePluginTest() { | from(nonJar) |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -951,7 +951,7 @@ class JavaPluginsTest : BasePluginTest() { | ) |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -994,7 +994,7 @@ class JavaPluginsTest : BasePluginTest() { | includedDependencies.from(files(createJars).asFileTree) |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -1013,7 +1013,7 @@ class JavaPluginsTest : BasePluginTest() { | id 'com.gradle.develocity' |} |""" - .trimMargin() + .trimMargin(), ) val result = @@ -1045,7 +1045,7 @@ class JavaPluginsTest : BasePluginTest() { | failOnDuplicateEntries = $enable |} """ - .trimMargin() + .trimMargin(), ) val result = @@ -1068,7 +1068,7 @@ class JavaPluginsTest : BasePluginTest() { | mainClass = '$input' |} """ - .trimMargin() + .trimMargin(), ) val result = runWithSuccess(shadowJarPath, infoArgument) @@ -1087,7 +1087,7 @@ class JavaPluginsTest : BasePluginTest() { | id 'java-library' |} """ - .trimMargin() + .trimMargin(), ) path("lib/src/main/java/com/company/Utils.java") .writeText( @@ -1100,7 +1100,7 @@ class JavaPluginsTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) path("app/build.gradle") .writeText( @@ -1158,7 +1158,7 @@ class JavaPluginsTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) path("app/src/main/java/com/company/Main.java") .writeText( @@ -1171,7 +1171,7 @@ class JavaPluginsTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(":app:$SHADOW_JAR_TASK_NAME") @@ -1202,7 +1202,7 @@ class JavaPluginsTest : BasePluginTest() { | toolchain.languageVersion = JavaLanguageVersion.of(${JavaVersion.current().majorVersion}) |} """ - .trimMargin() + .trimMargin(), ) val result = runWithSuccess(shadowJarPath) @@ -1231,7 +1231,7 @@ class JavaPluginsTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess("resolveAndLockAll", "--write-locks") @@ -1261,7 +1261,7 @@ class JavaPluginsTest : BasePluginTest() { | ${implementationFiles(one, two)} |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) diff --git a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/KotlinPluginsTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/KotlinPluginsTest.kt index bb37e5bfc..c43b95367 100644 --- a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/KotlinPluginsTest.kt +++ b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/KotlinPluginsTest.kt @@ -23,7 +23,7 @@ class KotlinPluginsTest : BasePluginTest() { override fun beforeEach() { super.beforeEach() projectScript.writeText( - getDefaultProjectBuildScript(plugin = "org.jetbrains.kotlin.multiplatform") + getDefaultProjectBuildScript(plugin = "org.jetbrains.kotlin.multiplatform"), ) } @@ -40,7 +40,7 @@ class KotlinPluginsTest : BasePluginTest() { | $stdlib |} """ - .trimMargin() + .trimMargin(), ) val mainClassEntry = writeClass(withImports = true, jvmLang = JvmLang.Kotlin) @@ -93,7 +93,7 @@ class KotlinPluginsTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -144,7 +144,7 @@ class KotlinPluginsTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -167,7 +167,7 @@ class KotlinPluginsTest : BasePluginTest() { | mingwX64() |} """ - .trimMargin() + .trimMargin(), ) val result = @@ -179,7 +179,7 @@ class KotlinPluginsTest : BasePluginTest() { assertThat(result.output) .contains( - "Cannot locate tasks that match ':shadowJar' as task 'shadowJar' not found in root project" + "Cannot locate tasks that match ':shadowJar' as task 'shadowJar' not found in root project", ) } @@ -203,7 +203,7 @@ class KotlinPluginsTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -237,7 +237,7 @@ class KotlinPluginsTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -275,7 +275,7 @@ class KotlinPluginsTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) val result = runWithFailure(shadowJarPath, infoArgument) diff --git a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/MinimizeTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/MinimizeTest.kt index 4f91912b3..315c34cae 100644 --- a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/MinimizeTest.kt +++ b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/MinimizeTest.kt @@ -64,7 +64,7 @@ class MinimizeTest : BasePluginTest() { | api project(':lib') |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(":impl:$SHADOW_JAR_TASK_NAME") @@ -98,7 +98,7 @@ class MinimizeTest : BasePluginTest() { """ |minimize() """ - .trimMargin() + .trimMargin(), ) path("server/src/main/java/server/Server.java") .writeText( @@ -110,7 +110,7 @@ class MinimizeTest : BasePluginTest() { | private final String client = Client.class.getName(); |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(serverShadowJarPath) @@ -145,7 +145,7 @@ class MinimizeTest : BasePluginTest() { | exclude(dependency('junit:junit:.*')) |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(serverShadowJarPath) @@ -178,7 +178,7 @@ class MinimizeTest : BasePluginTest() { | exclude(project(':client')) |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(serverShadowJarPath) @@ -214,7 +214,7 @@ class MinimizeTest : BasePluginTest() { | exclude(project(':client')) |} """ - .trimMargin() + .trimMargin(), ) path("client/src/main/java/client/Client.java") .writeText( @@ -225,7 +225,7 @@ class MinimizeTest : BasePluginTest() { | public static void main(String[] args) {} |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(serverShadowJarPath) @@ -253,7 +253,7 @@ class MinimizeTest : BasePluginTest() { |package client; |public class Client {} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(serverShadowJarPath) @@ -289,7 +289,7 @@ class MinimizeTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -309,7 +309,7 @@ class MinimizeTest : BasePluginTest() { | api platform('my:bom:1.0') |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(":impl:$SHADOW_JAR_TASK_NAME") @@ -335,7 +335,7 @@ class MinimizeTest : BasePluginTest() { """ |include 'api', 'lib', 'impl' |""" - .trimMargin() + .trimMargin(), ) projectScript.deleteExisting() @@ -345,7 +345,7 @@ class MinimizeTest : BasePluginTest() { |package lib; |public interface LibEntity {} """ - .trimMargin() + .trimMargin(), ) path("lib/src/main/java/lib/UnusedLibEntity.java") .writeText( @@ -353,7 +353,7 @@ class MinimizeTest : BasePluginTest() { |package lib; |public class UnusedLibEntity implements LibEntity {} """ - .trimMargin() + .trimMargin(), ) path("lib/build.gradle") .writeText( @@ -362,7 +362,7 @@ class MinimizeTest : BasePluginTest() { | id 'java' |} |""" - .trimMargin() + .trimMargin(), ) path("api/src/main/java/api/Entity.java") @@ -371,7 +371,7 @@ class MinimizeTest : BasePluginTest() { |package api; |public interface Entity {} """ - .trimMargin() + .trimMargin(), ) path("api/src/main/java/api/UnusedEntity.java") .writeText( @@ -380,7 +380,7 @@ class MinimizeTest : BasePluginTest() { |import lib.LibEntity; |public class UnusedEntity implements LibEntity {} """ - .trimMargin() + .trimMargin(), ) path("api/build.gradle") .writeText( @@ -393,7 +393,7 @@ class MinimizeTest : BasePluginTest() { | implementation project(':lib') |} |""" - .trimMargin() + .trimMargin(), ) path("impl/src/main/java/impl/SimpleEntity.java") @@ -403,7 +403,7 @@ class MinimizeTest : BasePluginTest() { |import api.Entity; |public class SimpleEntity implements Entity {} """ - .trimMargin() + .trimMargin(), ) path("impl/build.gradle") .writeText( @@ -417,7 +417,7 @@ class MinimizeTest : BasePluginTest() { |} | """ - .trimMargin() + .trimMargin(), ) } } diff --git a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/ParallelRelocationTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/ParallelRelocationTest.kt index 57563cdb1..3864c034a 100644 --- a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/ParallelRelocationTest.kt +++ b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/ParallelRelocationTest.kt @@ -35,7 +35,7 @@ class ParallelRelocationTest : BasePluginTest() { | relocate 'com.example.pkg', 'relocated.pkg' |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -79,7 +79,7 @@ class ParallelRelocationTest : BasePluginTest() { | relocate 'com.example.test', 'shadowed.example.test' |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -116,7 +116,7 @@ class ParallelRelocationTest : BasePluginTest() { | relocate 'com.example.relocated', 'shadowed.example.relocated' |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -147,7 +147,7 @@ class ParallelRelocationTest : BasePluginTest() { | relocate 'corrupt', 'relocated.corrupt' |} """ - .trimMargin() + .trimMargin(), ) val result = runWithFailure(shadowJarPath) 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 7af0a92f6..a2acbba99 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 @@ -65,8 +65,8 @@ class PublishingTest : BasePluginTest() { |archiveClassifier = '' |archiveBaseName = 'maven-all' """ - .trimMargin() - ) + .trimMargin(), + ), ) val assertions = { variantAttrs: Array> -> @@ -92,7 +92,7 @@ class PublishingTest : BasePluginTest() { | id 'org.gradle.toolchains.foojay-resolver-convention' |} |""" - .trimMargin() + .trimMargin(), ) projectScript.appendText( """ @@ -100,7 +100,7 @@ class PublishingTest : BasePluginTest() { | toolchain.languageVersion = JavaLanguageVersion.of(17) |} |""" - .trimMargin() + .trimMargin(), ) assertions(attrsWithoutTargetJvm + targetJvmAttr17) @@ -110,7 +110,7 @@ class PublishingTest : BasePluginTest() { | targetCompatibility = JavaVersion.VERSION_11 |} |""" - .trimMargin() + .trimMargin(), ) assertions(attrsWithoutTargetJvm + targetJvmAttr11) @@ -120,7 +120,7 @@ class PublishingTest : BasePluginTest() { | sourceCompatibility = JavaVersion.VERSION_1_8 |} |""" - .trimMargin() + .trimMargin(), ) // sourceCompatibility doesn't affect the target JVM version. assertions(attrsWithoutTargetJvm + targetJvmAttr11) @@ -131,7 +131,7 @@ class PublishingTest : BasePluginTest() { | options.release = 8 |} |""" - .trimMargin() + .trimMargin(), ) // options.release flag is honored. assertions(attrsWithoutTargetJvm + targetJvmAttr8) @@ -154,14 +154,14 @@ class PublishingTest : BasePluginTest() { |archiveBaseName = 'maven-all' """ .trimMargin(), - ) + ), ) val result = publish(infoArgument) assertThat(result.output) .contains( - "Cannot set the target JVM version to Int.MAX_VALUE when `java.autoTargetJvmDisabled` is enabled or in other cases." + "Cannot set the target JVM version to Int.MAX_VALUE when `java.autoTargetJvmDisabled` is enabled or in other cases.", ) assertShadowVariantCommon( gmm = gmmAdapter.fromJson(repoPath("my/maven-all/1.0/maven-all-1.0.module")), @@ -189,14 +189,14 @@ class PublishingTest : BasePluginTest() { |archiveBaseName = 'maven-all' """ .trimMargin(), - ) + ), ) val result = publish(infoArgument) assertThat(result.output) .contains( - "Skipping setting org.gradle.jvm.version attribute for shadowRuntimeElements configuration." + "Skipping setting org.gradle.jvm.version attribute for shadowRuntimeElements configuration.", ) assertShadowVariantCommon( gmm = gmmAdapter.fromJson(repoPath("my/maven-all/1.0/maven-all-1.0.module")), @@ -224,7 +224,7 @@ class PublishingTest : BasePluginTest() { |archiveBaseName = 'maven-all' """ .trimMargin(), - ) + ), ) publish() @@ -256,7 +256,7 @@ class PublishingTest : BasePluginTest() { |} """ .trimMargin(), - ) + ), ) publish() @@ -311,7 +311,7 @@ class PublishingTest : BasePluginTest() { |} """ .trimMargin(), - ) + ), ) publish() @@ -345,7 +345,7 @@ class PublishingTest : BasePluginTest() { |} """ .trimMargin(), - ) + ), ) publish() @@ -361,7 +361,7 @@ class PublishingTest : BasePluginTest() { assertShadowJarCommon(repoJarPath("$artifactRoot/my-gradle-plugin-1.0.jar")) assertPomCommon(repoPath("$artifactRoot/my-gradle-plugin-1.0.pom")) assertShadowVariantCommon( - gmmAdapter.fromJson(repoPath("$artifactRoot/my-gradle-plugin-1.0.module")) + gmmAdapter.fromJson(repoPath("$artifactRoot/my-gradle-plugin-1.0.module")), ) } @@ -390,7 +390,7 @@ class PublishingTest : BasePluginTest() { |} """ .trimMargin(), - ) + ), ) publish() @@ -442,7 +442,7 @@ class PublishingTest : BasePluginTest() { |} """ .trimMargin(), - ) + ), ) publish() @@ -558,7 +558,7 @@ class PublishingTest : BasePluginTest() { |} """ .trimMargin(), - ) + ), ) val result = publish(infoArgument) @@ -569,7 +569,7 @@ class PublishingTest : BasePluginTest() { "Adding shadowRuntimeElements variant to java component." } else { "Skipping adding shadowRuntimeElements variant to java component." - } + }, ) val assertVariantsCommon = { gmm: GradleModuleMetadata -> assertThat(gmm.apiElementsVariant).all { diff --git a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/R8MinimizationTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/R8MinimizationTest.kt index e8486419e..d2fad06ca 100644 --- a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/R8MinimizationTest.kt +++ b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/R8MinimizationTest.kt @@ -37,7 +37,7 @@ class R8MinimizationTest : BasePluginTest() { | r8 {} |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(appShadowJarPath) @@ -64,7 +64,7 @@ class R8MinimizationTest : BasePluginTest() { |-keep,includedescriptorclasses class app.App { *; } |# End of content from $inputConfigPath |""" - .trimMargin() + .trimMargin(), ) } @@ -102,7 +102,7 @@ class R8MinimizationTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(appShadowJarPath) @@ -132,7 +132,7 @@ class R8MinimizationTest : BasePluginTest() { |-keep class lib.Reflective { *; } |# End of content from $inputConfigPath |""" - .trimMargin() + .trimMargin(), ) } @@ -149,7 +149,7 @@ class R8MinimizationTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(appShadowJarPath) @@ -173,7 +173,7 @@ class R8MinimizationTest : BasePluginTest() { |-keep class lib.Reflective { *; } |# End of content from $inputConfigPath |""" - .trimMargin() + .trimMargin(), ) } @@ -188,7 +188,7 @@ class R8MinimizationTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(appShadowJarPath) @@ -226,7 +226,7 @@ class R8MinimizationTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(appShadowJarPath) @@ -245,7 +245,7 @@ class R8MinimizationTest : BasePluginTest() { |-printusage reports/usage.txt |# End of content from $inputConfigPath |""" - .trimMargin() + .trimMargin(), ) assertThat(path("app/build/r8/reports/mapping.txt").readText()).contains("lib.Used") assertThat(path("app/build/r8/reports/seeds.txt").readText()).contains("app.App") @@ -262,7 +262,7 @@ class R8MinimizationTest : BasePluginTest() { | r8 {} |} """ - .trimMargin() + .trimMargin(), ) path("lib/src/main/resources/META-INF/proguard/lib.pro") .writeText("-keep class lib.Reflective { *; }") @@ -299,7 +299,7 @@ class R8MinimizationTest : BasePluginTest() { |-keep class lib.Reflective { *; } |# End of content from $embeddedConfigPath |""" - .trimMargin() + .trimMargin(), ) } @@ -312,7 +312,7 @@ class R8MinimizationTest : BasePluginTest() { | r8 {} |} """ - .trimMargin() + .trimMargin(), ) path("lib/src/main/resources/META-INF/proguard/lib.pro") .writeText( @@ -324,7 +324,7 @@ class R8MinimizationTest : BasePluginTest() { | public (); |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(appShadowJarPath) @@ -358,7 +358,7 @@ class R8MinimizationTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(appShadowJarPath) @@ -387,7 +387,7 @@ class R8MinimizationTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(appShadowJarPath) @@ -410,7 +410,7 @@ class R8MinimizationTest : BasePluginTest() { | r8 {} |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(appShadowJarPath) @@ -444,7 +444,7 @@ class R8MinimizationTest : BasePluginTest() { |-keep class lib.Used { *; } |# End of content from $inputConfigPath |""" - .trimMargin() + .trimMargin(), ) } @@ -524,7 +524,7 @@ class R8MinimizationTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(appShadowJarPath) @@ -585,7 +585,7 @@ class R8MinimizationTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(appShadowJarPath) @@ -613,7 +613,7 @@ class R8MinimizationTest : BasePluginTest() { """ |include 'app', 'lib' """ - .trimMargin() + .trimMargin(), ) projectScript.deleteExisting() @@ -627,7 +627,7 @@ class R8MinimizationTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) path("lib/src/main/java/lib/Unused.java") .writeText( @@ -635,7 +635,7 @@ class R8MinimizationTest : BasePluginTest() { |package lib; |public class Unused {} """ - .trimMargin() + .trimMargin(), ) path("lib/src/main/java/lib/Reflective.java") .writeText( @@ -643,7 +643,7 @@ class R8MinimizationTest : BasePluginTest() { |package lib; |public class Reflective {} """ - .trimMargin() + .trimMargin(), ) path("lib/build.gradle") .writeText( @@ -651,7 +651,7 @@ class R8MinimizationTest : BasePluginTest() { |${getDefaultProjectBuildScript("java")} | """ - .trimMargin() + .trimMargin(), ) path("app/src/main/java/app/App.java") @@ -665,7 +665,7 @@ class R8MinimizationTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) path("app/build.gradle") .writeText( @@ -680,7 +680,7 @@ class R8MinimizationTest : BasePluginTest() { |} | """ - .trimMargin() + .trimMargin(), ) } @@ -689,7 +689,7 @@ class R8MinimizationTest : BasePluginTest() { """ |include 'app', 'service' """ - .trimMargin() + .trimMargin(), ) projectScript.deleteExisting() @@ -701,7 +701,7 @@ class R8MinimizationTest : BasePluginTest() { | String greet(); |} """ - .trimMargin() + .trimMargin(), ) path("service/src/main/java/service/DefaultGreeter.java") .writeText( @@ -713,7 +713,7 @@ class R8MinimizationTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) path("service/src/main/resources/META-INF/services/service.Greeter") .writeText("service.DefaultGreeter") @@ -723,7 +723,7 @@ class R8MinimizationTest : BasePluginTest() { |${getDefaultProjectBuildScript("java")} | """ - .trimMargin() + .trimMargin(), ) path("app/src/main/java/app/App.java") @@ -732,7 +732,7 @@ class R8MinimizationTest : BasePluginTest() { |package app; |public class App {} """ - .trimMargin() + .trimMargin(), ) path("app/build.gradle") .writeText( @@ -748,7 +748,7 @@ class R8MinimizationTest : BasePluginTest() { |} | """ - .trimMargin() + .trimMargin(), ) } } diff --git a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/RelocationTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/RelocationTest.kt index 8ec589ce7..be0d4c9c1 100644 --- a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/RelocationTest.kt +++ b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/RelocationTest.kt @@ -39,14 +39,14 @@ class RelocationTest : BasePluginTest() { | relocationPrefix = '$relocationPrefix' |} """ - .trimMargin() + .trimMargin(), ) val entryPrefix = relocationPrefix.replace('.', '/') val relocatedEntries = buildSet { addAll( junitEntries .map { "$entryPrefix/$it" } - .filterNot { it.startsWith("$entryPrefix/META-INF/") } + .filterNot { it.startsWith("$entryPrefix/META-INF/") }, ) var parent = entryPrefix while (parent.isNotEmpty()) { @@ -89,7 +89,7 @@ class RelocationTest : BasePluginTest() { | relocate 'junit.framework', 'b' |} """ - .trimMargin() + .trimMargin(), ) val runnerFilter = { it: String -> it.startsWith("junit/runner/") } val frameworkFilter = { it: String -> it.startsWith("junit/framework/") } @@ -139,7 +139,7 @@ class RelocationTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) val runnerFilter = { it: String -> it.startsWith("junit/runner/") && it != "junit/runner/BaseTestRunner.class" @@ -189,7 +189,7 @@ class RelocationTest : BasePluginTest() { | relocate 'junit.framework', 'shadow.junit' |} """ - .trimMargin() + .trimMargin(), ) val relocatedEntries = junitEntries.map { it.replace("junit/framework/", "shadow/junit/") }.toTypedArray() @@ -205,7 +205,7 @@ class RelocationTest : BasePluginTest() { | public void run(TestResult result) { } |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -242,7 +242,7 @@ class RelocationTest : BasePluginTest() { | relocate 'foo', 'bar' |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -282,7 +282,7 @@ class RelocationTest : BasePluginTest() { | preserveFileTimestamps = $preserveFileTimestamps |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -310,7 +310,7 @@ class RelocationTest : BasePluginTest() { // time. if (entry.time < currentTimeMillis) { fail( - "Relocated directory ${entry.name} has an invalid last modified time: ${entry.time}" + "Relocated directory ${entry.name} has an invalid last modified time: ${entry.time}", ) } } @@ -371,7 +371,7 @@ class RelocationTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -410,7 +410,7 @@ class RelocationTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -441,7 +441,7 @@ class RelocationTest : BasePluginTest() { | relocate('', 'foo/') |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -466,7 +466,7 @@ class RelocationTest : BasePluginTest() { | relocate('foo', 'shadow.foo') |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -479,7 +479,7 @@ class RelocationTest : BasePluginTest() { |shadow.foo.Foo |shadow.foo.Bar |""" - .trimMargin() + .trimMargin(), ) } } @@ -497,7 +497,7 @@ class RelocationTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) val expected = if (skipStringConstants) { @@ -543,7 +543,7 @@ class RelocationTest : BasePluginTest() { | relocate('org.package', 'shadow.org.package') |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -557,7 +557,7 @@ class RelocationTest : BasePluginTest() { |(Lshadow/org/package/ClassC;Lshadow/org/package/ClassD;) |()Lshadow/org/package/ClassE;Lshadow/org/package/ClassF; |""" - .trimMargin() + .trimMargin(), ) } } @@ -575,7 +575,7 @@ class RelocationTest : BasePluginTest() { | enableAutoRelocation = true |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(":jar", shadowJarPath) @@ -602,7 +602,7 @@ class RelocationTest : BasePluginTest() { | enableKotlinModuleRemapping = $enableKotlinModuleRemapping |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -657,7 +657,7 @@ class RelocationTest : BasePluginTest() { | } |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -691,7 +691,7 @@ class RelocationTest : BasePluginTest() { | relocate 'foo', 'shadow.foo' |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) diff --git a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/AppendingTransformerTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/AppendingTransformerTest.kt index 0dbce5975..3a6a6da98 100644 --- a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/AppendingTransformerTest.kt +++ b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/AppendingTransformerTest.kt @@ -15,7 +15,7 @@ class AppendingTransformerTest : BaseTransformerTest() { transform( dependenciesBlock = implementationFiles(one, two), transformerBlock = "resource = '$ENTRY_TEST_PROPERTIES'", - ) + ), ) runWithSuccess(shadowJarPath) diff --git a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/BaseTransformerTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/BaseTransformerTest.kt index 2d173523c..7165cc64a 100644 --- a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/BaseTransformerTest.kt +++ b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/BaseTransformerTest.kt @@ -18,7 +18,7 @@ abstract class BaseTransformerTest : BasePluginTest() { |} | """ - .trimMargin() + .trimMargin(), ) } @@ -26,7 +26,7 @@ abstract class BaseTransformerTest : BasePluginTest() { builder: JarBuilder.() -> Unit = { insert(ENTRY_SERVICES_SHADE, CONTENT_ONE) insert(ENTRY_SERVICES_FOO, "one") - } + }, ): Path { return buildJar("one.jar", builder) } @@ -35,7 +35,7 @@ abstract class BaseTransformerTest : BasePluginTest() { builder: JarBuilder.() -> Unit = { insert(ENTRY_SERVICES_SHADE, CONTENT_TWO) insert(ENTRY_SERVICES_FOO, "two") - } + }, ): Path { return buildJar("two.jar", builder) } diff --git a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/GroovyExtensionModuleTransformerTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/GroovyExtensionModuleTransformerTest.kt index b4ce17adf..cda4bc234 100644 --- a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/GroovyExtensionModuleTransformerTest.kt +++ b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/GroovyExtensionModuleTransformerTest.kt @@ -20,8 +20,8 @@ class GroovyExtensionModuleTransformerTest : BaseTransformerTest() { fun groovyExtensionModuleTransformer() { projectScript.appendText( transform( - dependenciesBlock = implementationFiles(buildJarFoo(), buildJarBar()) - ) + dependenciesBlock = implementationFiles(buildJarFoo(), buildJarBar()), + ), ) runWithSuccess(shadowJarPath) diff --git a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ProGuardFilesResourceTransformerTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ProGuardFilesResourceTransformerTest.kt index cd0a64cdf..16fc6286b 100644 --- a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ProGuardFilesResourceTransformerTest.kt +++ b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ProGuardFilesResourceTransformerTest.kt @@ -30,7 +30,7 @@ class ProGuardFilesResourceTransformerTest : BaseTransformerTest() { | transform(${ProGuardFilesResourceTransformer::class.java.name}) |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -50,7 +50,7 @@ class ProGuardFilesResourceTransformerTest : BaseTransformerTest() { |-keep class com.example.Client |-keep class com.example.Server """ - .trimMargin() + .trimMargin(), ) getContent("META-INF/proguard/client.pro").isEqualTo("-dontwarn com.example.client.**") getContent("META-INF/proguard/server.pro").isEqualTo("-dontwarn com.example.server.**") @@ -97,7 +97,7 @@ class ProGuardFilesResourceTransformerTest : BaseTransformerTest() { | relocate("bar", "relocated.bar") |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -127,7 +127,7 @@ class ProGuardFilesResourceTransformerTest : BaseTransformerTest() { |# Extension rules |-keep class relocated.bar.BarDriver """ - .trimMargin() + .trimMargin(), ) classLoader { loadClass("relocated.com.example.Driver") diff --git a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformerTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformerTest.kt index 6e0f33afb..dd88affb7 100644 --- a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformerTest.kt +++ b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformerTest.kt @@ -44,7 +44,7 @@ class PropertiesFileTransformerTest : BaseTransformerTest() { | } |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -61,7 +61,7 @@ class PropertiesFileTransformerTest : BaseTransformerTest() { |---- |license two """ - .trimMargin() + .trimMargin(), ) } } diff --git a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ServiceFileTransformerTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ServiceFileTransformerTest.kt index 2818cd30f..0ec331035 100644 --- a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ServiceFileTransformerTest.kt +++ b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ServiceFileTransformerTest.kt @@ -74,7 +74,7 @@ class ServiceFileTransformerTest : BaseTransformerTest() { | relocate("bar", "relocated.bar") |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -100,7 +100,7 @@ class ServiceFileTransformerTest : BaseTransformerTest() { |relocated.foo.FooDriver |relocated.bar.BarDriver |""" - .trimMargin() + .trimMargin(), ) classLoader { loadClass("relocated.com.example.Driver") @@ -144,7 +144,7 @@ class ServiceFileTransformerTest : BaseTransformerTest() { | } |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -163,7 +163,7 @@ class ServiceFileTransformerTest : BaseTransformerTest() { |relocated.foo.FooDriver |relocated.bar.BarDriver |""" - .trimMargin() + .trimMargin(), ) classLoader { loadClass("relocated.com.example.Driver") @@ -187,7 +187,7 @@ class ServiceFileTransformerTest : BaseTransformerTest() { | mergeServiceFiles() |} """ - .trimMargin() + .trimMargin(), ) path("src/main/resources/$servicesBarEntry").writeText(CONTENT_THREE) @@ -243,7 +243,7 @@ class ServiceFileTransformerTest : BaseTransformerTest() { | } |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -265,7 +265,7 @@ class ServiceFileTransformerTest : BaseTransformerTest() { | } |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -294,7 +294,7 @@ class ServiceFileTransformerTest : BaseTransformerTest() { | } |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -317,7 +317,7 @@ class ServiceFileTransformerTest : BaseTransformerTest() { |} | """ - .trimMargin() + .trimMargin(), ) } diff --git a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/TransformersTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/TransformersTest.kt index cd0b8526b..a56eaef39 100644 --- a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/TransformersTest.kt +++ b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/TransformersTest.kt @@ -35,7 +35,7 @@ class TransformersTest : BaseTransformerTest() { | } |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -67,8 +67,8 @@ class TransformersTest : BaseTransformerTest() { |mainClass = 'my.Main' |manifestEntries = ['$TEST_ENTRY_ATTR_KEY': 'PASSED', 'Number-Entry': 123, '$NEW_ENTRY_ATTR_KEY': 'NEW'] """ - .trimMargin() - ) + .trimMargin(), + ), ) runWithSuccess(shadowJarPath) @@ -96,10 +96,10 @@ class TransformersTest : BaseTransformerTest() { """ |manifestEntries.put('Header-To-Remove-1', ${ManifestResourceTransformer::class.java.name}.NULL) """ - .trimMargin() + .trimMargin(), )} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -117,8 +117,8 @@ class TransformersTest : BaseTransformerTest() { val two = buildJarOne { insert(PLUGIN_CACHE_FILE, content) } projectScript.appendText( transform( - dependenciesBlock = implementationFiles(one, two) - ) + dependenciesBlock = implementationFiles(one, two), + ), ) runWithSuccess(shadowJarPath) @@ -149,7 +149,7 @@ class TransformersTest : BaseTransformerTest() { transform( dependenciesBlock = implementationFiles(one, two), transformerBlock = "include('foo/bar')", - ) + ), ) runWithSuccess(shadowJarPath) @@ -173,7 +173,7 @@ class TransformersTest : BaseTransformerTest() { | transform(${CustomResourceTransformer::class.java.name}) |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -190,7 +190,7 @@ class TransformersTest : BaseTransformerTest() { insert("foo/bar.txt", "bar") } projectScript.appendText( - transform(dependenciesBlock = implementationFiles(one)) + transform(dependenciesBlock = implementationFiles(one)), ) runWithSuccess(shadowJarPath) @@ -215,7 +215,7 @@ class TransformersTest : BaseTransformerTest() { transform( dependenciesBlock = implementationFiles(one, two), transformerBlock = "artifactLicense = file('LICENSE')", - ) + ), ) runWithSuccess(shadowJarPath) @@ -239,7 +239,7 @@ class TransformersTest : BaseTransformerTest() { | |License from Two """ - .trimMargin() + .trimMargin(), ) } } @@ -261,7 +261,7 @@ class TransformersTest : BaseTransformerTest() { |copyright = 'Copyright 2026 Foo\n' """ .trimMargin(), - ) + ), ) runWithSuccess(shadowJarPath) @@ -279,7 +279,7 @@ class TransformersTest : BaseTransformerTest() { | |Notice from B """ - .trimMargin() + .trimMargin(), ) } } @@ -330,7 +330,7 @@ class TransformersTest : BaseTransformerTest() { | relocate('org.example', 'relocated.org.example') |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -354,7 +354,7 @@ class TransformersTest : BaseTransformerTest() { | | """ - .trimMargin() + .trimMargin(), ) } } @@ -375,7 +375,7 @@ class TransformersTest : BaseTransformerTest() { | relocate('kotlin', 'my.kotlin') |} """ - .trimMargin() + .trimMargin(), ) runWithSuccess(shadowJarPath) @@ -421,7 +421,7 @@ class TransformersTest : BaseTransformerTest() { transform( dependenciesBlock = implementationFiles(one, two), transformerBlock = "resource = '$xmlEntry'", - ) + ), ) runWithSuccess(shadowJarPath) @@ -436,7 +436,7 @@ class TransformersTest : BaseTransformerTest() { | | |""" - .trimMargin() + .trimMargin(), ) } } @@ -446,7 +446,7 @@ class TransformersTest : BaseTransformerTest() { assertThat(getValue(TEST_ENTRY_ATTR_KEY)).isEqualTo("PASSED") assertThat(getValue(mainClassAttributeKey)).isEqualTo("my.Main") assertThat(getValue(NEW_ENTRY_ATTR_KEY)).isEqualTo("NEW") - } + }, ) { val mf = outputShadowedJar.use { it.manifest } assertThat(mf).isNotNull() diff --git a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/util/AppendableMavenRepository.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/util/AppendableMavenRepository.kt index f4e86a06e..3ac277661 100644 --- a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/util/AppendableMavenRepository.kt +++ b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/util/AppendableMavenRepository.kt @@ -106,7 +106,7 @@ class AppendableMavenRepository(val root: Path) { |Publish modules to Maven repository at ${root.toUri()}: |${modules.joinToString("\n") { it.coordinate }} """ - .trimMargin() + .trimMargin(), ) modules.clear() } @@ -119,7 +119,7 @@ class AppendableMavenRepository(val root: Path) { val (groupId, artifactId, version) = coordinate.split(":").takeIf { it.size == 3 } ?: error( - "Invalid coordinate format: '$coordinate'. Expected format is 'groupId:artifactId:version'." + "Invalid coordinate format: '$coordinate'. Expected format is 'groupId:artifactId:version'.", ) val dependency = Dependency().also { diff --git a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/util/LocalMavenRepository.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/util/LocalMavenRepository.kt index 64644a589..9f8c5b190 100644 --- a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/util/LocalMavenRepository.kt +++ b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/util/LocalMavenRepository.kt @@ -6,7 +6,7 @@ import kotlin.io.path.createTempDirectory fun createDefaultLocalMavenRepository(junitJar: Path): AppendableMavenRepository { return AppendableMavenRepository( - root = createTempDirectory().resolve("local-maven-repo").createDirectories() + root = createTempDirectory().resolve("local-maven-repo").createDirectories(), ) .apply { jarModule("junit", "junit", "3.8.2") { useJar(junitJar) } diff --git a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowApplicationPlugin.kt b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowApplicationPlugin.kt index 2bb9ef578..0e602af4e 100644 --- a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowApplicationPlugin.kt +++ b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowApplicationPlugin.kt @@ -98,7 +98,7 @@ public abstract class ShadowApplicationPlugin : Plugin { gradleError( "The specified installation directory '$destinationDir' is neither empty nor does it contain an installation for '${applicationName.get()}'.\n" + "If you really want to install to this directory, delete it and run the install task again.\n" + - "Alternatively, choose a different installation directory." + "Alternatively, choose a different installation directory.", ) } } @@ -113,7 +113,7 @@ public abstract class ShadowApplicationPlugin : Plugin { // defaults to project.name so we append the suffix to match the default // distributionBaseName. Modified from `ApplicationPlugin.configureDistribution()`. "${applicationExtension.applicationName}-$DISTRIBUTION_NAME" - } + }, ) dist.contents { distSpec -> distSpec.from(file("src/dist")) diff --git a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowJavaPlugin.kt b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowJavaPlugin.kt index ff017e8ca..e0f47993d 100644 --- a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowJavaPlugin.kt +++ b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowJavaPlugin.kt @@ -98,7 +98,7 @@ constructor(private val softwareComponentFactory: SoftwareComponentFactory) : Pl .attribute(TARGET_JVM_VERSION_ATTRIBUTE, targetJvmVersion) } else { logger.info( - "Cannot set the target JVM version to Int.MAX_VALUE when `java.autoTargetJvmDisabled` is enabled or in other cases." + "Cannot set the target JVM version to Int.MAX_VALUE when `java.autoTargetJvmDisabled` is enabled or in other cases.", ) } } else { diff --git a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowKmpPlugin.kt b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowKmpPlugin.kt index c8bb3a257..600d844e5 100644 --- a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowKmpPlugin.kt +++ b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowKmpPlugin.kt @@ -39,7 +39,7 @@ public abstract class ShadowKmpPlugin : Plugin { task.configurations.convention( kotlinJvmMain .flatMap { configurations.named(it.runtimeDependencyConfigurationName) } - .map { listOf(it) } + .map { listOf(it) }, ) if (!isAtLeastKgp("1.9.0")) return@registerShadowJarCommon diff --git a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowPlugin.kt b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowPlugin.kt index 817478bb2..428bdb6e2 100644 --- a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowPlugin.kt +++ b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowPlugin.kt @@ -21,7 +21,7 @@ public abstract class ShadowPlugin : Plugin { withId("com.android.base") { gradleError( "Shadow does not support being used with AGP. You may need the Android Fused Library plugin instead. " + - "See https://developer.android.com/build/publish-library/fused-library" + "See https://developer.android.com/build/publish-library/fused-library", ) } project.configureBuildScan() diff --git a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/DuplicatesStrategyChecker.kt b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/DuplicatesStrategyChecker.kt index 021545c4f..0a49692bd 100644 --- a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/DuplicatesStrategyChecker.kt +++ b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/DuplicatesStrategyChecker.kt @@ -25,7 +25,7 @@ internal fun ResourceTransformer.checkDupStrategy( Set it to INCLUDE or WARN to ensure all duplicates are processed by the transformer. See https://gradleup.com/shadow/configuration/merging/#handling-duplicates-strategy for more details. """ - .trimIndent() + .trimIndent(), ) } else -> Unit diff --git a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/GradleCompat.kt b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/GradleCompat.kt index f6c317801..6871bf57c 100644 --- a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/GradleCompat.kt +++ b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/GradleCompat.kt @@ -77,7 +77,7 @@ internal fun FileTreeElement.inputStream(): InputStream = internal fun FileTreeElement.readBytes(): ByteArray = inputStream().use(InputStream::readBytes) internal inline fun ObjectFactory.property( - defaultValue: Any? = null + defaultValue: Any? = null, ): Property = property(V::class.java).apply { defaultValue ?: return@apply @@ -90,7 +90,7 @@ internal inline fun ObjectFactory.property( @Suppress("UNCHECKED_CAST") internal inline fun ObjectFactory.listProperty( - defaultValue: Any? = null + defaultValue: Any? = null, ): ListProperty = listProperty(V::class.java).apply { defaultValue ?: return@apply @@ -103,7 +103,7 @@ internal inline fun ObjectFactory.listProperty( @Suppress("UNCHECKED_CAST") internal inline fun ObjectFactory.setProperty( - defaultValue: Any? = null + defaultValue: Any? = null, ): SetProperty = setProperty(V::class.java).apply { defaultValue ?: return@apply @@ -116,7 +116,7 @@ internal inline fun ObjectFactory.setProperty( @Suppress("UNCHECKED_CAST") internal inline fun ObjectFactory.mapProperty( - defaultValue: Any? = null + defaultValue: Any? = null, ): MapProperty = mapProperty(String::class.java, V::class.java).apply { defaultValue ?: return@apply diff --git a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/R8Minimizer.kt b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/R8Minimizer.kt index 69f9115e7..0da9566a4 100644 --- a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/R8Minimizer.kt +++ b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/R8Minimizer.kt @@ -41,7 +41,7 @@ internal fun minimizeWithR8( ) { if (r8Classpath.isEmpty) { gradleError( - "R8 minimization requires a non-empty R8 classpath. Apply the Shadow plugin or configure the shadowR8 configuration." + "R8 minimization requires a non-empty R8 classpath. Apply the Shadow plugin or configure the shadowR8 configuration.", ) } @@ -67,7 +67,7 @@ internal fun minimizeWithR8( keptDependencyFiles = keptDependencyFiles, relocators = relocators, ) - .joinToString(System.lineSeparator()) + .joinToString(System.lineSeparator()), ) val arguments = buildList { @@ -127,12 +127,12 @@ private fun createRules( addAll( // Project classes are the public surface of the shadowed jar, even when nothing in the // input jar refers to every class directly. - sourceSetsClassesDirs.toKeepRules(jarClasses, relocators, "-keep,includedescriptorclasses") + sourceSetsClassesDirs.toKeepRules(jarClasses, relocators, "-keep,includedescriptorclasses"), ) addAll( // Keep dependencies users explicitly excluded from minimization, matching the existing // minimize { exclude(...) } contract for the default analyzer. - keptDependencyFiles.toKeepRules(jarClasses, relocators, "-keep") + keptDependencyFiles.toKeepRules(jarClasses, relocators, "-keep"), ) addAll(serviceRules) } diff --git a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/relocation/SimpleRelocator.kt b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/relocation/SimpleRelocator.kt index 85384f069..740059ba6 100644 --- a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/relocation/SimpleRelocator.kt +++ b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/relocation/SimpleRelocator.kt @@ -73,13 +73,13 @@ constructor( // Excludes should be subpackages of the global pattern. if (exclude.startsWith(this.pattern)) { sourcePackageExcludes.add( - exclude.substring(this.pattern.length).replaceFirst("[.][*]$".toRegex(), "") + exclude.substring(this.pattern.length).replaceFirst("[.][*]$".toRegex(), ""), ) } // Excludes should be subpackages of the global pattern. if (exclude.startsWith(pathPattern)) { sourcePathExcludes.add( - exclude.substring(pathPattern.length).replaceFirst("/[*]$".toRegex(), "") + exclude.substring(pathPattern.length).replaceFirst("/[*]$".toRegex(), ""), ) } } @@ -209,7 +209,7 @@ constructor( "|" + "\\{@link( \\*)* $" + "|" + - "([{}(=;,]|\\*/) $" + "([{}(=;,]|\\*/) $", ) fun normalizePatterns(patterns: Collection?) = buildSet { diff --git a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/DependencyFilter.kt b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/DependencyFilter.kt index 64a3007a0..7966d4b05 100644 --- a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/DependencyFilter.kt +++ b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/DependencyFilter.kt @@ -63,7 +63,7 @@ public interface DependencyFilter { excludedDependencies = excludes, ) excludes.flatMap { it.moduleArtifacts.map(ResolvedArtifact::getFile) } - } + }, ) } diff --git a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt index bfcdfb066..4fdc22a1d 100644 --- a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt +++ b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt @@ -1,5 +1,5 @@ @file:Suppress( - "InternalGradleApiUsage" + "InternalGradleApiUsage", ) // We have to use internal Gradle APIs to implement a CopyAction. package com.github.jengelman.gradle.plugins.shadow.tasks @@ -104,7 +104,7 @@ internal constructor( ``` See: https://docs.gradle.org/current/dsl/org.gradle.api.tasks.bundling.Zip.html#org.gradle.api.tasks.bundling.Zip:zip64 for more details. """ - .trimIndent() + .trimIndent(), ) } zipFile.delete() @@ -205,7 +205,7 @@ internal constructor( entryName = relocatedPath, fileDetails = fileDetails, deferredBytes = deferred, - ) + ), ) if (pendingEntries.size >= MAX_PENDING_ENTRIES) { runBlocking { pendingEntries.removeFirst().writeToZip() } @@ -243,7 +243,7 @@ internal constructor( logger.debug("Transforming resource '{}' using {}.", path, transformer::class.simpleName) fileDetails.inputStream().use { inputStream -> transformer.transform( - TransformerContext(path = path, inputStream = inputStream, relocators = relocators) + TransformerContext(path = path, inputStream = inputStream, relocators = relocators), ) } return true diff --git a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar.kt b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar.kt index e33047b13..b7a96a7d5 100644 --- a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar.kt +++ b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar.kt @@ -457,7 +457,7 @@ public abstract class ShadowJar : Jar() { @Deprecated( message = - "Construct a Relocator instance and use relocate(Relocator, Action) instead. This will be removed in Shadow 10." + "Construct a Relocator instance and use relocate(Relocator, Action) instead. This will be removed in Shadow 10.", ) @JvmOverloads public open fun relocate(clazz: Class, action: Action = Action {}) { @@ -474,7 +474,7 @@ public abstract class ShadowJar : Jar() { @Suppress("DeprecatedCallableAddReplaceWith") @Deprecated( message = - "Construct a Relocator instance and use relocate(Relocator, Action) instead. This will be removed in Shadow 10." + "Construct a Relocator instance and use relocate(Relocator, Action) instead. This will be removed in Shadow 10.", ) @JvmSynthetic public inline fun relocate(action: Action = Action {}) { @@ -786,7 +786,7 @@ public abstract class ShadowJar : Jar() { project.plugins.withId("org.gradle.java") { task.javaLauncher.convention( - project.javaToolchainService.launcherFor(project.javaPluginExtension.toolchain) + project.javaToolchainService.launcherFor(project.javaPluginExtension.toolchain), ) } diff --git a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ApacheLicenseResourceTransformer.kt b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ApacheLicenseResourceTransformer.kt index 565df9d04..0d887e457 100644 --- a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ApacheLicenseResourceTransformer.kt +++ b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ApacheLicenseResourceTransformer.kt @@ -24,7 +24,7 @@ constructor( patternSet: PatternSet = PatternSet() .apply { isCaseSensitive = false } - .include(LICENSE_PATH, LICENSE_TXT_PATH, LICENSE_MD_PATH) + .include(LICENSE_PATH, LICENSE_TXT_PATH, LICENSE_MD_PATH), ) : PatternFilterableResourceTransformer(patternSet = patternSet) { override fun canTransformResource(element: FileTreeElement): Boolean { return super.canTransformResource(element).also { flag -> checkDupStrategy(flag, element) } diff --git a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ApacheNoticeResourceTransformer.kt b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ApacheNoticeResourceTransformer.kt index 73e41b8d4..6671ead49 100644 --- a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ApacheNoticeResourceTransformer.kt +++ b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ApacheNoticeResourceTransformer.kt @@ -50,13 +50,13 @@ public open class ApacheNoticeResourceTransformer( // NOTICE file corresponding to the section 4d of The Apache License, // Version 2.0, in this case for """ - .trimIndent() + " " // The space is important for formatting. + .trimIndent() + " ", // The space is important for formatting. ) @get:Input public open val preamble2: Property = objectFactory.property( - "\n// ------------------------------------------------------------------\n" + "\n// ------------------------------------------------------------------\n", ) @get:Input @@ -88,7 +88,7 @@ public open class ApacheNoticeResourceTransformer( @Inject public constructor( - objectFactory: ObjectFactory + objectFactory: ObjectFactory, ) : this( objectFactory, patternSet = diff --git a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/DeduplicatingResourceTransformer.kt b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/DeduplicatingResourceTransformer.kt index e843985d6..2fc362555 100644 --- a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/DeduplicatingResourceTransformer.kt +++ b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/DeduplicatingResourceTransformer.kt @@ -86,7 +86,7 @@ public open class DeduplicatingResourceTransformer( if (duplicatePaths.isNotEmpty()) { val message = buildString { append( - "Found ${duplicatePaths.size} path duplicate(s) with different content in the shadowed JAR:\n" + "Found ${duplicatePaths.size} path duplicate(s) with different content in the shadowed JAR:\n", ) duplicatePaths.forEach { (path, infos) -> append(" * $path\n") diff --git a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/KotlinModuleMetadataTransformer.kt b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/KotlinModuleMetadataTransformer.kt index ed33e5e5b..c3a111ac0 100644 --- a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/KotlinModuleMetadataTransformer.kt +++ b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/KotlinModuleMetadataTransformer.kt @@ -26,7 +26,7 @@ public open class KotlinModuleMetadataTransformer( @Inject public constructor( - objectFactory: ObjectFactory + objectFactory: ObjectFactory, ) : this( objectFactory, PatternSet().include("**/*.kotlin_module"), diff --git a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ManifestAppenderTransformer.kt b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ManifestAppenderTransformer.kt index 408bbb4b2..3e2c3ada2 100644 --- a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ManifestAppenderTransformer.kt +++ b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ManifestAppenderTransformer.kt @@ -25,7 +25,7 @@ import org.gradle.api.tasks.Input */ @Deprecated( message = - "Use `ManifestResourceTransformer` or `ShadowJar.manifest` instead. This will be removed in Shadow 10." + "Use `ManifestResourceTransformer` or `ShadowJar.manifest` instead. This will be removed in Shadow 10.", ) @CacheableTransformer public open class ManifestAppenderTransformer diff --git a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/MergeLicenseResourceTransformer.kt b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/MergeLicenseResourceTransformer.kt index f81a9d5dc..70bf8dfb0 100644 --- a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/MergeLicenseResourceTransformer.kt +++ b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/MergeLicenseResourceTransformer.kt @@ -76,7 +76,7 @@ public open class MergeLicenseResourceTransformer( |This artifact includes dependencies with the following licenses: |---------------------------------------------------------------- |""" - .trimMargin() + .trimMargin(), ) /** Separator between included dependency license texts. */ @@ -85,7 +85,7 @@ public open class MergeLicenseResourceTransformer( @Inject public constructor( - objectFactory: ObjectFactory + objectFactory: ObjectFactory, ) : this( objectFactory, patternSet = diff --git a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/PatternFilterableResourceTransformer.kt b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/PatternFilterableResourceTransformer.kt index 5c943d62e..ba44f0619 100644 --- a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/PatternFilterableResourceTransformer.kt +++ b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/PatternFilterableResourceTransformer.kt @@ -14,7 +14,7 @@ import org.gradle.api.tasks.util.PatternSet * @param patternSet The [PatternSet] used for filtering resources. */ public abstract class PatternFilterableResourceTransformer( - @Internal public val patternSet: PatternSet + @Internal public val patternSet: PatternSet, ) : ResourceTransformer by ResourceTransformer.Companion, PatternFilterable by patternSet { @get:Internal diff --git a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ServiceFileTransformer.kt b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ServiceFileTransformer.kt index b3623fc65..9688ff11c 100644 --- a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ServiceFileTransformer.kt +++ b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ServiceFileTransformer.kt @@ -29,7 +29,7 @@ public open class ServiceFileTransformer @JvmOverloads constructor( patternSet: PatternSet = - PatternSet().include(SERVICES_PATTERN).exclude(PATH_LEGACY_GROOVY_EXTENSION_MODULE_DESCRIPTOR) + PatternSet().include(SERVICES_PATTERN).exclude(PATH_LEGACY_GROOVY_EXTENSION_MODULE_DESCRIPTOR), ) : PatternFilterableResourceTransformer(patternSet = patternSet) { @get:Internal internal val serviceEntries = mutableMapOf>() diff --git a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowPropertiesTest.kt b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowPropertiesTest.kt index 91c70e5ab..2e4a3bc67 100644 --- a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowPropertiesTest.kt +++ b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowPropertiesTest.kt @@ -157,7 +157,7 @@ class ShadowPropertiesTest { .launcherFor(javaPluginExtension.toolchain) .get() .metadata - .jvmVersion + .jvmVersion, ) assertThat(relocationPrefix.get()).isEqualTo(ShadowBasePlugin.SHADOW) @@ -192,14 +192,14 @@ class ShadowPropertiesTest { .launcherFor(javaPluginExtension.toolchain) .get() .metadata - .jvmVersion + .jvmVersion, ) } with(startShadowScripts) { assertThat(description) .isEqualTo( - "Creates OS specific scripts to run the project as a JVM application using the shadow jar" + "Creates OS specific scripts to run the project as a JVM application using the shadow jar", ) assertThat(classpath?.files) .isNotNull() diff --git a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/BytecodeRemappingTest.kt b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/BytecodeRemappingTest.kt index 027866b1f..c65b89082 100644 --- a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/BytecodeRemappingTest.kt +++ b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/BytecodeRemappingTest.kt @@ -52,7 +52,7 @@ class BytecodeRemappingTest { SimpleRelocator( "com.github.jengelman.gradle.plugins.shadow.internal", "com.example.relocated", - ) + ), ) // Internal name of the relocated FixtureBase for use in assertions. @@ -240,7 +240,7 @@ class BytecodeRemappingTest { "com.github.jengelman.gradle.plugins.shadow.internal", "com.example.relocated", skipStringConstants = true, - ) + ), ) val result = fixtureSubjectDetails.remapClass(skipRelocators) @@ -267,7 +267,7 @@ class BytecodeRemappingTest { val method = result.classInfo().methodData.single { it.name == "methodWithGeneric" } assertThat(checkNotNull(method.signature)) .isEqualTo( - $$"(Ljava/util/List<+Lcom/example/relocated/BytecodeRemappingTest$FixtureBase;>;)Lcom/example/relocated/BytecodeRemappingTest$FixtureBase;" + $$"(Ljava/util/List<+Lcom/example/relocated/BytecodeRemappingTest$FixtureBase;>;)Lcom/example/relocated/BytecodeRemappingTest$FixtureBase;", ) } @@ -278,7 +278,7 @@ class BytecodeRemappingTest { val method = result.classInfo().methodData.single { it.name == "methodWithNestedGeneric" } assertThat(checkNotNull(method.signature)) .isEqualTo( - $$"(Lcom/example/relocated/BytecodeRemappingTest$FixtureGenericOuter.FixtureInner;)V" + $$"(Lcom/example/relocated/BytecodeRemappingTest$FixtureGenericOuter.FixtureInner;)V", ) } @@ -527,7 +527,7 @@ private fun ByteArray.classInfo(): ClassBytecodeInfo { checkcastTargets.toList(), invokeOwners.toList(), stringConsts.toList(), - ) + ), ) } } diff --git a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/MinimizeSpecsTest.kt b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/MinimizeSpecsTest.kt index 4af4df447..f2258da5c 100644 --- a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/MinimizeSpecsTest.kt +++ b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/MinimizeSpecsTest.kt @@ -45,7 +45,7 @@ class MinimizeSpecsTest { assertThat(classpath.files).isEmpty() assertThat(configurationFile.get().asFile) .isEqualTo( - project.layout.buildDirectory.file("shadowJar/r8/configuration.txt").get().asFile + project.layout.buildDirectory.file("shadowJar/r8/configuration.txt").get().asFile, ) } diff --git a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/ReproduciblePropertiesTest.kt b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/ReproduciblePropertiesTest.kt index 9292536c4..124447b0a 100644 --- a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/ReproduciblePropertiesTest.kt +++ b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/ReproduciblePropertiesTest.kt @@ -45,7 +45,7 @@ class ReproduciblePropertiesTest { |key=value |key2=value2 |""" - .trimMargin() + .trimMargin(), ) } @@ -70,7 +70,7 @@ class ReproduciblePropertiesTest { |€²³=x |传傳磨宿说説=b |""" - .trimMargin() + .trimMargin(), ) } @@ -89,7 +89,7 @@ class ReproduciblePropertiesTest { """ |\ leading\:\=\#\!=line1\nline2\t\\ |""" - .trimMargin() + .trimMargin(), ) } diff --git a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/relocation/SimpleRelocatorTest.kt b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/relocation/SimpleRelocatorTest.kt index 4a88226aa..80b5e9e55 100644 --- a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/relocation/SimpleRelocatorTest.kt +++ b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/relocation/SimpleRelocatorTest.kt @@ -262,15 +262,15 @@ class SimpleRelocatorTest { ), ) assertThat( - relocator.canRelocatePath("org/apache/iceberg/spark/parquet/SparkNativeParquet.class") + relocator.canRelocatePath("org/apache/iceberg/spark/parquet/SparkNativeParquet.class"), ) .isFalse() assertThat( - relocator.canRelocatePath("org/apache/iceberg/spark/parquet/SparkNativeParquet$.class") + relocator.canRelocatePath("org/apache/iceberg/spark/parquet/SparkNativeParquet$.class"), ) .isFalse() assertThat( - relocator.canRelocatePath("org/apache/spark/sql/execution/datasources/parquet/v1.class") + relocator.canRelocatePath("org/apache/spark/sql/execution/datasources/parquet/v1.class"), ) .isFalse() assertThat(relocator.canRelocatePath("org/foo/Class.class")).isTrue() @@ -284,15 +284,15 @@ class SimpleRelocatorTest { excludes = listOf("%regex[org/apache/iceberg/.*]", "%regex[org/apache/spark/.*]"), ) assertThat( - relocator.canRelocatePath("org/apache/iceberg/spark/parquet/SparkNativeParquet.class") + relocator.canRelocatePath("org/apache/iceberg/spark/parquet/SparkNativeParquet.class"), ) .isFalse() assertThat( - relocator.canRelocatePath("org/apache/iceberg/spark/parquet/SparkNativeParquet$.class") + relocator.canRelocatePath("org/apache/iceberg/spark/parquet/SparkNativeParquet$.class"), ) .isFalse() assertThat( - relocator.canRelocatePath("org/apache/spark/sql/execution/datasources/parquet/v1.class") + relocator.canRelocatePath("org/apache/spark/sql/execution/datasources/parquet/v1.class"), ) .isFalse() assertThat(relocator.canRelocatePath("org/foo/Class.class")).isTrue() @@ -306,18 +306,18 @@ class SimpleRelocatorTest { listOf( "org/apache/iceberg/spark/parquet/**", "org/apache/spark/sql/execution/datasources/parquet/**", - ) + ), ) assertThat( - relocator.canRelocatePath("org/apache/iceberg/spark/parquet/SparkNativeParquet.class") + relocator.canRelocatePath("org/apache/iceberg/spark/parquet/SparkNativeParquet.class"), ) .isTrue() assertThat( - relocator.canRelocatePath("org/apache/iceberg/spark/parquet/SparkNativeParquet$.class") + relocator.canRelocatePath("org/apache/iceberg/spark/parquet/SparkNativeParquet$.class"), ) .isTrue() assertThat( - relocator.canRelocatePath("org/apache/spark/sql/execution/datasources/parquet/v1.class") + relocator.canRelocatePath("org/apache/spark/sql/execution/datasources/parquet/v1.class"), ) .isTrue() assertThat(relocator.canRelocatePath("org/foo/Class.class")).isFalse() @@ -327,18 +327,18 @@ class SimpleRelocatorTest { fun canRelocateIncludedSourceFileWithRegex() { val relocator = SimpleRelocator( - includes = listOf("%regex[org/apache/iceberg/.*]", "%regex[org/apache/spark/.*]") + includes = listOf("%regex[org/apache/iceberg/.*]", "%regex[org/apache/spark/.*]"), ) assertThat( - relocator.canRelocatePath("org/apache/iceberg/spark/parquet/SparkNativeParquet.class") + relocator.canRelocatePath("org/apache/iceberg/spark/parquet/SparkNativeParquet.class"), ) .isTrue() assertThat( - relocator.canRelocatePath("org/apache/iceberg/spark/parquet/SparkNativeParquet$.class") + relocator.canRelocatePath("org/apache/iceberg/spark/parquet/SparkNativeParquet$.class"), ) .isTrue() assertThat( - relocator.canRelocatePath("org/apache/spark/sql/execution/datasources/parquet/v1.class") + relocator.canRelocatePath("org/apache/spark/sql/execution/datasources/parquet/v1.class"), ) .isTrue() assertThat(relocator.canRelocatePath("org/foo/Class.class")).isFalse() @@ -376,9 +376,9 @@ class SimpleRelocatorTest { assertThat( fooRelocator.applyToSourceContent( asmRelocator.applyToSourceContent( - ioRelocator.applyToSourceContent(relocator.applyToSourceContent(sourceFile)) - ) - ) + ioRelocator.applyToSourceContent(relocator.applyToSourceContent(sourceFile)), + ), + ), ) .isEqualTo(relocatedFile) } diff --git a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyActionTest.kt b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyActionTest.kt index f0cf101e1..54c001ce1 100644 --- a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyActionTest.kt +++ b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyActionTest.kt @@ -69,7 +69,7 @@ class ShadowCopyActionTest { |``` |See: https://docs.gradle.org/current/dsl/org.gradle.api.tasks.bundling.Zip.html#org.gradle.api.tasks.bundling.Zip:zip64 for more details. """ - .trimMargin() + .trimMargin(), ) } @@ -94,7 +94,7 @@ class ShadowCopyActionTest { |``` |See: https://docs.gradle.org/current/dsl/org.gradle.api.tasks.bundling.Zip.html#org.gradle.api.tasks.bundling.Zip:zip64 for more details. """ - .trimMargin() + .trimMargin(), ) } diff --git a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ApacheNoticeResourceTransformerTest.kt b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ApacheNoticeResourceTransformerTest.kt index b46353529..88a9bbcd0 100644 --- a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ApacheNoticeResourceTransformerTest.kt +++ b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ApacheNoticeResourceTransformerTest.kt @@ -60,7 +60,7 @@ class ApacheNoticeResourceTransformerTest : BaseTransformerTest | """ - .trimMargin() + .trimMargin(), ) } } diff --git a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/DeduplicatingResourceTransformerTest.kt b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/DeduplicatingResourceTransformerTest.kt index 30ebaddd1..a090c6067 100644 --- a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/DeduplicatingResourceTransformerTest.kt +++ b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/DeduplicatingResourceTransformerTest.kt @@ -134,7 +134,7 @@ class DeduplicatingResourceTransformerTest : | * $file3 (SHA256: dab741b6289e7dccc1ed42330cae1accc2b755ce8079c2cd5d4b5366c9f769a6) | """ - .trimMargin() + .trimMargin(), ) } } diff --git a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/GroovyExtensionModuleTransformerTest.kt b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/GroovyExtensionModuleTransformerTest.kt index 58d517b40..7ec7c31d1 100644 --- a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/GroovyExtensionModuleTransformerTest.kt +++ b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/GroovyExtensionModuleTransformerTest.kt @@ -75,11 +75,11 @@ class GroovyExtensionModuleTransformerTest : assertThat(properties.getProperty(KEY_EXTENSION_CLASSES)) .isEqualTo( "com.example.shaded.acme.foo.FooExtension,com.example.shaded.acme.foo.BarExtension," + - "com.example.shaded.acme.bar.SomeExtension,com.example.shaded.acme.bar.AnotherExtension" + "com.example.shaded.acme.bar.SomeExtension,com.example.shaded.acme.bar.AnotherExtension", ) assertThat(properties.getProperty(KEY_STATIC_EXTENSION_CLASSES)) .isEqualTo( - "com.example.shaded.acme.foo.FooStaticExtension,com.example.shaded.acme.bar.SomeStaticExtension" + "com.example.shaded.acme.foo.FooStaticExtension,com.example.shaded.acme.bar.SomeStaticExtension", ) } diff --git a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/KotlinModuleMetadataTransformerTest.kt b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/KotlinModuleMetadataTransformerTest.kt index 08e44d04f..356cbd40a 100644 --- a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/KotlinModuleMetadataTransformerTest.kt +++ b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/KotlinModuleMetadataTransformerTest.kt @@ -96,7 +96,7 @@ class KotlinModuleMetadataTransformerTest : BaseTransformerTest name.replace("kotlin/", "my/kotlin/") to facade.replace("kotlin/", "my/kotlin/") - } + }, ) } } diff --git a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ManifestAppenderTransformerTest.kt b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ManifestAppenderTransformerTest.kt index 9f142b2d8..e09fd3b41 100644 --- a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ManifestAppenderTransformerTest.kt +++ b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ManifestAppenderTransformerTest.kt @@ -55,7 +55,7 @@ class ManifestAppenderTransformerTest : BaseTransformerTest=\"2.0,1.2,1.1,1.0\"" + "jakarta.decorator\";version:List=\"2.0,1.2,1.1,1.0\"", ) assertThat(jarPath.getMainAttr("Require-Capability")) .isEqualTo( @@ -86,7 +86,7 @@ class ManifestResourceTransformerTest : BaseTransformerTest=\"2.0,1.2,1.1,1.0\"" + "shaded.javax.decorator\";version:List=\"2.0,1.2,1.1,1.0\"", ) assertThat(jarPath.getMainAttr("Require-Capability")) .isEqualTo( @@ -128,7 +128,7 @@ class ManifestResourceTransformerTest : BaseTransformerTest assertThat(jarPath.getMainAttr("Export-Package")) .isEqualTo( - """shaded.org.foo.public.api;version="1.0",org.foo.internal.impl;version="1.0"""" + """shaded.org.foo.public.api;version="1.0",org.foo.internal.impl;version="1.0"""", ) } } diff --git a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/MergeLicenseResourceTransformerTest.kt b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/MergeLicenseResourceTransformerTest.kt index 75b1bfcb2..defdeada1 100644 --- a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/MergeLicenseResourceTransformerTest.kt +++ b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/MergeLicenseResourceTransformerTest.kt @@ -76,7 +76,7 @@ class MergeLicenseResourceTransformerTest : BaseTransformerTest; } """ - .trimMargin() + .trimMargin(), ) } } diff --git a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformerTest.kt b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformerTest.kt index 460f2b92b..555242acc 100644 --- a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformerTest.kt +++ b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformerTest.kt @@ -78,7 +78,7 @@ class PropertiesFileTransformerTest : BaseTransformerTest | val2 | |""" - .trimMargin() + .trimMargin(), ) } @@ -93,7 +93,7 @@ class XmlAppendingTransformerTest : BaseTransformerTest | val2 | |""" - .trimMargin() + .trimMargin(), ) } @@ -125,7 +125,7 @@ class XmlAppendingTransformerTest : BaseTransformerTest | | |""" - .trimMargin() + .trimMargin(), ) } }