refactor

hyperledger-web3j · Aug 21, 2023 · 9aec353 · 9aec353
1 parent 107797c
commit 9aec353
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 72 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -49,7 +49,7 @@ jobs:
         # queries: security-extended,security-and-quality
 
     - name: Build
-      run: ./gradlew jacocoRootReport
+      run: ./gradlew jacocoTestReport
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2

diff --git a/abi/build.gradle b/abi/build.gradle
@@ -9,19 +9,4 @@ dependencies {
 }
 
 tasks.named("spotlessJava").configure { dependsOn("spotlessGroovyGradle","compileJava","compileTestJava","javadoc","test") }
-tasks.named("spotlessKotlin").configure { dependsOn("compileJava","spotlessJava", "spotlessGroovyGradle","compileTestJava","processTestResources","javadoc","test") }
-//tasks.named("jacocoRootReport").configure { dependsOn("compileJava","compileTestJava","javadoc","test", "spotlessGroovyGradle", "spotlessKotlin","spotlessJava") }
-//tasks.named("jacocoRootReport").configure { dependsOn(":besu:compileJava",":besu:compileTestJava",":besu:javadoc",":besu:test", ":besu:spotlessGroovyGradle", ":besu:spotlessJava",":besu:spotlessKotlin") }
-//tasks.named("jacocoRootReport").configure { dependsOn(":test",":spotlessGroovyGradle",":spotlessJava",":spotlessKotlin") }
-//tasks.named("jacocoRootReport").configure { dependsOn(":codegen:compileJava",":codegen:compileTestJava",":codegen:javadoc",":codegen:test",":codegen:processTestResources",":codegen:spotlessGroovyGradle", ":codegen:spotlessJava",":codegen:spotlessKotlin") }
-//tasks.named("jacocoRootReport").configure { dependsOn(":contracts:compileJava",":contracts:javadoc",":contracts:test",":contracts:processResources",":contracts:spotlessGroovyGradle", ":contracts:spotlessJava",":contracts:spotlessKotlin") }
-//tasks.named("jacocoRootReport").configure { dependsOn(":core:javadoc",":core:test",":core:spotlessGroovyGradle", ":core:spotlessJava",":core:spotlessKotlin") }
-//tasks.named("jacocoRootReport").configure { dependsOn(":crypto:javadoc",":crypto:test",":crypto:spotlessGroovyGradle", ":crypto:spotlessJava",":crypto:spotlessKotlin") }
-//tasks.named("jacocoRootReport").configure { dependsOn(":eea:compileTestJava",":eea:javadoc",":eea:test",":eea:spotlessGroovyGradle", ":eea:spotlessJava",":eea:spotlessKotlin") }
-//tasks.named("jacocoRootReport").configure { dependsOn(":geth:compileJava",":geth:compileTestJava",":geth:javadoc",":geth:test",":geth:spotlessGroovyGradle", ":geth:spotlessJava",":geth:spotlessKotlin") }
-//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") }
-//tasks.named("jacocoRootReport").configure { dependsOn(":integration-tests:compileTestJava",":integration-tests:processTestResources",":integration-tests:spotlessGroovyGradle", ":integration-tests:spotlessJava",":integration-tests:spotlessKotlin") }
-//tasks.named("jacocoRootReport").configure { dependsOn(":parity:compileJava",":parity:compileTestJava",":parity:javadoc",":parity:test",":parity:spotlessGroovyGradle", ":parity:spotlessJava",":parity:spotlessKotlin") }
-//tasks.named("jacocoRootReport").configure { dependsOn(":rlp:compileTestJava",":rlp:javadoc",":rlp:test",":rlp:spotlessGroovyGradle", ":rlp:spotlessJava",":rlp:spotlessKotlin") }
-//tasks.named("jacocoRootReport").configure { dependsOn(":tuples:javadoc",":tuples:test",":tuples:spotlessGroovyGradle", ":tuples:spotlessJava",":tuples:spotlessKotlin") }
-//tasks.named("jacocoRootReport").configure { dependsOn(":utils:javadoc",":utils:test",":utils:spotlessGroovyGradle", ":utils:spotlessJava",":utils:spotlessKotlin") }
+tasks.named("spotlessKotlin").configure { dependsOn("compileJava","spotlessJava", "spotlessGroovyGradle","compileTestJava","processTestResources","javadoc","test") }
diff --git a/besu/build.gradle b/besu/build.gradle
@@ -10,4 +10,3 @@ dependencies {
 
 tasks.named("spotlessJava").configure { dependsOn("spotlessGroovyGradle","compileJava","compileTestJava","javadoc","test") }
 tasks.named("spotlessKotlin").configure { dependsOn("compileJava","spotlessJava", "spotlessGroovyGradle","compileTestJava","processTestResources","javadoc","test") }
-//tasks.named("jacocoRootReport").configure { dependsOn("compileJava","compileTestJava","javadoc","test", "spotlessGroovyGradle", "spotlessKotlin","spotlessJava") }
diff --git a/codegen/build.gradle b/codegen/build.gradle
@@ -40,4 +40,3 @@ file("src/test/resources/solidity").listFiles().each { File file ->
 
 tasks.named("spotlessJava").configure { dependsOn("spotlessGroovyGradle","compileJava","compileTestJava","processTestResources","javadoc","test") }
 tasks.named("spotlessKotlin").configure { dependsOn("compileJava","spotlessJava", "spotlessGroovyGradle","compileTestJava","processTestResources","javadoc","test") }
-//tasks.named("jacocoRootReport").configure { dependsOn("compileJava","compileTestJava","javadoc","test", "spotlessGroovyGradle", "spotlessKotlin","spotlessJava") }
diff --git a/contracts/build.gradle b/contracts/build.gradle
@@ -7,4 +7,3 @@ dependencies {
 }
 tasks.named("spotlessJava").configure { dependsOn("compileJava","javadoc","processResources","spotlessGroovyGradle") }
 tasks.named("spotlessKotlin").configure { dependsOn("compileJava","javadoc","processResources","spotlessJava","spotlessGroovyGradle") }
-//tasks.named("jacocoRootReport").configure { dependsOn("compileJava","compileTestJava","javadoc","test", "spotlessGroovyGradle", "spotlessKotlin","spotlessJava") }
diff --git a/gradle/jacoco/build.gradle b/gradle/jacoco/build.gradle
@@ -1,54 +1,3 @@
-//task jacocoRootTestReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
-//
-//    doFirst {
-//        executionData.fileTree(project.rootDir.absolutePath).include("**/build/jacoco/*.exec")
-//        getExecutionData().from(executionData.findAll { it.exists() })
-//    }
-//
-//    dependsOn(subprojects.test)
-//
-//    getSourceDirectories().from(subprojects.sourceSets.main.allSource.srcDirs)
-//    getAdditionalSourceDirs().from(subprojects.sourceSets.main.allSource.srcDirs)
-//    getClassDirectories().from(subprojects.sourceSets.main.output)
-//    executionData.from(subprojects.jacocoTestReport.executionData)
-//
-//    reports {
-//        xml.enabled true
-//    }
-//
-//    afterEvaluate {
-//        getClassDirectories().from(files(classDirectories.files.collect {
-//            fileTree(dir: it,
-//                    exclude: [
-//                            'org/web3j/abi/datatypes/generated/**',
-//                            'org/web3j/tuples/generated/**',
-//                            'org/web3j/ens/contracts/generated/**',
-//                            'org/gradle/**'
-//                    ])
-//        }))
-//    }
-//}
-
-//task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
-//    additionalSourceDirs.from files(subprojects.sourceSets.main.allSource.srcDirs)
-//    sourceDirectories.from files(subprojects.sourceSets.main.allSource.srcDirs)
-//    classDirectories.from files(subprojects.sourceSets.main.output).asFileTree.matching {
-//        exclude 'org/web3j/abi/datatypes/generated/**',
-//                'org/web3j/tuples/generated/**',
-//                'org/web3j/ens/contracts/generated/**',
-//                'org/gradle/**'
-//    }
-//    executionData.from fileTree(dir: '.', includes: ['**/jacoco/*.exec'])
-//    reports {
-//        xml.required = true
-//        xml.enabled = true
-//        csv.required = true
-//        html.destination file("build/reports/jacocoHtml")
-//    }
-//    onlyIf = { true }
-//}
-
-
 apply(plugin: 'jacoco')
 
 test {

diff --git a/utils/build.gradle b/utils/build.gradle
@@ -8,4 +8,3 @@ dependencies { api "org.bouncycastle:bcprov-jdk18on:$bouncycastleVersion" }
 
 tasks.named("spotlessJava").configure { dependsOn("spotlessGroovyGradle","compileJava","compileTestJava","javadoc","test") }
 tasks.named("spotlessKotlin").configure { dependsOn("compileJava","spotlessJava", "spotlessGroovyGradle","compileTestJava","processTestResources","javadoc","test") }
-//tasks.named("jacocoRootReport").configure { dependsOn("compileJava","compileTestJava","javadoc","test", "spotlessGroovyGradle", "spotlessKotlin","spotlessJava") }