Skip to content

Commit d690c9b

Browse files
committed
fix builodSCript
1 parent a7127fc commit d690c9b

File tree

7 files changed

+2142
-2186
lines changed

7 files changed

+2142
-2186
lines changed

build.gradle

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ plugins {
1818
id "org.sonarqube" version "2.6"
1919
id 'java'
2020
id 'maven'
21-
id 'com.github.spotbugs'
21+
// id "com.github.spotbugs" version "4.6.0"
2222
id 'eclipse'
2323
id 'idea'
24+
// id 'checkstyle'
2425
id 'jacoco'
25-
id 'checkstyle'
26-
id 'com.github.kt3k.coveralls'
26+
id 'com.github.kt3k.coveralls' version '2.8.4'
2727
}
2828

2929
// MAJOR VERSION - Manually set
@@ -46,12 +46,6 @@ repositories {
4646
}
4747

4848

49-
50-
tasks.withType(com.github.spotbugs.SpotBugsTask) {
51-
reports.html.enabled true
52-
reports.xml.enabled false
53-
}
54-
5549
test {
5650
// enable TestNG support (default is JUnit)
5751
useJUnit {
@@ -214,6 +208,13 @@ if (project.hasProperty('branch')) {
214208
new ProcessBuilder("git", "checkout", findProperty('branch')).start()
215209
}
216210

211+
tasks.withType(Checkstyle) {
212+
reports {
213+
xml.enabled false
214+
html.enabled true
215+
}
216+
}
217+
217218
test.finalizedBy jacocoTestReport
218219

219220
defaultTasks 'test', 'jacocoTestReport', 'buildJavadoc', 'buildGitJar'

gradle/tasks.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@ ext{
3434

3535
gradle.projectsEvaluated {
3636
if(args != "[buildLocalJar]") {
37-
compileJava.dependsOn(compileJava16)
37+
//compileJava.dependsOn(compileJava16)
3838
compileJava.dependsOn(compileJava17)
39+
//buildCoreJar17.dependsOn(buildCoreJar16)
3940
test.dependsOn(FinishTest)
4041
}
4142
}
@@ -70,7 +71,7 @@ task buildCoreJar16(type: Jar, dependsOn: jar) {
7071
manifest = project.manifest {from sharedManifest}
7172
}
7273

73-
task buildCoreJar17(type: Jar, dependsOn: buildCoreJar16) {
74+
task buildCoreJar17(type: Jar) {
7475
description 'Build Jar with NetworkParser-Corefor Java 1.7'
7576
group "Jar"; from fileTree(dir: 'build/classes/main17'); classifier = 'core17'
7677
manifest = project.manifest {from sharedManifest}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)