Skip to content

Commit

Permalink
Build process tidying.
Browse files Browse the repository at this point in the history
- Execute coveralls as part of tests, not afterwards
- Update script to plugins version to allow for files that don't exist
- Use jcenter for DMDirc plugin, to stop idea complaining
  • Loading branch information
csmith committed Jan 31, 2015
1 parent 264f93b commit fbd0dba
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 10 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Expand Up @@ -140,12 +140,12 @@ def find(name) {
buildscript {
repositories {
mavenCentral()
maven { url 'https://dl.bintray.com/dmdirc/releases/' }
jcenter()
}

dependencies {
classpath group: 'com.dmdirc', name: 'git-version', version: '1.0'
classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.1.0'
classpath group: 'org.kt3k.gradle.plugin', name: 'coveralls-gradle-plugin', version: '2.1.0'
}
}

Expand Down
4 changes: 1 addition & 3 deletions circle.yml
Expand Up @@ -12,6 +12,4 @@ dependencies:

test:
override:
- ./gradlew check
post:
- ./gradlew coveralls
- ./gradlew test jacocoTestReport coveralls
6 changes: 1 addition & 5 deletions gradle/coveralls.gradle
Expand Up @@ -11,16 +11,12 @@ task jacocoRootReport(type: JacocoReport, group: 'Coverage reports', dependsOn:
additionalSourceDirs = files(subprojects.sourceSets.main.allSource.srcDirs)
sourceDirectories = files(subprojects.sourceSets.main.allSource.srcDirs)
classDirectories = files(subprojects.sourceSets.main.output)
executionData = files(subprojects.jacocoTestReport.executionData)
executionData = files(subprojects.jacocoTestReport.executionData).filter { it.exists() }

reports {
html.enabled = true
xml.enabled = true
}

doFirst {
executionData = files(executionData.findAll { it.exists() })
}
}

coveralls {
Expand Down

0 comments on commit fbd0dba

Please sign in to comment.