Remove dependencies on shadow configuration

valentingoebel · Dec 11, 2019 · 44af7f6 · 44af7f6
1 parent 38196d6
commit 44af7f6
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 11 deletions.
diff --git a/aop/build.gradle b/aop/build.gradle
@@ -3,5 +3,5 @@ ext {
 }
 dependencies {
     api project(':inject')
-    implementation project(path: ':core', configuration: 'shadow')
+    api project(':core')
 }
diff --git a/build.gradle b/build.gradle
@@ -691,8 +691,6 @@ subprojects { Project subproject ->
         configurations = [project.configurations.shadowCompile]
         relocate "com.github.benmanes.caffeine", "io.micronaut.caffeine"
         relocate "org.objectweb.asm", "io.micronaut.asm"
-
-        classifier = null
     }
 
     def isDocumented = subproject.name != 'inject' && subproject.name != 'core' && subproject.name != 'aop' && !subproject.name.contains('asciidoc-config-props')

diff --git a/inject-groovy/build.gradle b/inject-groovy/build.gradle
@@ -1,6 +1,6 @@
 dependencies {
     api project(":inject")
-    api project(path: ':aop', configuration: 'shadow')
+    api project(':aop')
     api dependencyVersion("groovy")
 
     testImplementation "junit:junit:4.12"

diff --git a/inject-java/build.gradle b/inject-java/build.gradle
@@ -1,12 +1,12 @@
 dependencies {
     api project(":inject")
-    api project(path: ':aop', configuration: 'shadow')
+    api project(':aop')
 
     compileOnly files(org.gradle.internal.jvm.Jvm.current().toolsJar)
     compileOnly dependencyVersion("validation")
 
     testImplementation 'com.github.spotbugs:spotbugs-annotations:3.1.12'
-    testImplementation project(path: ':aop', configuration: 'shadow')
+    testImplementation project(':aop')
     testAnnotationProcessor project(":inject-java")
     testImplementation project(":runtime")
     testImplementation dependencyVersion("rxjava2")

diff --git a/management/build.gradle b/management/build.gradle
@@ -2,7 +2,7 @@ dependencies {
     api project(":router")
     api project(":runtime")
     annotationProcessor project(":inject-java")
-    compileOnly project(":graal")
+    annotationProcessor project(":graal")
 
     testImplementation project(":http-client")
     testImplementation project(":inject-groovy")

diff --git a/runtime/build.gradle b/runtime/build.gradle
@@ -5,8 +5,8 @@ dependencies {
     for(proj in ['http']) {
         api project(":$proj")
     }
-    api project(path: ':inject', configuration: 'shadow')
-    api project(path: ':aop', configuration: 'shadow')
+    api project(':inject')
+    api project(':aop')
     compileOnly "com.oracle.substratevm:svm:$graalVersion"
     compileOnly project(":graal")
     compileOnly dependencyVersion("jcache")

diff --git a/spring/build.gradle b/spring/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     api project(":inject")
     annotationProcessor project(":inject-java")
     compileOnly dependencyModuleVersion("spring", "spring-jdbc")
-    api project(path: ':aop', configuration: 'shadow')
+    api project(':aop')
 
     testImplementation project(':runtime')
     testImplementation project(':inject-groovy')

diff --git a/websocket/build.gradle b/websocket/build.gradle
@@ -1,7 +1,7 @@
 dependencies {
     api project(":http")
     api project(":inject")
-    api project(path: ':aop', configuration: 'shadow')
+    api project(':aop')
 
     api dependencyVersion("rxjava2")
     annotationProcessor project(":inject-java")