Gradle 8.0-rc-1

Author: jjohannes

build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     id("groovy")
-    id("org.gradlex.internal.plugin-publish-conventions") version "0.4"
+    id("org.gradlex.internal.plugin-publish-conventions") version "0.5"
 }
 
 group = "org.gradlex"
@@ -38,7 +38,7 @@ tasks.test {
     maxParallelForks = 4
 }
 
-listOf("6.4.1", "6.9.2", "7.0.2").forEach { gradleVersionUnderTest ->
+listOf("6.4.1", "6.9.2", "7.0.2", "7.6").forEach { gradleVersionUnderTest ->
     val testGradle = tasks.register<Test>("testGradle$gradleVersionUnderTest") {
         group = "verification"
         description = "Runs tests against Gradle $gradleVersionUnderTest"

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-rc-1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -144,15 +144,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

gradlew

@@ -5,6 +5,8 @@ import org.gradlex.javamodule.moduleinfo.test.fixture.LegacyLibraries
 import org.gradle.testkit.runner.TaskOutcome
 import spock.lang.Specification
 
+import static org.gradlex.javamodule.moduleinfo.test.fixture.GradleBuild.gradleVersionUnderTest
+
 abstract class AbstractFunctionalTest extends Specification {
 
     abstract LegacyLibraries getLibs()

src/test/groovy/org/gradlex/javamodule/moduleinfo/test/AbstractFunctionalTest.groovy

@@ -2,6 +2,7 @@ package org.gradlex.javamodule.moduleinfo.test
 
 import org.gradlex.javamodule.moduleinfo.test.fixture.GradleBuild
 import org.gradle.testkit.runner.TaskOutcome
+import spock.lang.IgnoreIf
 import spock.lang.Specification
 
 import java.util.jar.JarFile
@@ -15,6 +16,7 @@ class CombinationWithOtherPluginsFunctionalTest extends Specification {
         settingsFile << 'rootProject.name = "test-project"'
     }
 
+    @IgnoreIf({ GradleBuild.gradleVersionUnderTest?.startsWith('6.') })
     def "works in combination with shadow plugin"() {
         def shadowJar = file("app/build/libs/app-all.jar")
 
@@ -44,13 +46,13 @@ class CombinationWithOtherPluginsFunctionalTest extends Specification {
             plugins {
                 id 'application'
                 id 'org.gradlex.extra-java-module-info'
-                id 'com.github.johnrengelman.shadow' version '6.1.0'
+                id 'com.github.johnrengelman.shadow' version '7.1.2'
             }
             dependencies {
                 implementation project(':utilities')
             }
             java.modularity.inferModulePath = true
-            application.mainClassName = 'App'
+            application.mainClass = 'App'
             configurations {
                 runtimeClasspath {
                     attributes { attribute(Attribute.of("javaModule", Boolean), false) }
@@ -61,8 +63,9 @@ class CombinationWithOtherPluginsFunctionalTest extends Specification {
         expect:
         runner(':app:shadowJar').build().task(':app:shadowJar').outcome == TaskOutcome.SUCCESS
         shadowJar.exists()
-        // 1 * module-info, 2 * class file, 1 * META-INF folder, 1 * MANIFEST
-        new JarFile(shadowJar).entries().asIterator().size() == 5
+        // 4 Entries = 2 * class file, 1 * META-INF folder, 1 * MANIFEST
+        // module-info.class is excluded (see: https://github.com/johnrengelman/shadow/issues/352)
+        new JarFile(shadowJar).entries().asIterator().size() == 4
     }
 
 }

src/test/groovy/org/gradlex/javamodule/moduleinfo/test/CombinationWithOtherPluginsFunctionalTest.groovy

@@ -4,6 +4,8 @@ import org.gradlex.javamodule.moduleinfo.test.fixture.GradleBuild
 import org.gradlex.javamodule.moduleinfo.test.fixture.LegacyLibraries
 import spock.lang.Specification
 
+import static org.gradlex.javamodule.moduleinfo.test.fixture.GradleBuild.gradleVersionUnderTest
+
 class EdgeCasesFunctionalTest extends Specification {
 
     @Delegate

src/test/groovy/org/gradlex/javamodule/moduleinfo/test/EdgeCasesFunctionalTest.groovy

@@ -12,7 +12,7 @@ class GradleBuild {
     final File buildFile
     final File settingsFile
 
-    final String gradleVersionUnderTest = System.getProperty("gradleVersionUnderTest")
+    final static String gradleVersionUnderTest = System.getProperty("gradleVersionUnderTest")
 
     GradleBuild(File projectDir = Files.createTempDirectory("gradle-build").toFile()) {
         this.projectDir = projectDir