build(deps): bump org.gradlex:java-module-testing from 1.7 to 1.8 (#343)

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Jendrik Johannes <jendrik.johannes@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jendrik Johannes <jendrik.johannes@gmail.com>

Author: dependabot[bot]

build.gradle.kts

@@ -31,7 +31,7 @@ dependencies {
     implementation("net.swiftzer.semver:semver:2.1.0")
     implementation("org.gradlex:extra-java-module-info:1.13.1")
     implementation("org.gradlex:java-module-dependencies:1.11")
-    implementation("org.gradlex:java-module-testing:1.7")
+    implementation("org.gradlex:java-module-testing:1.8")
     implementation("org.gradlex:jvm-dependency-conflict-resolution:2.4")
     implementation("org.gradlex:reproducible-builds:1.1")
 

src/main/kotlin/org.hiero.gradle.feature.protobuf.gradle.kts

@@ -1,4 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
+import com.google.protobuf.gradle.GenerateProtoTask
+
 plugins {
     id("java")
     id("com.google.protobuf")
@@ -11,12 +13,7 @@ protobuf {
     // Add GRPC plugin as we need to generate GRPC services
     plugins { register("grpc") { artifact = "io.grpc:protoc-gen-grpc-java" } }
     generateProtoTasks {
-        all().configureEach {
-            plugins.register("grpc") { option("@generated=omit") }
-            // Track all tools as input to react if version changes for the tools
-            inputs.files(configurations["protobufToolsLocator_protoc"])
-            inputs.files(configurations["protobufToolsLocator_grpc"])
-        }
+        all().configureEach { plugins.register("grpc") { option("@generated=omit") } }
     }
 }
 
@@ -30,6 +27,11 @@ configurations.configureEach {
             isTransitive = true
             extendsFrom(configurations["internal"])
         }
+        if (name.startsWith("protobufToolsLocator")) {
+            // Track all tools as input to react to version changes for the tools
+            val protobufToolsLocator = this
+            tasks.withType<GenerateProtoTask>().configureEach { inputs.files(protobufToolsLocator) }
+        }
     }
 }
 

src/main/kotlin/org.hiero.gradle.feature.publish-maven-repository.gradle.kts

@@ -27,7 +27,7 @@ publishing.publications.withType<MavenPublication>().configureEach {
         // Everything published takes the versions from the resolution result.
         // These are the versions we define in 'hiero-dependency-versions'
         // and use consistently in all modules.
-        allVariants { fromResolutionResult() }
+        versionMapping { allVariants { fromResolutionOf("mainRuntimeClasspath") } }
     }
 
     suppressAllPomMetadataWarnings()

src/main/kotlin/org.hiero.gradle.feature.test-fixtures.gradle.kts

@@ -12,3 +12,12 @@ plugins {
     withVariantsFromConfiguration(configurations["testFixturesApiElements"]) { skip() }
     withVariantsFromConfiguration(configurations["testFixturesRuntimeElements"]) { skip() }
 }
+
+// Remove implicit dependency from 'testFixtures' to 'main', as we declare all dependencies
+// explicitly. This is necessary for the case where a module does not have a 'main' module-info.
+// https://github.com/gradle/gradle/blob/d9303339298e6206182fd1f5c7e51f11e4bdff30/subprojects/plugins/src/main/java/org/gradle/api/plugins/JavaTestFixturesPlugin.java#L68
+configurations {
+    testFixturesApi {
+        withDependencies { remove(find { it is ProjectDependency && it.name == project.name }) }
+    }
+}

src/main/kotlin/org.hiero.gradle.feature.test-hammer.gradle.kts

@@ -19,11 +19,3 @@ testing.suites {
         }
     }
 }
-
-// Link 'main' dependency scopes similar as they are linked for 'test'
-// https://docs.gradle.org/current/userguide/java_library_plugin.html#sec:java_library_configurations_graph
-configurations {
-    getByName("hammerCompileOnly") { extendsFrom(configurations.compileOnly.get()) }
-    getByName("hammerImplementation") { extendsFrom(configurations.implementation.get()) }
-    getByName("hammerRuntimeOnly") { extendsFrom(configurations.runtimeOnly.get()) }
-}

src/main/kotlin/org.hiero.gradle.feature.test-time-consuming.gradle.kts

@@ -6,11 +6,3 @@ plugins { id("java") }
 testing.suites {
     register<JvmTestSuite>("timeConsuming") { targets.all { testTask { maxHeapSize = "4g" } } }
 }
-
-// Link 'main' dependency scopes similar as they are linked for 'test'
-// https://docs.gradle.org/current/userguide/java_library_plugin.html#sec:java_library_configurations_graph
-configurations {
-    getByName("timeConsumingCompileOnly") { extendsFrom(configurations.compileOnly.get()) }
-    getByName("timeConsumingImplementation") { extendsFrom(configurations.implementation.get()) }
-    getByName("timeConsumingRuntimeOnly") { extendsFrom(configurations.runtimeOnly.get()) }
-}

src/main/kotlin/org.hiero.gradle.feature.test-timing-sensitive.gradle.kts

@@ -20,11 +20,3 @@ testing.suites {
         }
     }
 }
-
-// Link 'main' dependency scopes similar as they are linked for 'test'
-// https://docs.gradle.org/current/userguide/java_library_plugin.html#sec:java_library_configurations_graph
-configurations {
-    getByName("timingSensitiveCompileOnly") { extendsFrom(configurations.compileOnly.get()) }
-    getByName("timingSensitiveImplementation") { extendsFrom(configurations.implementation.get()) }
-    getByName("timingSensitiveRuntimeOnly") { extendsFrom(configurations.runtimeOnly.get()) }
-}

src/main/kotlin/org.hiero.gradle.feature.test.gradle.kts

@@ -29,8 +29,6 @@ testing.suites {
     }
 }
 
-configurations.testCompileOnly { extendsFrom(configurations.compileOnly.get()) }
-
 // If user gave the argument '-PactiveProcessorCount', then do:
 // - run all test tasks in sequence
 // - give the -XX:ActiveProcessorCount argument to the test JVMs