Move archivesBaseName into instrumentation gradle in a way that suppo…

…rts both old and new folder scheme. (#1169)
open-telemetry · Sep 4, 2020 · 1217882 · 1217882
1 parent fa3ae09
commit 1217882
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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"