Skip to content

Commit 9aec353

Browse files
gtebreangtebrean
committed
refactor
1 parent 107797c commit 9aec353

File tree

7 files changed

+2
-72
lines changed

7 files changed

+2
-72
lines changed

Diff for: ‎.github/workflows/codeql.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
# queries: security-extended,security-and-quality
5050

5151
- name: Build
52-
run: ./gradlew jacocoRootReport
52+
run: ./gradlew jacocoTestReport
5353

5454
- name: Perform CodeQL Analysis
5555
uses: github/codeql-action/analyze@v2

Diff for: ‎abi/build.gradle

+1-16
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,4 @@ dependencies {
99
}
1010

1111
tasks.named("spotlessJava").configure { dependsOn("spotlessGroovyGradle","compileJava","compileTestJava","javadoc","test") }
12-
tasks.named("spotlessKotlin").configure { dependsOn("compileJava","spotlessJava", "spotlessGroovyGradle","compileTestJava","processTestResources","javadoc","test") }
13-
//tasks.named("jacocoRootReport").configure { dependsOn("compileJava","compileTestJava","javadoc","test", "spotlessGroovyGradle", "spotlessKotlin","spotlessJava") }
14-
//tasks.named("jacocoRootReport").configure { dependsOn(":besu:compileJava",":besu:compileTestJava",":besu:javadoc",":besu:test", ":besu:spotlessGroovyGradle", ":besu:spotlessJava",":besu:spotlessKotlin") }
15-
//tasks.named("jacocoRootReport").configure { dependsOn(":test",":spotlessGroovyGradle",":spotlessJava",":spotlessKotlin") }
16-
//tasks.named("jacocoRootReport").configure { dependsOn(":codegen:compileJava",":codegen:compileTestJava",":codegen:javadoc",":codegen:test",":codegen:processTestResources",":codegen:spotlessGroovyGradle", ":codegen:spotlessJava",":codegen:spotlessKotlin") }
17-
//tasks.named("jacocoRootReport").configure { dependsOn(":contracts:compileJava",":contracts:javadoc",":contracts:test",":contracts:processResources",":contracts:spotlessGroovyGradle", ":contracts:spotlessJava",":contracts:spotlessKotlin") }
18-
//tasks.named("jacocoRootReport").configure { dependsOn(":core:javadoc",":core:test",":core:spotlessGroovyGradle", ":core:spotlessJava",":core:spotlessKotlin") }
19-
//tasks.named("jacocoRootReport").configure { dependsOn(":crypto:javadoc",":crypto:test",":crypto:spotlessGroovyGradle", ":crypto:spotlessJava",":crypto:spotlessKotlin") }
20-
//tasks.named("jacocoRootReport").configure { dependsOn(":eea:compileTestJava",":eea:javadoc",":eea:test",":eea:spotlessGroovyGradle", ":eea:spotlessJava",":eea:spotlessKotlin") }
21-
//tasks.named("jacocoRootReport").configure { dependsOn(":geth:compileJava",":geth:compileTestJava",":geth:javadoc",":geth:test",":geth:spotlessGroovyGradle", ":geth:spotlessJava",":geth:spotlessKotlin") }
22-
//tasks.named("jacocoRootReport").configure { dependsOn(":hosted-providers:compileJava",":hosted-providers:compileTestJava",":hosted-providers:javadoc",":hosted-providers:test",":hosted-providers:spotlessGroovyGradle", ":hosted-providers:spotlessJava",":hosted-providers:spotlessKotlin") }
23-
//tasks.named("jacocoRootReport").configure { dependsOn(":integration-tests:compileTestJava",":integration-tests:processTestResources",":integration-tests:spotlessGroovyGradle", ":integration-tests:spotlessJava",":integration-tests:spotlessKotlin") }
24-
//tasks.named("jacocoRootReport").configure { dependsOn(":parity:compileJava",":parity:compileTestJava",":parity:javadoc",":parity:test",":parity:spotlessGroovyGradle", ":parity:spotlessJava",":parity:spotlessKotlin") }
25-
//tasks.named("jacocoRootReport").configure { dependsOn(":rlp:compileTestJava",":rlp:javadoc",":rlp:test",":rlp:spotlessGroovyGradle", ":rlp:spotlessJava",":rlp:spotlessKotlin") }
26-
//tasks.named("jacocoRootReport").configure { dependsOn(":tuples:javadoc",":tuples:test",":tuples:spotlessGroovyGradle", ":tuples:spotlessJava",":tuples:spotlessKotlin") }
27-
//tasks.named("jacocoRootReport").configure { dependsOn(":utils:javadoc",":utils:test",":utils:spotlessGroovyGradle", ":utils:spotlessJava",":utils:spotlessKotlin") }
12+
tasks.named("spotlessKotlin").configure { dependsOn("compileJava","spotlessJava", "spotlessGroovyGradle","compileTestJava","processTestResources","javadoc","test") }

Diff for: ‎besu/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,3 @@ dependencies {
1010

1111
tasks.named("spotlessJava").configure { dependsOn("spotlessGroovyGradle","compileJava","compileTestJava","javadoc","test") }
1212
tasks.named("spotlessKotlin").configure { dependsOn("compileJava","spotlessJava", "spotlessGroovyGradle","compileTestJava","processTestResources","javadoc","test") }
13-
//tasks.named("jacocoRootReport").configure { dependsOn("compileJava","compileTestJava","javadoc","test", "spotlessGroovyGradle", "spotlessKotlin","spotlessJava") }

Diff for: ‎codegen/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,3 @@ file("src/test/resources/solidity").listFiles().each { File file ->
4040

4141
tasks.named("spotlessJava").configure { dependsOn("spotlessGroovyGradle","compileJava","compileTestJava","processTestResources","javadoc","test") }
4242
tasks.named("spotlessKotlin").configure { dependsOn("compileJava","spotlessJava", "spotlessGroovyGradle","compileTestJava","processTestResources","javadoc","test") }
43-
//tasks.named("jacocoRootReport").configure { dependsOn("compileJava","compileTestJava","javadoc","test", "spotlessGroovyGradle", "spotlessKotlin","spotlessJava") }

Diff for: ‎contracts/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@ dependencies {
77
}
88
tasks.named("spotlessJava").configure { dependsOn("compileJava","javadoc","processResources","spotlessGroovyGradle") }
99
tasks.named("spotlessKotlin").configure { dependsOn("compileJava","javadoc","processResources","spotlessJava","spotlessGroovyGradle") }
10-
//tasks.named("jacocoRootReport").configure { dependsOn("compileJava","compileTestJava","javadoc","test", "spotlessGroovyGradle", "spotlessKotlin","spotlessJava") }

Diff for: ‎gradle/jacoco/build.gradle

-51
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,3 @@
1-
//task jacocoRootTestReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
2-
//
3-
// doFirst {
4-
// executionData.fileTree(project.rootDir.absolutePath).include("**/build/jacoco/*.exec")
5-
// getExecutionData().from(executionData.findAll { it.exists() })
6-
// }
7-
//
8-
// dependsOn(subprojects.test)
9-
//
10-
// getSourceDirectories().from(subprojects.sourceSets.main.allSource.srcDirs)
11-
// getAdditionalSourceDirs().from(subprojects.sourceSets.main.allSource.srcDirs)
12-
// getClassDirectories().from(subprojects.sourceSets.main.output)
13-
// executionData.from(subprojects.jacocoTestReport.executionData)
14-
//
15-
// reports {
16-
// xml.enabled true
17-
// }
18-
//
19-
// afterEvaluate {
20-
// getClassDirectories().from(files(classDirectories.files.collect {
21-
// fileTree(dir: it,
22-
// exclude: [
23-
// 'org/web3j/abi/datatypes/generated/**',
24-
// 'org/web3j/tuples/generated/**',
25-
// 'org/web3j/ens/contracts/generated/**',
26-
// 'org/gradle/**'
27-
// ])
28-
// }))
29-
// }
30-
//}
31-
32-
//task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
33-
// additionalSourceDirs.from files(subprojects.sourceSets.main.allSource.srcDirs)
34-
// sourceDirectories.from files(subprojects.sourceSets.main.allSource.srcDirs)
35-
// classDirectories.from files(subprojects.sourceSets.main.output).asFileTree.matching {
36-
// exclude 'org/web3j/abi/datatypes/generated/**',
37-
// 'org/web3j/tuples/generated/**',
38-
// 'org/web3j/ens/contracts/generated/**',
39-
// 'org/gradle/**'
40-
// }
41-
// executionData.from fileTree(dir: '.', includes: ['**/jacoco/*.exec'])
42-
// reports {
43-
// xml.required = true
44-
// xml.enabled = true
45-
// csv.required = true
46-
// html.destination file("build/reports/jacocoHtml")
47-
// }
48-
// onlyIf = { true }
49-
//}
50-
51-
521
apply(plugin: 'jacoco')
532

543
test {

Diff for: ‎utils/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,3 @@ dependencies { api "org.bouncycastle:bcprov-jdk18on:$bouncycastleVersion" }
88

99
tasks.named("spotlessJava").configure { dependsOn("spotlessGroovyGradle","compileJava","compileTestJava","javadoc","test") }
1010
tasks.named("spotlessKotlin").configure { dependsOn("compileJava","spotlessJava", "spotlessGroovyGradle","compileTestJava","processTestResources","javadoc","test") }
11-
//tasks.named("jacocoRootReport").configure { dependsOn("compileJava","compileTestJava","javadoc","test", "spotlessGroovyGradle", "spotlessKotlin","spotlessJava") }

0 commit comments

Comments
 (0)