Fix muzzle so it can be run without assemble first (hypertrace#29)

pavolloffay · web-flow · commit 81aac1da5e99 · 2020-10-16T15:40:26.000+02:00
Signed-off-by: Pavol Loffay &lt;p.loffay@gmail.com&gt;
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -39,7 +39,7 @@ jobs:
       TERM: dumb
     steps:
       - checkout
-      - run: ./gradlew assemble muzzle
+      - run: ./gradlew muzzle
 
 workflows:
   version: 2
diff --git a/buildSrc/src/main/groovy/MuzzlePlugin.groovy b/buildSrc/src/main/groovy/MuzzlePlugin.groovy
@@ -327,6 +327,7 @@ class MuzzlePlugin implements Plugin<Project> {
     }
 
     def muzzleTask = instrumentationProject.task(taskName) {
+      dependsOn(instrumentationProject.configurations.named("runtimeClasspath"))
       doLast {
         ClassLoader instrumentationCL = createInstrumentationClassloader(instrumentationProject, toolingProject)
         def ccl = Thread.currentThread().contextClassLoader
diff --git a/instrumentation/servlet/servlet-3.0/build.gradle.kts b/instrumentation/servlet/servlet-3.0/build.gradle.kts
@@ -32,7 +32,7 @@ afterEvaluate{
 val instrumentationMuzzle by configurations.creating
 
 dependencies {
-    implementation(project(":blocking"))
+    api(project(":blocking"))
 
     compileOnly("javax.servlet:javax.servlet-api:3.1.0")
     implementation("net.bytebuddy:byte-buddy:1.10.10")

Original file line number	Diff line number	Diff line change
`@@ -327,6 +327,7 @@ class MuzzlePlugin implements Plugin<Project> {`
`327`	`327`	`}`
`328`	`328`
`329`	`329`	`def muzzleTask = instrumentationProject.task(taskName) {`
	`330`	`+ dependsOn(instrumentationProject.configurations.named("runtimeClasspath"))`
`330`	`331`	`doLast {`
`331`	`332`	`ClassLoader instrumentationCL = createInstrumentationClassloader(instrumentationProject, toolingProject)`
`332`	`333`	`def ccl = Thread.currentThread().contextClassLoader`