Merge pull request #89 from LFDT-web3j/release/0.6.1

release 0.6.1

Author: gtebrean

CHANGELOG.md

@@ -3,14 +3,29 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [0.7.0](https://github.com/LFDT-web3j/web3j-solidity-gradle-plugin/releases/tag/v0.7.0) (Upcoming)
+# [0.6.2]() (Upcoming)
 
 ### Bug Fixes
 
 *
 
 ### Features
 
+*
+
+### BREAKING CHANGES
+
+*
+
+# [0.6.1](https://github.com/LFDT-web3j/web3j-solidity-gradle-plugin/releases/tag/v0.6.1) (2026-01-15)
+
+### Bug Fixes
+
+* Fix to link to the 'processResources' task of the current source set [#88](https://github.com/LFDT-web3j/web3j-solidity-gradle-plugin/pull/88)
+* Fix jacoco gradle file for publishing [#99](https://github.com/hyperledger/web3j-solidity-gradle-plugin/pull/89)
+
+### Features
+
 * Full Gradle 9 compatibility [#86](https://github.com/hyperledger/web3j-solidity-gradle-plugin/pull/86)
 * Full Gradle Configuration Cache compatibility [#86](https://github.com/hyperledger/web3j-solidity-gradle-plugin/pull/86)
 

build.gradle

@@ -52,7 +52,7 @@ repositories {
 }
 
 ext {
-    soktVersion = '0.5.0'
+    soktVersion = '0.6.0'
     kotlinxSerializationVersion = '1.6.3' // required to CompileStatic with sokt involved
     junitVersion = '5.9.3'
     assertjVersion = '3.25.3'

gradle.properties

@@ -1,5 +1,5 @@
 group=org.web3j.solidity
-version=0.6.0
+version=0.6.1
 
 # Use Local Build Cache: https://docs.gradle.org/current/userguide/build_cache.html
 org.gradle.caching=true

gradle/jacoco/build.gradle

@@ -1,33 +1,43 @@
 apply plugin: 'jacoco'
 
+def javaProjects = subprojects.findAll { p ->
+    p.plugins.hasPlugin('java') || p.plugins.hasPlugin('java-library')
+}
+
 tasks.register('jacocoRootTestReport', JacocoReport) {
-    dependsOn = subprojects.test
-    getSourceDirectories().from(subprojects.sourceSets.main.allSource.srcDirs)
-    getAdditionalSourceDirs().from(subprojects.sourceSets.main.allSource.srcDirs)
-    getClassDirectories().from(subprojects.sourceSets.main.output)
-    getExecutionData().from(subprojects.jacocoTestReport.executionData)
+    // run tests + create per-project jacoco reports first
+    dependsOn(javaProjects.collect { it.tasks.named('test') })
+    dependsOn(javaProjects.collect { it.tasks.named('jacocoTestReport') })
+
+    def mainSrcDirs = files(javaProjects.collect { it.sourceSets.main.allSource.srcDirs })
+    sourceDirectories.setFrom(mainSrcDirs)
+    additionalSourceDirs.setFrom(mainSrcDirs)
+
+    // execution data from subprojects
+    executionData.setFrom(files(javaProjects.collect {
+        it.tasks.named('jacocoTestReport').get().executionData
+    }))
+
+    // classes with excludes (no afterEvaluate needed)
+    def allMainOutputs = files(javaProjects.collect { it.sourceSets.main.output })
+    classDirectories.setFrom(allMainOutputs.asFileTree.matching {
+        exclude(
+                'org/web3j/abi/datatypes/generated/**',
+                'org/web3j/tuples/generated/**',
+                'org/web3j/ens/contracts/generated/**',
+                'org/gradle/**'
+        )
+    })
+
     reports {
         xml.required.set(true)
     }
 
     doFirst {
-        getExecutionData().from(executionData.findAll { it.exists() })
-    }
-
-    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/**'
-                    ])
-        }))
+        executionData.setFrom(executionData.filter { it.exists() })
     }
 }
 
 jacoco {
     toolVersion = "0.8.10"
 }
-