Greg Holmes 9 лет назад
Родитель
Сommit
6391e29476
7 измененных файлов: 21 добавлений и 29 удалений
  1. 1
    1
      .idea/inspectionProfiles/Project_Default.xml
  2. 9
    9
      README.md
  3. 7
    14
      build.gradle
  4. 2
    2
      circle.yml
  5. 2
    3
      gradle/clover.gradle
  6. 0
    0
      gradle/javadoc.gradle
  7. 0
    0
      gradle/local-dependency-change.gradle

+ 1
- 1
.idea/inspectionProfiles/Project_Default.xml Просмотреть файл

254
       <option name="onlyWarnOnLoop" value="true" />
254
       <option name="onlyWarnOnLoop" value="true" />
255
     </inspection_tool>
255
     </inspection_tool>
256
     <inspection_tool class="SubstringZero" enabled="true" level="WARNING" enabled_by_default="true" />
256
     <inspection_tool class="SubstringZero" enabled="true" level="WARNING" enabled_by_default="true" />
257
-    <inspection_tool class="SuppressionAnnotation" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
257
+    <inspection_tool class="SuppressionAnnotation" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
258
     <inspection_tool class="SwitchStatementWithConfusingDeclaration" enabled="true" level="WARNING" enabled_by_default="true" />
258
     <inspection_tool class="SwitchStatementWithConfusingDeclaration" enabled="true" level="WARNING" enabled_by_default="true" />
259
     <inspection_tool class="SynchronizationOnStaticField" enabled="true" level="WARNING" enabled_by_default="true" />
259
     <inspection_tool class="SynchronizationOnStaticField" enabled="true" level="WARNING" enabled_by_default="true" />
260
     <inspection_tool class="SynchronizeOnLock" enabled="true" level="WARNING" enabled_by_default="true" />
260
     <inspection_tool class="SynchronizeOnLock" enabled="true" level="WARNING" enabled_by_default="true" />

+ 9
- 9
README.md Просмотреть файл

85
 
85
 
86
 You can see an overview of open pull requests across all of the DMDirc projects [here](https://github.com/pulls?q=is%3Aopen+is%3Apr+user%3Admdirc).
86
 You can see an overview of open pull requests across all of the DMDirc projects [here](https://github.com/pulls?q=is%3Aopen+is%3Apr+user%3Admdirc).
87
 
87
 
88
-### Continuous Integration
88
+### Continuous Integration and Code Coverage
89
 
89
 
90
-The current CI status for the major projects are shown below:
90
+The current CI and coverage status for the major projects are shown below:
91
 
91
 
92
-| Project | Status                                                              |
93
-|---------|---------------------------------------------------------------------|
94
-| Meta    | [![Circle CI](https://circleci.com/gh/DMDirc/Meta.png?style=badge)](https://circleci.com/gh/DMDirc/Meta) |
95
-| Client  | [![Circle CI](https://circleci.com/gh/DMDirc/DMDirc.png?style=badge)](https://circleci.com/gh/DMDirc/DMDirc) |
96
-| Parser  | [![Circle CI](https://circleci.com/gh/DMDirc/Parser.png?style=badge)](https://circleci.com/gh/DMDirc/Parser) |
97
-| Plugins | [![Circle CI](https://circleci.com/gh/DMDirc/Plugins.png?style=badge)](https://circleci.com/gh/DMDirc/Plugins) |
98
-| Util    | [![Circle CI](https://circleci.com/gh/DMDirc/Util.png?style=badge)](https://circleci.com/gh/DMDirc/Util) |
92
+| Project | Status | Coverage |
93
+|:-------:|:------:|:--------:|
94
+| Meta    | [![Circle CI](https://circleci.com/gh/DMDirc/Meta.png?style=badge)](https://circleci.com/gh/DMDirc/Meta) | (No code) |
95
+| Client  | [![Circle CI](https://circleci.com/gh/DMDirc/DMDirc.png?style=badge)](https://circleci.com/gh/DMDirc/DMDirc)  | [![Coverage Status](https://img.shields.io/coveralls/DMDirc/DMDirc.svg)](https://coveralls.io/r/DMDirc/DMDirc?branch=master) |
96
+| Parser  | [![Circle CI](https://circleci.com/gh/DMDirc/Parser.png?style=badge)](https://circleci.com/gh/DMDirc/Parser)  | [![Coverage Status](https://img.shields.io/coveralls/DMDirc/Parser.svg)](https://coveralls.io/r/DMDirc/Parser?branch=master) |
97
+| Plugins | [![Circle CI](https://circleci.com/gh/DMDirc/Plugins.png?style=badge)](https://circleci.com/gh/DMDirc/Plugins) | [![Coverage Status](https://img.shields.io/coveralls/DMDirc/Plugins.svg)](https://coveralls.io/r/DMDirc/Plugins?branch=master) |
98
+| Util    | [![Circle CI](https://circleci.com/gh/DMDirc/Util.png?style=badge)](https://circleci.com/gh/DMDirc/Util) | [![Coverage Status](https://img.shields.io/coveralls/DMDirc/Util.svg)](https://coveralls.io/r/DMDirc/Util?branch=master) |
99
 
99
 
100
 ### Issues
100
 ### Issues
101
 
101
 

+ 7
- 14
build.gradle Просмотреть файл

1
-buildscript {
2
-    repositories {
3
-        jcenter()
4
-    }
5
-
6
-    dependencies {
7
-        classpath group: 'org.gradle.api.plugins', name: 'gradle-clover-plugin', version: '0.8.2'
8
-    }
1
+plugins {
2
+    id 'com.bmuschko.clover' version '2.0.1'
9
 }
3
 }
10
 
4
 
11
-import java.nio.file.Files;
12
-import java.nio.file.Paths;
13
-import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
5
+apply from: 'gradle/clover.gradle'
6
+apply from: 'gradle/local-dependency-change.gradle'
7
+apply from: 'gradle/javadoc.gradle'
14
 
8
 
15
-apply from: 'clover.gradle'
16
-apply from: 'local-dependency-change.gradle'
17
-apply from: 'javadoc.gradle'
9
+subprojects.each { evaluationDependsOn it.path }
10
+tasks.dependencies.dependsOn subprojects*.tasks.dependencies
18
 
11
 
19
 task createWrapper(type: Wrapper) {
12
 task createWrapper(type: Wrapper) {
20
     description 'Downloads and installs an up-to-date wrapper for gradle.'
13
     description 'Downloads and installs an up-to-date wrapper for gradle.'

+ 2
- 2
circle.yml Просмотреть файл

5
     version: oraclejdk8
5
     version: oraclejdk8
6
   environment:
6
   environment:
7
     TERM: dumb
7
     TERM: dumb
8
-    GRADLE_OPTS: -Xmx3g
8
+    GRADLE_OPTS: -Xmx2g
9
 
9
 
10
 checkout:
10
 checkout:
11
   post:
11
   post:
21
   override:
21
   override:
22
     - >
22
     - >
23
       if [ -n "${BUILD_JAVADOC}" ]; then
23
       if [ -n "${BUILD_JAVADOC}" ]; then
24
-        ./gradlew --stacktrace packageJavadoc;
24
+        ./gradlew --stacktrace util:javadocJar packageJavadoc;
25
       elif [ -n "${BUILD_PMD}" ]; then
25
       elif [ -n "${BUILD_PMD}" ]; then
26
         ./gradlew --stacktrace pmdMain;
26
         ./gradlew --stacktrace pmdMain;
27
       else
27
       else

clover.gradle → gradle/clover.gradle Просмотреть файл

9
 }
9
 }
10
 
10
 
11
 allprojects {
11
 allprojects {
12
-    apply plugin: 'clover'
12
+    apply plugin: 'com.bmuschko.clover'
13
 
13
 
14
     clover {
14
     clover {
15
         includeTasks = Boolean.valueOf(rootProject.enableClover) ? [] : ['none']
15
         includeTasks = Boolean.valueOf(rootProject.enableClover) ? [] : ['none']
24
     repositories.mavenCentral()
24
     repositories.mavenCentral()
25
 
25
 
26
     dependencies {
26
     dependencies {
27
-        clover group: 'com.atlassian.clover', name: 'clover', version: '4.0.0'
27
+        clover group: 'com.atlassian.clover', name: 'clover', version: '4.0.2'
28
     }
28
     }
29
 
29
 
30
     cloverGenerateReport.dependsOn ':checkCloverCredentials'
30
     cloverGenerateReport.dependsOn ':checkCloverCredentials'
31
-
32
 }
31
 }
33
 
32
 

javadoc.gradle → gradle/javadoc.gradle Просмотреть файл


local-dependency-change.gradle → gradle/local-dependency-change.gradle Просмотреть файл


Загрузка…
Отмена
Сохранить