From b0107b0e0c62a1d0daaa9bf54ec6fb372f499f9c Mon Sep 17 00:00:00 2001 From: Nathan Zender Date: Tue, 17 Sep 2019 21:30:47 -0400 Subject: [PATCH] testCompile -> testImplementation switchover --- build.gradle | 4 ++++ discovery-client/build.gradle | 6 +++++- function-web/build.gradle | 3 +++ function/build.gradle | 1 + graal/build.gradle | 2 ++ http-server-netty/build.gradle | 5 +++-- http/build.gradle | 1 + runtime/build.gradle | 1 + 8 files changed, 20 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 74a71f0dc8b..67f78c4e017 100644 --- a/build.gradle +++ b/build.gradle @@ -728,9 +728,13 @@ subprojects { Project subproject -> testImplementation "org.codehaus.groovy:groovy-test:$groovyVersion" compileOnly "org.ow2.asm:asm:$asmVersion" compileOnly "org.ow2.asm:asm-commons:$asmVersion" + annotationProcessor "org.ow2.asm:asm:$asmVersion" + annotationProcessor "org.ow2.asm:asm-commons:$asmVersion" testImplementation "org.ow2.asm:asm:$asmVersion" testImplementation "org.ow2.asm:asm-commons:$asmVersion" + testAnnotationProcessor "org.ow2.asm:asm:$asmVersion" + testAnnotationProcessor "org.ow2.asm:asm-commons:$asmVersion" } task moveConfigProps() { diff --git a/discovery-client/build.gradle b/discovery-client/build.gradle index acd4f08856c..a62647188a7 100644 --- a/discovery-client/build.gradle +++ b/discovery-client/build.gradle @@ -38,6 +38,10 @@ dependencies { testImplementation project(":inject-groovy") testImplementation "com.amazonaws:aws-java-sdk-ec2:1.11.683" testImplementation dependencyVersion("reactor") - testRuntime dependencyVersion("snakeyaml") + testAnnotationProcessor project(":management") + testAnnotationProcessor project(":http-server-netty") + testAnnotationProcessor project(":inject-java") + testAnnotationProcessor project(":inject-groovy") + testRuntime dependencyVersion("snakeyaml") } \ No newline at end of file diff --git a/function-web/build.gradle b/function-web/build.gradle index b576e2b955a..12b29067558 100644 --- a/function-web/build.gradle +++ b/function-web/build.gradle @@ -9,4 +9,7 @@ dependencies { testImplementation project(":inject-groovy") testImplementation project(":inject-java") testImplementation project(":http-server-netty") + + testAnnotationProcessor project(":inject-java") + testAnnotationProcessor project(":inject-groovy") } \ No newline at end of file diff --git a/function/build.gradle b/function/build.gradle index 1920f90b8b7..a470374351f 100644 --- a/function/build.gradle +++ b/function/build.gradle @@ -5,4 +5,5 @@ dependencies { api project(":http") testImplementation project(":inject-java") + testAnnotationProcessor project(":inject-java") } \ No newline at end of file diff --git a/graal/build.gradle b/graal/build.gradle index 635d286f95a..725f7ade0cc 100644 --- a/graal/build.gradle +++ b/graal/build.gradle @@ -7,4 +7,6 @@ dependencies { testImplementation project(":inject-java") testImplementation project(":http") testImplementation project(":inject-java-test") + + testAnnotationProcessor project(":inject-java") } diff --git a/http-server-netty/build.gradle b/http-server-netty/build.gradle index a65204487aa..e58aedc9259 100644 --- a/http-server-netty/build.gradle +++ b/http-server-netty/build.gradle @@ -9,6 +9,7 @@ dependencies { testImplementation project(":inject-groovy") testImplementation project(":inject-java") + testAnnotationProcessor project(":inject-java") testImplementation project(":inject-java-test") testImplementation project(":http-client") testImplementation group: 'org.powermock', name: 'powermock-module-junit4', version: '2.0.4' @@ -18,8 +19,8 @@ dependencies { testImplementation dependencyModuleVersion("groovy", "groovy-templates") testImplementation dependencyVersion("rxjava2") testImplementation dependencyVersion("reactor") - testCompile(dependencyModuleVersion("netty", "netty-transport-native-epoll") + ":linux-x86_64") - testCompile(dependencyModuleVersion("netty", "netty-transport-native-kqueue") + ":osx-x86_64") + testImplementation(dependencyModuleVersion("netty", "netty-transport-native-epoll") + ":linux-x86_64") + testImplementation(dependencyModuleVersion("netty", "netty-transport-native-kqueue") + ":osx-x86_64") } tasks.withType(Test) { diff --git a/http/build.gradle b/http/build.gradle index adba3d9d4a8..8e105a4d1a5 100644 --- a/http/build.gradle +++ b/http/build.gradle @@ -5,6 +5,7 @@ dependencies { api project(":graal") testImplementation project(":inject-groovy") + testAnnotationProcessor project(":inject-groovy") } //compileJava.options.fork = true diff --git a/runtime/build.gradle b/runtime/build.gradle index 44ebbd5d737..1263c0a4f52 100644 --- a/runtime/build.gradle +++ b/runtime/build.gradle @@ -42,6 +42,7 @@ dependencies { testImplementation dependencyVersion("rxjava1.interop") testImplementation dependencyVersion("reactor") testImplementation project(":inject-java") + testAnnotationProcessor project(":inject-java") testImplementation project(":inject-java-test") testImplementation project(":inject-groovy") testImplementation dependencyModuleVersion("gorm", "grails-datastore-gorm")