Skip to content

Commit

Permalink
Switching testCompile -> testImplementation
Browse files Browse the repository at this point in the history
  • Loading branch information
zendern authored and graemerocher committed Dec 11, 2019
1 parent 2d6c094 commit 48fb053
Show file tree
Hide file tree
Showing 27 changed files with 193 additions and 191 deletions.
14 changes: 7 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -716,21 +716,21 @@ subprojects { Project subproject ->
compileOnly "io.micronaut.docs:micronaut-docs-asciidoc-config-props:$micronautDocsVersion"
}
compileOnly "com.github.ben-manes.caffeine:caffeine:$caffeineVersion"
testCompile "com.github.ben-manes.caffeine:caffeine:$caffeineVersion"
testCompile dependencyVersion("groovy")
testImplementation "com.github.ben-manes.caffeine:caffeine:$caffeineVersion"
testImplementation dependencyVersion("groovy")
testCompile(dependencyVersion("spock")) {
exclude module: 'groovy-all'
}
testCompile "cglib:cglib-nodep:3.3.0"
testCompile "org.objenesis:objenesis:1.4"
testImplementation "cglib:cglib-nodep:3.3.0"
testImplementation "org.objenesis:objenesis:1.4"

testRuntime "ch.qos.logback:logback-classic:1.2.3"
testCompile "org.codehaus.groovy:groovy-test:$groovyVersion"
testImplementation "org.codehaus.groovy:groovy-test:$groovyVersion"
compileOnly "org.ow2.asm:asm:$asmVersion"
compileOnly "org.ow2.asm:asm-commons:$asmVersion"

testCompile "org.ow2.asm:asm:$asmVersion"
testCompile "org.ow2.asm:asm-commons:$asmVersion"
testImplementation "org.ow2.asm:asm:$asmVersion"
testImplementation "org.ow2.asm:asm-commons:$asmVersion"
}

task moveConfigProps() {
Expand Down
5 changes: 3 additions & 2 deletions cli/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ dependencies {
runtime dependencyModuleVersion("slf4j", "slf4j-simple")
runtime "org.codehaus.plexus:plexus-component-api:1.0-alpha-33"

testCompile "net.sf.expectit:expectit-core:0.9.0"
testCompile "com.github.jnr:jnr-posix:3.0.6"

testImplementation "net.sf.expectit:expectit-core:0.9.0"
testImplementation "com.github.jnr:jnr-posix:3.0.6"
}

File outDir = new File(project.buildDir, 'bin')
Expand Down
29 changes: 15 additions & 14 deletions discovery-client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,25 @@ dependencies {
// used by AWSParameterStoreConfigClient
compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-ssm', version: '1.11.683'

testCompile "org.testcontainers:spock:1.10.1"
testImplementation "org.testcontainers:spock:1.10.1"

testCompile dependencyVersion("micronaut.aws"), {
testImplementation dependencyVersion("micronaut.aws"), {
exclude module:'micronaut-http-client'
exclude module:'micronaut-inject'
}
testCompile group: 'com.amazonaws', name: 'aws-java-sdk-route53', version: '1.11.297'
testCompile group: 'com.amazonaws', name: 'aws-java-sdk-core', version: '1.11.689'
testCompile group: 'com.amazonaws', name: 'jmespath-java', version: '1.11.297'
testCompile group: 'com.amazonaws', name: 'aws-java-sdk-servicediscovery', version: '1.11.297'
testCompile group: 'com.amazonaws', name: 'aws-java-sdk-ssm', version: '1.11.308'

testCompile project(":management")
testCompile project(":http-server-netty")
testCompile project(":inject-java")
testCompile project(":inject-groovy")
testCompile "com.amazonaws:aws-java-sdk-ec2:1.11.683"
testCompile dependencyVersion("reactor")

testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-route53', version: '1.11.297'
testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-core', version: '1.11.689'
testImplementation group: 'com.amazonaws', name: 'jmespath-java', version: '1.11.297'
testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-servicediscovery', version: '1.11.297'
testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-ssm', version: '1.11.308'

testImplementation project(":management")
testImplementation project(":http-server-netty")
testImplementation project(":inject-java")
testImplementation project(":inject-groovy")
testImplementation "com.amazonaws:aws-java-sdk-ec2:1.11.683"
testImplementation dependencyVersion("reactor")
testRuntime dependencyVersion("snakeyaml")

}
16 changes: 8 additions & 8 deletions function-client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@ dependencies {
}
compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-lambda', version: '1.11.285'

testCompile project(":http-server-netty")
testCompile dependencyVersion("micronaut.function-aws"), {
testImplementation project(":http-server-netty")
testImplementation dependencyVersion("micronaut.function-aws"), {
exclude module:"micronaut-function"
}
testCompile project(":function-web")
testCompile dependencyModuleVersion("micronaut.groovy","micronaut-function-groovy"), {
testImplementation project(":function-web")
testImplementation dependencyModuleVersion("micronaut.groovy","micronaut-function-groovy"), {
exclude module:'micronaut-function'
exclude module:'micronaut-runtime-groovy'
}
testCompile dependencyModuleVersion("micronaut.groovy","micronaut-runtime-groovy"), {
testImplementation dependencyModuleVersion("micronaut.groovy","micronaut-runtime-groovy"), {
exclude module:'micronaut-inject'
}
testCompile project(":inject-groovy")
testCompile project(":inject-java")
testCompile group: 'com.amazonaws', name: 'aws-java-sdk-lambda', version: '1.11.285'
testImplementation project(":inject-groovy")
testImplementation project(":inject-java")
testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-lambda', version: '1.11.285'
}
8 changes: 4 additions & 4 deletions function-web/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ dependencies {
compile project(":router")
compile project(":http-server")

testCompile project(":http-client")
testCompile project(":inject-groovy")
testCompile project(":inject-java")
testCompile project(":http-server-netty")
testImplementation project(":http-client")
testImplementation project(":inject-groovy")
testImplementation project(":inject-java")
testImplementation project(":http-server-netty")
}
2 changes: 1 addition & 1 deletion function/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ dependencies {
compileOnly project(":inject-java")
compile project(":http")

testCompile project(":inject-java")
testImplementation project(":inject-java")
}
6 changes: 3 additions & 3 deletions graal/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ dependencies {
compileOnly project(":inject-java")
compile project(":inject")
compile dependencyVersion("jackson.databind")
testCompile project(":inject-java")
testCompile project(":http")
testCompile project(":inject-java-test")
testImplementation project(":inject-java")
testImplementation project(":http")
testImplementation project(":inject-java-test")
}
6 changes: 3 additions & 3 deletions gradle/geb.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
dependencies {
testCompile "org.gebish:geb-spock:$gebVersion"
testImplementation "org.gebish:geb-spock:$gebVersion"
testRuntime "org.seleniumhq.selenium:selenium-chrome-driver:$seleniumVersion"
testRuntime "org.seleniumhq.selenium:selenium-firefox-driver:$seleniumVersion"
testCompile "org.seleniumhq.selenium:selenium-support:$seleniumVersion"
testCompile "org.seleniumhq.selenium:selenium-api:$seleniumVersion"
testImplementation "org.seleniumhq.selenium:selenium-support:$seleniumVersion"
testImplementation "org.seleniumhq.selenium:selenium-api:$seleniumVersion"
}

test {
Expand Down
14 changes: 7 additions & 7 deletions http-client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ dependencies {
compileOnly dependencyVersion("reactor")
compile project(":websocket")

testCompile project(":inject-groovy")
testCompile project(":validation")
testCompile project(":inject-java")
testCompile dependencyVersion("rxjava2")
testCompile dependencyVersion("reactor")
testCompile project(":http-server-netty")
testCompile "com.github.tomakehurst:wiremock-jre8:2.25.0"
testImplementation project(":inject-groovy")
testImplementation project(":validation")
testImplementation project(":inject-java")
testImplementation dependencyVersion("rxjava2")
testImplementation dependencyVersion("reactor")
testImplementation project(":http-server-netty")
testImplementation "com.github.tomakehurst:wiremock-jre8:2.25.0"
}

//tasks.withType(Test) {
Expand Down
20 changes: 10 additions & 10 deletions http-server-netty/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ dependencies {
compileOnly dependencyModuleVersion("netty", "netty-transport-native-epoll")
compileOnly dependencyModuleVersion("netty", "netty-transport-native-kqueue")

testCompile project(":inject-groovy")
testCompile project(":inject-java")
testCompile project(":inject-java-test")
testCompile project(":http-client")
testCompile group: 'org.powermock', name: 'powermock-module-junit4', version: '2.0.4'
testCompile group: 'org.powermock', name: 'powermock-api-mockito2', version: '2.0.4'
testImplementation project(":inject-groovy")
testImplementation project(":inject-java")
testImplementation project(":inject-java-test")
testImplementation project(":http-client")
testImplementation group: 'org.powermock', name: 'powermock-module-junit4', version: '2.0.4'
testImplementation group: 'org.powermock', name: 'powermock-api-mockito2', version: '2.0.4'

testCompile dependencyModuleVersion("groovy", "groovy-json")
testCompile dependencyModuleVersion("groovy", "groovy-templates")
testCompile dependencyVersion("rxjava2")
testCompile dependencyVersion("reactor")
testImplementation dependencyModuleVersion("groovy", "groovy-json")
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")
}
Expand Down
2 changes: 1 addition & 1 deletion http/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ dependencies {
compileOnly project(":inject-java")
compileOnly project(":graal")

testCompile project(":inject-groovy")
testImplementation project(":inject-groovy")
}

//compileJava.options.fork = true
Expand Down
18 changes: 9 additions & 9 deletions inject-groovy/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ dependencies {
compile project(":aop")
compile dependencyVersion("groovy")

testCompile "junit:junit:4.12"
// testCompile 'javax.validation:validation-api:1.1.0.Final'
testCompile "org.hibernate:hibernate-core:5.3.6.Final"
testImplementation "junit:junit:4.12"
// testImplementation 'javax.validation:validation-api:1.1.0.Final'
testImplementation "org.hibernate:hibernate-core:5.3.6.Final"
testImplementation 'org.hibernate:hibernate-validator:6.0.13.Final'
testRuntime 'org.glassfish.web:el-impl:2.2.1-b05'
testRuntime 'org.glassfish:javax.el:3.0.1-b08'
testCompile project(":http-server-netty")
testCompile project(":http-client")
testCompile project(":validation")
testCompile 'org.neo4j.driver:neo4j-java-driver:1.4.5'
testCompile dependencyModuleVersion("groovy", "groovy-json")
testCompile project(":validation")
testImplementation project(":http-server-netty")
testImplementation project(":http-client")
testImplementation project(":validation")
testImplementation 'org.neo4j.driver:neo4j-java-driver:1.4.5'
testImplementation dependencyModuleVersion("groovy", "groovy-json")
}

//compileTestGroovy.groovyOptions.forkOptions.jvmArgs = ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005']
Expand Down
16 changes: 8 additions & 8 deletions inject-java-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ dependencies {
exclude module:'groovy-all'
}
compile files(org.gradle.internal.jvm.Jvm.current().toolsJar)
testCompile dependencyVersion("validation")
testCompile "javax.persistence:javax.persistence-api:2.2"
testCompile project(":runtime")
testImplementation dependencyVersion("validation")
testImplementation "javax.persistence:javax.persistence-api:2.2"
testImplementation project(":runtime")

// testCompile "org.ow2.asm:asm-tree:$asmVersion"
// testCompile "org.ow2.asm:asm-util:$asmVersion"
// testCompile "org.ow2.asm:asm:$asmVersion"
// testCompile "org.ow2.asm:asm-commons:$asmVersion"
// testCompile "org.ow2.asm:asm-tree:$asmVersion"
// testImplementation "org.ow2.asm:asm-tree:$asmVersion"
// testImplementation "org.ow2.asm:asm-util:$asmVersion"
// testImplementation "org.ow2.asm:asm:$asmVersion"
// testImplementation "org.ow2.asm:asm-commons:$asmVersion"
// testImplementation "org.ow2.asm:asm-tree:$asmVersion"

}
26 changes: 13 additions & 13 deletions inject-java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@ dependencies {
compileOnly files(org.gradle.internal.jvm.Jvm.current().toolsJar)
compileOnly dependencyVersion("validation")

testCompile 'com.github.spotbugs:spotbugs-annotations:3.1.12'
testCompile project(":aop")
testCompile project(":runtime")
testCompile dependencyVersion("rxjava2")
testCompile "org.hibernate:hibernate-core:5.3.6.Final"
testImplementation 'com.github.spotbugs:spotbugs-annotations:3.1.12'
testImplementation project(":aop")
testImplementation project(":runtime")
testImplementation dependencyVersion("rxjava2")
testImplementation "org.hibernate:hibernate-core:5.3.6.Final"
testRuntime 'org.glassfish.web:el-impl:2.2.1-b05'
testCompile "junit:junit:4.12"
testCompile "com.google.testing.compile:compile-testing:0.18"
testCompile 'org.mongodb:mongo-java-driver:3.7.1'
testCompile 'org.neo4j.driver:neo4j-java-driver:1.4.5'
testCompile dependencyModuleVersion("groovy", "groovy-json")
testCompile files(org.gradle.internal.jvm.Jvm.current().toolsJar)
testImplementation "junit:junit:4.12"
testImplementation "com.google.testing.compile:compile-testing:0.18"
testImplementation 'org.mongodb:mongo-java-driver:3.7.1'
testImplementation 'org.neo4j.driver:neo4j-java-driver:1.4.5'
testImplementation dependencyModuleVersion("groovy", "groovy-json")
testImplementation files(org.gradle.internal.jvm.Jvm.current().toolsJar)
testRuntime 'org.glassfish:javax.el:3.0.1-b08'
testCompile dependencyVersion("micrometer")
testCompile project(":validation")
testImplementation dependencyVersion("micrometer")
testImplementation project(":validation")
}


8 changes: 4 additions & 4 deletions inject/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ dependencies {
compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
compileOnly dependencyVersion("validation")

testCompile dependencyVersion("validation")
testCompile project(":inject-groovy")
testImplementation dependencyVersion("validation")
testImplementation project(":inject-groovy")
//system-rules has a transitive on junit-dep:[4.9,), so hard setting the version instead
testCompile("com.github.stefanbirkner:system-rules:$systemRulesVersion") {
testImplementation("com.github.stefanbirkner:system-rules:$systemRulesVersion") {
exclude group: "junit", module: "junit-dep"
}
testCompile "junit:junit-dep:4.9"
testImplementation "junit:junit-dep:4.9"
}
14 changes: 7 additions & 7 deletions management/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ dependencies {
compileOnly project(":inject-java")
compileOnly project(":graal")

testCompile project(":http-client")
testCompile project(":inject-groovy")
testCompile project(":http-server-netty")
testCompile dependencyModuleVersion("micronaut.sql", "micronaut-jdbc-tomcat")
testCompile dependencyModuleVersion("groovy", "groovy-json")
testCompile dependencyVersion("h2")
testCompile "mysql:mysql-connector-java:8.0.18"
testImplementation project(":http-client")
testImplementation project(":inject-groovy")
testImplementation project(":http-server-netty")
testImplementation dependencyModuleVersion("micronaut.sql", "micronaut-jdbc-tomcat")
testImplementation dependencyModuleVersion("groovy", "groovy-json")
testImplementation dependencyVersion("h2")
testImplementation "mysql:mysql-connector-java:8.0.18"

compileOnly "ch.qos.logback:logback-classic:1.2.3"
}
Expand Down
10 changes: 5 additions & 5 deletions multitenancy/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ dependencies {
compile project(":http-server")
compileOnly project(":session")

testCompile project(":http-client")
testCompile project(":inject-groovy")
testCompile project(":http-server-netty")
testCompile project(":session")
testCompile project(":test-utils")
testImplementation project(":http-client")
testImplementation project(":inject-groovy")
testImplementation project(":http-server-netty")
testImplementation project(":session")
testImplementation project(":test-utils")
}
4 changes: 2 additions & 2 deletions router/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ dependencies {
compile project(":inject")
compile project(":http")
compileOnly project(":inject-java")
testCompile project(":inject-groovy")
testCompile project(":inject-java")
testImplementation project(":inject-groovy")
testImplementation project(":inject-java")
}
18 changes: 9 additions & 9 deletions runtime/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ dependencies {
compileOnly "com.github.ben-manes.caffeine:caffeine:$caffeineVersion"
compileOnly project(":inject-java")

testCompile 'org.jsr107.ri:cache-ri-impl:1.1.0'
testCompile dependencyVersion("jcache")
testCompile dependencyVersion("rxjava1.interop")
testCompile dependencyVersion("reactor")
testCompile project(":inject-java")
testCompile project(":inject-java-test")
testCompile project(":inject-groovy")
testCompile dependencyModuleVersion("gorm", "grails-datastore-gorm")
testCompile files(org.gradle.internal.jvm.Jvm.current().toolsJar)
testImplementation 'org.jsr107.ri:cache-ri-impl:1.1.0'
testImplementation dependencyVersion("jcache")
testImplementation dependencyVersion("rxjava1.interop")
testImplementation dependencyVersion("reactor")
testImplementation project(":inject-java")
testImplementation project(":inject-java-test")
testImplementation project(":inject-groovy")
testImplementation dependencyModuleVersion("gorm", "grails-datastore-gorm")
testImplementation files(org.gradle.internal.jvm.Jvm.current().toolsJar)
}

//compileJava.options.fork = true
Expand Down
Loading

0 comments on commit 48fb053

Please sign in to comment.