Browse Source

Build process tidying.

- 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
pull/92/head
Chris Smith 9 years ago
parent
commit
fbd0dba1c9
3 changed files with 4 additions and 10 deletions
  1. 2
    2
      build.gradle
  2. 1
    3
      circle.yml
  3. 1
    5
      gradle/coveralls.gradle

+ 2
- 2
build.gradle View File

@@ -140,12 +140,12 @@ def find(name) {
140 140
 buildscript {
141 141
     repositories {
142 142
         mavenCentral()
143
-        maven { url 'https://dl.bintray.com/dmdirc/releases/' }
143
+        jcenter()
144 144
     }
145 145
 
146 146
     dependencies {
147 147
         classpath group: 'com.dmdirc', name: 'git-version', version: '1.0'
148
-        classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.1.0'
148
+        classpath group: 'org.kt3k.gradle.plugin', name: 'coveralls-gradle-plugin', version: '2.1.0'
149 149
     }
150 150
 }
151 151
 

+ 1
- 3
circle.yml View File

@@ -12,6 +12,4 @@ dependencies:
12 12
 
13 13
 test:
14 14
   override:
15
-    - ./gradlew check
16
-  post:
17
-    - ./gradlew coveralls
15
+    - ./gradlew test jacocoTestReport coveralls

+ 1
- 5
gradle/coveralls.gradle View File

@@ -11,16 +11,12 @@ task jacocoRootReport(type: JacocoReport, group: 'Coverage reports', dependsOn:
11 11
   additionalSourceDirs = files(subprojects.sourceSets.main.allSource.srcDirs)
12 12
   sourceDirectories = files(subprojects.sourceSets.main.allSource.srcDirs)
13 13
   classDirectories = files(subprojects.sourceSets.main.output)
14
-  executionData = files(subprojects.jacocoTestReport.executionData)
14
+  executionData = files(subprojects.jacocoTestReport.executionData).filter { it.exists() }
15 15
 
16 16
   reports {
17 17
     html.enabled = true
18 18
     xml.enabled = true
19 19
   }
20
-
21
-  doFirst {
22
-    executionData = files(executionData.findAll { it.exists() })
23
-  }
24 20
 }
25 21
 
26 22
 coveralls {

Loading…
Cancel
Save