From c403e74fec89c9f38d4528b7e0b3fb70aac01e14 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 5 May 2023 22:21:03 +0000 Subject: [PATCH] Update plugin mavenShadow to v8.1.1 (#1635) * Update plugin mavenShadow to v8.1.1 * Update API --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Zac Sweers --- gradle/libs.versions.toml | 2 +- moshi-kotlin-codegen/build.gradle.kts | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5ff2bc5..788ecf0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,7 +13,7 @@ dokka = { id = "org.jetbrains.dokka", version = "1.8.10" } japicmp = { id = "me.champeau.gradle.japicmp", version = "0.4.1" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.25.2" } -mavenShadow = { id = "com.github.johnrengelman.shadow", version = "8.0.0" } +mavenShadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" } spotless = { id = "com.diffplug.spotless", version = "6.18.0" } [libraries] diff --git a/moshi-kotlin-codegen/build.gradle.kts b/moshi-kotlin-codegen/build.gradle.kts index 69b6a04..e6f48fb 100644 --- a/moshi-kotlin-codegen/build.gradle.kts +++ b/moshi-kotlin-codegen/build.gradle.kts @@ -1,4 +1,3 @@ -import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation import com.github.jengelman.gradle.plugins.shadow.transformers.ServiceFileTransformer import com.vanniktech.maven.publish.JavadocJar.None import com.vanniktech.maven.publish.KotlinJvm @@ -84,13 +83,8 @@ dependencies { testImplementation(libs.kotlinCompileTesting) } -val relocateShadowJar = tasks.register("relocateShadowJar") { - target = tasks.shadowJar.get() -} - val shadowJar = tasks.shadowJar.apply { configure { - dependsOn(relocateShadowJar) archiveClassifier.set("") configurations = listOf(shade) relocate("com.squareup.kotlinpoet.metadata", "com.squareup.moshi.kotlinpoet.metadata")