Update test runner and coverage for CI

This commit is contained in:
Gary Tierney
2018-08-20 00:00:55 +01:00
parent ebeaa7cd92
commit 88b0305cc8
4 changed files with 11 additions and 8 deletions
+5 -1
View File
@@ -1,8 +1,12 @@
language: java
jdk:
- oraclejdk8
after_success:
- bash <(curl -s https://codecov.io/bash)
before_install:
- gradle wrapper
- gradle -b gradle/wrapper.gradle
- mv gradle/gradlew gradle/gradlew.bat .
- mv gradle/gradle/wrapper gradle/
before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+2 -6
View File
@@ -2,11 +2,6 @@ plugins {
id 'org.jetbrains.kotlin.jvm' version "1.2.60" apply(false)
}
wrapper {
gradleVersion = "4.9"
distributionType = Wrapper.DistributionType.ALL
}
allprojects {
group = 'apollo'
version = '0.0.1'
@@ -20,4 +15,5 @@ allprojects {
apply from: 'gradle/properties.gradle'
apply from: 'gradle/kotlin.gradle'
apply from: 'gradle/jacoco.gradle'
apply from: 'gradle/jacoco.gradle'
apply from: 'gradle/wrapper.gradle'
+1 -1
View File
@@ -43,7 +43,7 @@ task jacocoTestReport(type: JacocoReport) {
*/
doFirst {
subprojects.findAll { subproject ->
subproject.pluginManager.hasPlugin('java')
subproject.pluginManager.hasPlugin('java') || subproject.pluginManager.hasPlugin('kotlin')
}.each { subproject ->
additionalSourceDirs files((Set<File>) subproject.sourceSets.main.allJava.srcDirs)
additionalClassDirs((FileCollection) subproject.sourceSets.main.output)
+3
View File
@@ -0,0 +1,3 @@
wrapper {
gradleVersion = "4.9"
}