From 9a906716a1dff08e669d0c54b7d129ce1258e2fb Mon Sep 17 00:00:00 2001 From: Anuraag Agrawal Date: Fri, 4 Sep 2020 14:57:41 +0900 Subject: [PATCH] Move archivesBaseName into instrumentation gradle in a way that supports both old and new folder scheme. --- gradle/instrumentation.gradle | 4 ++++ instrumentation/armeria-1.0/auto/armeria-1.0-auto.gradle | 3 --- .../aws-sdk/aws-sdk-2.2/auto/aws-sdk-2.2-auto.gradle | 3 --- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/gradle/instrumentation.gradle b/gradle/instrumentation.gradle index 2279f9458d52..4fea48eeb5aa 100644 --- a/gradle/instrumentation.gradle +++ b/gradle/instrumentation.gradle @@ -24,6 +24,10 @@ if (project.ext.find("skipPublish") != true) { apply from: "$rootDir/gradle/instrumentation-common.gradle" +if (projectDir.name == 'auto') { + archivesBaseName = projectDir.parentFile.name +} + afterEvaluate { byteBuddy { transformation { diff --git a/instrumentation/armeria-1.0/auto/armeria-1.0-auto.gradle b/instrumentation/armeria-1.0/auto/armeria-1.0-auto.gradle index f61cbbd2d9cc..a32f097bcfea 100644 --- a/instrumentation/armeria-1.0/auto/armeria-1.0-auto.gradle +++ b/instrumentation/armeria-1.0/auto/armeria-1.0-auto.gradle @@ -4,9 +4,6 @@ ext { apply from: "$rootDir/gradle/instrumentation.gradle" -// TODO(anuraaga): Move into instrumentation.gradle -archivesBaseName = projectDir.parentFile.name - muzzle { pass { group = "com.linecorp.armeria" diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/auto/aws-sdk-2.2-auto.gradle b/instrumentation/aws-sdk/aws-sdk-2.2/auto/aws-sdk-2.2-auto.gradle index c03380290be5..f0ad310f0ed6 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/auto/aws-sdk-2.2-auto.gradle +++ b/instrumentation/aws-sdk/aws-sdk-2.2/auto/aws-sdk-2.2-auto.gradle @@ -4,9 +4,6 @@ ext { apply from: "$rootDir/gradle/instrumentation.gradle" -// TODO(anuraaga): Move into instrumentation.gradle -archivesBaseName = projectDir.parentFile.name - muzzle { pass { group = "software.amazon.awssdk"