Upgrade to shadow plugin 8.3.1
The plugin has been renamed, see
https://github.com/GradleUp/shadow/releases/tag/8.3.0
Test: ./gradlew bOS --dry-run
Change-Id: I18eee60060f5968295a5006f1053b9db5026cb30
diff --git a/buildSrc-tests/build.gradle b/buildSrc-tests/build.gradle
index 7e2cde9..f2e88f3 100644
--- a/buildSrc-tests/build.gradle
+++ b/buildSrc-tests/build.gradle
@@ -55,7 +55,7 @@
dependencies {
api(libs.javaxInject)
- api(libs.johnrengelmanShadow)
+ api(libs.shadow)
api(libs.guavaAndroid)
api(libs.kotlinGradlePluginApi)
api(libs.kotlinNativeUtils)
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/sbom/Sbom.kt b/buildSrc/private/src/main/kotlin/androidx/build/sbom/Sbom.kt
index 657ce6a..104c1b5 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/sbom/Sbom.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/sbom/Sbom.kt
@@ -364,5 +364,4 @@
}
}
-private fun Project.appliesShadowPlugin() =
- pluginManager.hasPlugin("com.github.johnrengelman.shadow")
+private fun Project.appliesShadowPlugin() = pluginManager.hasPlugin("com.gradleup.shadow")
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/uptodatedness/TaskUpToDateValidator.kt b/buildSrc/private/src/main/kotlin/androidx/build/uptodatedness/TaskUpToDateValidator.kt
index 774c697..84ed799 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/uptodatedness/TaskUpToDateValidator.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/uptodatedness/TaskUpToDateValidator.kt
@@ -57,7 +57,7 @@
"generateJsonModelRelease",
/**
* relocateShadowJar is used to configure the ShadowJar hence it does not have any outputs.
- * https://github.com/johnrengelman/shadow/issues/561
+ * https://github.com/GradleUp/shadow/issues/561
*/
"relocateShadowJar",
"testDebugUnitTest",
diff --git a/buildSrc/public/src/main/kotlin/androidx/build/BundleInsideHelper.kt b/buildSrc/public/src/main/kotlin/androidx/build/BundleInsideHelper.kt
index 54d4719..ba370be 100644
--- a/buildSrc/public/src/main/kotlin/androidx/build/BundleInsideHelper.kt
+++ b/buildSrc/public/src/main/kotlin/androidx/build/BundleInsideHelper.kt
@@ -19,7 +19,6 @@
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext
-import org.apache.tools.zip.ZipOutputStream
import org.gradle.api.Project
import org.gradle.api.artifacts.Configuration
import org.gradle.api.attributes.Usage
@@ -29,6 +28,7 @@
import org.gradle.api.tasks.SourceSetContainer
import org.gradle.api.tasks.TaskProvider
import org.gradle.kotlin.dsl.named
+import shadow.org.apache.tools.zip.ZipOutputStream
/** Allow java and Android libraries to bundle other projects inside the project jar/aar. */
object BundleInsideHelper {
diff --git a/compose/lint/internal-lint-checks/build.gradle b/compose/lint/internal-lint-checks/build.gradle
index d1078c6..ff45a52 100644
--- a/compose/lint/internal-lint-checks/build.gradle
+++ b/compose/lint/internal-lint-checks/build.gradle
@@ -26,7 +26,7 @@
plugins {
id("AndroidXPlugin")
id("kotlin")
- id("com.github.johnrengelman.shadow")
+ id("com.gradleup.shadow")
}
dependencies {
diff --git a/emoji2/emoji2-views-helper/build.gradle b/emoji2/emoji2-views-helper/build.gradle
index 1362d13..cfb9c51 100644
--- a/emoji2/emoji2-views-helper/build.gradle
+++ b/emoji2/emoji2-views-helper/build.gradle
@@ -10,7 +10,6 @@
plugins {
id("AndroidXPlugin")
id("com.android.library")
- id("com.github.johnrengelman.shadow")
}
dependencies {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 932cb8d..1931b6b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -62,7 +62,6 @@
moshi = "1.13.0"
node = "16.20.2"
protobuf = "3.22.3"
-shadow = "8.1.1"
skiko = "0.7.7"
spdxGradlePlugin = "0.6.0"
sqldelight = "1.3.0"
@@ -160,7 +159,6 @@
javaxInject = { module = "javax.inject:javax.inject", version.ref = "javaxInject" }
jcodec = { module = "org.jcodec:jcodec", version.ref = "jcodec" }
jcodecJavaSe = { module = "org.jcodec:jcodec-javase", version.ref = "jcodec" }
-johnrengelmanShadow = { module = "com.github.johnrengelman:shadow", version.ref = "shadow" }
json = { module = "org.json:json", version = "20180813" }
jsoup = { module = "org.jsoup:jsoup", version = "1.16.2" }
jsqlparser = { module = "com.github.jsqlparser:jsqlparser", version = "3.1" }
@@ -280,7 +278,7 @@
rxjava2 = { module = "io.reactivex.rxjava2:rxjava", version = "2.2.9" }
rxjava3 = { module = "io.reactivex.rxjava3:rxjava", version = "3.0.0" }
sdklib = { module = "com.android.tools:sdklib", version.ref = "androidLint" }
-shadow = { module = "com.github.johnrengelman.shadow:com.github.johnrengelman.shadow.gradle.plugin", version = "8.1.1" }
+shadow = { module = "com.gradleup.shadow:shadow-gradle-plugin", version = "8.3.1" }
skiko = { module = "org.jetbrains.skiko:skiko-awt", version.ref = "skiko" }
skikoCommon = { module = "org.jetbrains.skiko:skiko", version.ref = "skiko" }
skikoMacOsArm64 = { module = "org.jetbrains.skiko:skiko-awt-runtime-macos-arm64", version.ref = "skiko" }
diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
index de71d39..8139e55 100644
--- a/gradle/verification-keyring.keys
+++ b/gradle/verification-keyring.keys
@@ -7449,6 +7449,35 @@
=N8tg
-----END PGP PUBLIC KEY BLOCK-----
+pub 39B48E1BADDB933F
+uid GradleUp (GradleUp sonatype key) <[email protected]>
+
+sub 8F97B35AA6D60AA4
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v@RELEASE_NAME@
+
+mQENBGE/hA0BCAC+MEPPNI9edKJ8TTplIvVa4o5Umd89fWtwhkxOaenN6y07L9iV
+rI2RISRdv73Kc+K+Qb1Vlom4Fa9R4+NAibhb/QRsn1LkA02Z6JIF9w78JN9DBesS
+090TiQwZMzgljJaLVIxzCZk6T9XlZQC3bXmkyZkYS/a9NMa7JnXrPua06JKpH9vZ
+cM6L4TUb0p6Tw7RsdBHKBj895XqIVlqJXfNEpcOZ2LCMUcVaOJFS/dAXSrTmNdT1
+z1eoeoob/CbHIzH3STWVCXnXOw9APOry+aPpBHAD9g+1Q1BEj8pSmEnByjeO6yHN
+UMbFTUtM77oVAbLx6rHL7jzfgUQdVPr8PgU3ABEBAAG0NUdyYWRsZVVwIChHcmFk
+bGVVcCBzb25hdHlwZSBrZXkpIDxtYXJ0aW5AbWJvbm5pbi5uZXQ+uQENBGE/hA0B
+CADaDvPtymFgLSJLHPCRIUATJNwKu06QIE1nJ9EiCzHn6HfKm9EvY48g8ovfziQi
+bleP7MKllhUXm/ZAN8/ufg3/kRD0KI4aFyToiJtvBOweSfOj/USgC2nSDh7BcZXn
+dVkSafrjsrFMdk2sFDiTNi+Qv+BULC3m1ciG0AQyGYQIiGMZnKpTDP6aHZUZTFTB
+h9JRXWhjTG4xO3WadRKYAUN879tp73KMACuaI0tK99fLEN/bMMmd9cxBTpZztDnd
+PnVlLVyFZGTmjdJKCMcLC/gnixiRpLoy7qXzj9z/nrlZ3QcAPgGKtM+AO37Zsbbn
+Qox+Yao0o+GvycRCtNT4OcaTABEBAAGJATYEGAEIACAWIQRIV9HOBOePqyoXLo85
+tI4brduTPwUCYT+EDQIbDAAKCRA5tI4brduTP5/RB/9YiKJTWHr0PRVtV8STKvFm
+gMVw+RF+eig5vZ/MKq0svyfeFLf7i/XfndEG4X85G169tvNI7MG8d362NdpSwEdJ
+ekiQh4+i5oE5ZdnNDvPXr2pVAKDhyuyPuMUmA0Zf+JWDQ5vfzgpcxos3Y3i2D1D5
+92BDms675Ob18NvjjAMNR9bf0vEmjlv/k5oWUe0lYEDOBnImGgEIPqEOOvKrXZFT
+klXcR/JI0sUwvNWLfAsyi3HtnR8r9n26tyo0wCBVWO+zXjvI7xhvpS6bvI1CfeQ0
+04CuCUoP619vciqXdyso5jTobWTXxKvMHgrbw0XAZVlL53qp1OUWi1pA2/eQRMdY
+=QFYD
+-----END PGP PUBLIC KEY BLOCK-----
+
pub 3A1959EEF8726006
uid Eclipse Project for JAF <[email protected]>
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 1ab52b7..0c19032 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -203,6 +203,7 @@
<trusting group="^com[.]jakewharton($|([.].*))" regex="true"/>
</trusted-key>
<trusted-key id="47EB6836245D2D40E89DFB4136D4E9618F3ADAB5" group="io.github.microutils" name="kotlin-logging-jvm"/>
+ <trusted-key id="4857D1CE04E78FAB2A172E8F39B48E1BADDB933F" group="com.gradleup.shadow"/>
<trusted-key id="4BF79B8259007B566D2FCE82296CD27F60EED12C" group="com.google.crypto.tink"/>
<trusted-key id="4DADED739CDF2CD0E48E0EC44044EDF1BB73EFEA" group="jaxen" name="jaxen"/>
<trusted-key id="4DB1A49729B053CAF015CEE9A6ADFC93EF34893E" group="org.hamcrest"/>
@@ -473,7 +474,6 @@
</trusted-key>
<trusted-key id="CF17E92C9FFA55316B5DB83901D734EE5EE9C3F8" group="org.eclipse.sisu"/>
<trusted-key id="CF4B3A3F53BEF9A2CE2CBFB895962C5E716C39AA" group="com.autonomousapps"/>
- <trusted-key id="D066F5C471D32A00D244F99D6ED0F678B90EB06E" group="com.github.johnrengelman"/>
<trusted-key id="D196A5E3E70732EEB2E5007F1861C322C56014B2" group="commons-lang"/>
<trusted-key id="D433F9C895710DB8AB087FA6B7C3B43D18EAA8B7" group="org.codehaus.mojo"/>
<trusted-key id="D477D51812E692011DB11E66A6EA2E2BF22E0543">
@@ -582,11 +582,6 @@
<sha256 value="26e82330157d6b844b67a8064945e206581e772977183e3e31fec6058aa9a59b" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
- <component group="com.github.johnrengelman.shadow" name="com.github.johnrengelman.shadow.gradle.plugin" version="8.1.1">
- <artifact name="com.github.johnrengelman.shadow.gradle.plugin-8.1.1.pom">
- <sha256 value="3cb3886b97df6e066f108c316b219f262c97c3cb2df6da78927e645deb643cb0" origin="Generated by Gradle" reason="Artifact is not signed"/>
- </artifact>
- </component>
<component group="com.github.webassembly" name="binaryen" version="117">
<artifact name="binaryen-117-x86_64-linux.tar.gz">
<sha256 value="3dc677006555b355ea2da5e82602065a161d5e83eaefd3f759afa00b96e83212" origin="Generated by Gradle" reason="https://github.com/WebAssembly/binaryen/issues/6783"/>
diff --git a/inspection/inspection-gradle-plugin/src/main/kotlin/androidx/inspection/gradle/ShadowDependenciesTask.kt b/inspection/inspection-gradle-plugin/src/main/kotlin/androidx/inspection/gradle/ShadowDependenciesTask.kt
index a2fc20d..648f3f4 100644
--- a/inspection/inspection-gradle-plugin/src/main/kotlin/androidx/inspection/gradle/ShadowDependenciesTask.kt
+++ b/inspection/inspection-gradle-plugin/src/main/kotlin/androidx/inspection/gradle/ShadowDependenciesTask.kt
@@ -23,14 +23,14 @@
import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext
import java.io.File
import java.util.jar.JarFile
-import org.apache.tools.zip.ZipEntry
-import org.apache.tools.zip.ZipOutputStream
import org.gradle.api.Project
import org.gradle.api.artifacts.type.ArtifactTypeDefinition
import org.gradle.api.attributes.Attribute
import org.gradle.api.file.FileTreeElement
import org.gradle.api.tasks.Copy
import org.gradle.api.tasks.TaskProvider
+import shadow.org.apache.tools.zip.ZipEntry
+import shadow.org.apache.tools.zip.ZipOutputStream
fun Project.registerShadowDependenciesTask(
variant: Variant,
@@ -57,7 +57,6 @@
it.archiveVersion.set("")
it.dependsOn(zipTask)
val prefix = "deps.${project.name.replace('-', '.')}"
- @Suppress("UnstableApiUsage")
val runtimeDeps =
variant.runtimeConfiguration.incoming
.artifactView {
@@ -74,7 +73,6 @@
it.from({ runtimeDeps.files })
it.doFirst {
val task = it as ShadowJar
- @Suppress("UnstableApiUsage")
runtimeDeps.files
.flatMap { it.extractPackageNames() }
.toSet()
diff --git a/playground-common/playground-build.gradle b/playground-common/playground-build.gradle
index de90f8f..6b9db14 100644
--- a/playground-common/playground-build.gradle
+++ b/playground-common/playground-build.gradle
@@ -40,7 +40,7 @@
}
}
gradlePluginPortal().content {
- it.includeModule("gradle.plugin.com.github.johnrengelman", "shadow")
+ it.includeModule("com.gradleup.shadow", "shadow-gradle-plugin")
it.includeModule("me.champeau.gradle", "japicmp-gradle-plugin")
}
}
diff --git a/playground-common/playground-plugin/settings.gradle b/playground-common/playground-plugin/settings.gradle
index 9680ada..494d808 100644
--- a/playground-common/playground-plugin/settings.gradle
+++ b/playground-common/playground-plugin/settings.gradle
@@ -32,9 +32,9 @@
it.includeModule("com.gradle", "develocity-gradle-plugin")
it.includeModule("com.gradle", "common-custom-user-data-gradle-plugin")
it.includeModule("org.spdx", "spdx-gradle-plugin")
- it.includeModule("com.github.johnrengelman.shadow",
- "com.github.johnrengelman.shadow.gradle.plugin")
- it.includeModule("com.github.johnrengelman", "shadow")
+ it.includeModule("com.gradleup.shadow",
+ "com.gradleup.shadow.gradle.plugin")
+ it.includeModule("com.gradleup.shadow", "shadow-gradle-plugin")
}
}
}
diff --git a/privacysandbox/tools/tools-apigenerator/build.gradle b/privacysandbox/tools/tools-apigenerator/build.gradle
index b419d0b..22d2387 100644
--- a/privacysandbox/tools/tools-apigenerator/build.gradle
+++ b/privacysandbox/tools/tools-apigenerator/build.gradle
@@ -28,7 +28,7 @@
plugins {
id("AndroidXPlugin")
id("kotlin")
- id("com.github.johnrengelman.shadow")
+ id("com.gradleup.shadow")
}
androidx.configureAarAsJarForConfiguration("testImplementation")
diff --git a/room/room-compiler-processing/build.gradle b/room/room-compiler-processing/build.gradle
index 1890458..8c6ea4f 100644
--- a/room/room-compiler-processing/build.gradle
+++ b/room/room-compiler-processing/build.gradle
@@ -27,7 +27,7 @@
plugins {
id("AndroidXPlugin")
id("kotlin")
- id("com.github.johnrengelman.shadow")
+ id("com.gradleup.shadow")
}
configurations {
