Address PR feedback

discovery-client/build.gradle

@@ -37,9 +37,7 @@ dependencies {
     testImplementation project(":inject-groovy")
     testImplementation "com.amazonaws:aws-java-sdk-ec2:1.11.683"
     testImplementation dependencyVersion("reactor")
-    testAnnotationProcessor project(":management")
-    testAnnotationProcessor project(":http-server-netty")
     testAnnotationProcessor project(":inject-java")
-    testAnnotationProcessor project(":inject-groovy")
+    testCompileOnly project(":inject-groovy")
     testRuntimeOnly dependencyVersion("snakeyaml")
 }

function-client/build.gradle

@@ -23,7 +23,7 @@ dependencies {
     testImplementation dependencyModuleVersion("micronaut.groovy","micronaut-runtime-groovy"), {
         exclude module:'micronaut-inject'
     }
-    testImplementation project(":inject-groovy")
+    testCompileOnly project(":inject-groovy")
     testAnnotationProcessor project(":inject-java")
     testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-lambda', version: '1.11.285'
 }

function-web/build.gradle

@@ -5,10 +5,9 @@ dependencies {
     api project(":http-server")
 
     testImplementation project(":http-client")
-    testImplementation project(":inject-groovy")
-    testImplementation project(":inject-java")
+    testImplementation project(":inject")
     testImplementation project(":http-server-netty")
 
     testAnnotationProcessor project(":inject-java")
-    testAnnotationProcessor project(":inject-groovy")
+    testCompileOnly project(":inject-groovy")
 }

graal/build.gradle

@@ -3,7 +3,7 @@ dependencies {
     api project(":inject")
     api dependencyVersion("jackson.databind")
 
-    testImplementation project(":inject-java")
+    testImplementation project(":inject")
     testImplementation project(":http")
     testImplementation project(":inject-java-test")
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-6.1-20191212033525+0000-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -7,7 +7,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      https://www.apache.org/licenses/LICENSE-2.0
+#      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -125,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`

gradlew.bat

@@ -5,7 +5,7 @@
 @rem you may not use this file except in compliance with the License.
 @rem You may obtain a copy of the License at
 @rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem      http://www.apache.org/licenses/LICENSE-2.0
 @rem
 @rem Unless required by applicable law or agreed to in writing, software
 @rem distributed under the License is distributed on an "AS IS" BASIS,

http-client/build.gradle

@@ -4,17 +4,17 @@ dependencies {
     api project(":runtime")
     api project(":websocket")
 
-    implementation project(":http-netty")
-    implementation dependencyModuleVersion("netty", "netty-handler-proxy")
+    api project(":http-netty")
+    api dependencyModuleVersion("netty", "netty-handler-proxy")
 
     compileOnly dependencyVersion("reactor")
 
     testAnnotationProcessor project(":validation")
     testAnnotationProcessor project(":inject-java")
 
-    testImplementation project(":inject-groovy")
+    testCompileOnly project(":inject-groovy")
     testImplementation project(":validation")    
-    testImplementation project(":inject-java")    
+    testImplementation project(":inject")
     testImplementation dependencyVersion("rxjava2")
     testImplementation dependencyVersion("reactor")
     testImplementation project(":http-server-netty")

http-netty/build.gradle

@@ -1,13 +1,14 @@
 dependencies {
-	annotationProcessor project(":inject-java")
+    annotationProcessor project(":inject-java")
     compileOnly "com.oracle.substratevm:svm:$graalVersion"
     compileOnly project(":graal")
 
     api project(":http")
     api project(":websocket")
     api project(":buffer-netty")
 
-    implementation dependencyVersion("netty")
+    api dependencyVersion("netty")
+    api dependencyModuleVersion("netty", "netty-handler")
+
     implementation dependencyVersion("rxjava2")
-    implementation dependencyModuleVersion("netty", "netty-handler")
 }

http-server-netty/build.gradle

@@ -3,15 +3,15 @@ dependencies {
 
     api project(":http-server")
     api project(":core")
-    implementation project(":http-netty")
-    implementation dependencyVersion("netty")
+    api project(":http-netty")
+    api dependencyVersion("netty")
 
     compileOnly dependencyModuleVersion("netty", "netty-transport-native-epoll")
     compileOnly dependencyModuleVersion("netty", "netty-transport-native-kqueue")
 
-    testImplementation project(":inject-groovy")
-    testImplementation project(":inject-java")
+    testCompileOnly project(":inject-groovy")
     testAnnotationProcessor project(":inject-java")
+    testImplementation project(":inject")
     testImplementation project(":inject-java-test")
     testImplementation project(":http-client")
     testImplementation group: 'org.powermock', name: 'powermock-module-junit4', version: '2.0.4'

http/build.gradle

@@ -3,8 +3,9 @@ dependencies {
     api project(":inject")    
     compileOnly project(":graal")
 
-    testImplementation project(":inject-groovy")
-    testAnnotationProcessor project(":inject-groovy")
+    testCompileOnly project(":inject-groovy")
+    testAnnotationProcessor project(":inject-java")
+    testImplementation project(":inject")
 }
 
 //compileJava.options.fork = true

inject/build.gradle

@@ -5,7 +5,7 @@ dependencies {
     api dependencyVersion("javax.annotation-api")
     api group: 'javax.inject', name: 'javax.inject', version: '1'
     api project(':core')
-    implementation dependencyVersion("snakeyaml")
+    api dependencyVersion("snakeyaml")
 
     compileOnly "javax.persistence:javax.persistence-api:2.2"
     compileOnly dependencyVersion("groovy")

router/build.gradle

@@ -1,5 +1,5 @@
 dependencies {
-	annotationProcessor project(":inject-java")
+    annotationProcessor project(":inject-java")
 
     api project(":inject")
     api project(":http")

runtime/build.gradle

@@ -9,15 +9,15 @@ dependencies {
     api dependencyVersion("validation")
     api dependencyVersion("jackson.databind")
     api dependencyVersion("rxjava2")
+    api([
+            dependencyVersion('jackson.datatype'),
+            dependencyModuleVersion('jackson.datatype', 'jackson-datatype-jsr310')
+    ])
 
     compileOnly "com.oracle.substratevm:svm:$graalVersion"
     compileOnly project(":graal")
     compileOnly dependencyVersion("jcache")
 
-    implementation([
-        dependencyVersion('jackson.datatype'),
-        dependencyModuleVersion('jackson.datatype', 'jackson-datatype-jsr310')
-    ])
 
     compileOnly(
         dependencyModuleVersion('jackson.modules', 'jackson-module-kotlin')

session/build.gradle

@@ -10,8 +10,8 @@ dependencies {
 
 
     testAnnotationProcessor project(":inject-java")
-    testImplementation project(":inject-groovy")
-    testImplementation project(":inject-java")
+    testCompileOnly project(":inject-groovy")
+    testImplementation project(":inject")
     testImplementation project(":http-netty")
     testImplementation project(":http-server-netty")
     testImplementation project(":http-client")

validation/build.gradle

@@ -9,12 +9,13 @@ dependencies {
     compileOnly project(":http-server")
 
     testAnnotationProcessor project(":inject-java")
+    testImplementation project(":inject")
     testImplementation project(":http-server-netty")
     testImplementation project(":websocket")
     testImplementation project(":http-client")
-    testImplementation project(":inject-groovy")
     testImplementation dependencyModuleVersion("groovy", "groovy-json")
     testImplementation project(":inject-java-test")
+    testCompileOnly project(":inject-groovy")
 
 }
 //compileTestGroovy.groovyOptions.forkOptions.jvmArgs = ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005']