Merge remote-tracking branch 'upstream/main' into configurationprovider-lookup-change

Author: timhamoni

.gitattributes

@@ -0,0 +1,17 @@
+name: Dependency Submission
+
+on: [ push ]
+
+permissions:
+  contents: write
+
+jobs:
+  dependency-submission:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+      - uses: gradle/actions/dependency-submission@v5
+        with:
+          build-scan-publish: true
+          build-scan-terms-of-use-url: "https://gradle.com/help/legal-terms-of-use"
+          build-scan-terms-of-use-agree: "yes"

.github/workflows/dependency-submission.yml

@@ -219,6 +219,8 @@ This needs to be done in all subprojects. You use the `versionsProvidingConfigur
 ```kotlin
 extraJavaModuleInfo {
     versionsProvidingConfiguration = project.provider { project.configurations.named("mainRuntimeClasspath").get() }
+    // or for older Gradle/Kotlin versions
+    // versionsProvidingConfiguration.set(project.provider { project.configurations.named("mainRuntimeClasspath").get() })
 }
 ```
 

README.md

@@ -1,31 +1,14 @@
-plugins {
-    id("groovy")
-    `java-gradle-plugin`
-    id("org.gradlex.internal.plugin-publish-conventions") version "0.6"
-}
-
-group = "org.gradlex"
 version = "1.13.1"
 
-java {
-    toolchain.languageVersion = JavaLanguageVersion.of(11)
-}
-
-dependencies {
-    implementation("org.ow2.asm:asm:9.9")
+dependencies { implementation("org.ow2.asm:asm:9.9") }
 
-    testImplementation("org.spockframework:spock-core:2.3-groovy-4.0") {
-        exclude(group = "org.codehaus.groovy")
+publishingConventions {
+    pluginPortal("${project.group}.${project.name}") {
+        implementationClass("org.gradlex.javamodule.moduleinfo.ExtraJavaModuleInfoPlugin")
+        displayName("Extra Java Module Info Gradle Plugin")
+        description("Add module information to legacy Java libraries.")
+        tags("gradlex", "java", "modularity", "jigsaw", "jpms")
     }
-    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
-}
-
-pluginPublishConventions {
-    id("${project.group}.${project.name}")
-    implementationClass("org.gradlex.javamodule.moduleinfo.ExtraJavaModuleInfoPlugin")
-    displayName("Extra Java Module Info Gradle Plugin")
-    description("Add module information to legacy Java libraries.")
-    tags("gradlex", "java", "modularity", "jigsaw", "jpms")
     gitHub("https://github.com/gradlex-org/extra-java-module-info")
     developer {
         id.set("jjohannes")
@@ -34,31 +17,12 @@ pluginPublishConventions {
     }
 }
 
-tasks.named<Test>("test") {
-    description = "Runs tests against the Gradle version the plugin is built with"
-}
+testingConventions { testGradleVersions("6.8.3", "6.9.4", "7.6.5", "8.14.2") }
 
-listOf("6.8.3", "6.9.4", "7.6.5", "8.14.2").forEach { gradleVersionUnderTest ->
-    val testGradle = tasks.register<Test>("testGradle$gradleVersionUnderTest") {
-        description = "Runs tests against Gradle $gradleVersionUnderTest"
-        systemProperty("gradleVersionUnderTest", gradleVersionUnderTest)
-    }
-    tasks.check {
-        dependsOn(testGradle)
-    }
-}
+// === the following custom configuration should be removed once tests are migrated to Java
+apply(plugin = "groovy")
 
-tasks.withType<Test>().configureEach {
-    group = "verification"
-    classpath = sourceSets.test.get().runtimeClasspath
-    testClassesDirs = sourceSets.test.get().output.classesDirs
-    useJUnitPlatform()
-    maxParallelForks = 4
+tasks.named<GroovyCompile>("compileTestGroovy") { targetCompatibility = "11" } // allow tests to run against 6.x
 
-    val gradleMajorVersion = (systemProperties["gradleVersionUnderTest"] as String? ?: gradle.gradleVersion).split(".")[0].toInt()
-    if (gradleMajorVersion >= 7) {
-        javaLauncher = javaToolchains.launcherFor { languageVersion = JavaLanguageVersion.of(17) }
-    } else {
-        javaLauncher = javaToolchains.launcherFor { languageVersion = JavaLanguageVersion.of(11) }
-    }
-}
+dependencies { testImplementation("org.spockframework:spock-core:2.3-groovy-4.0") } //
+// ====================================================================================

build.gradle.kts

@@ -0,0 +1 @@
+toolchainVersion=17