implab/gradle-common Commit - r62:c7861b56e1d8

Upgrade Gradle to 9.4.1 and fix functional tests

cin -

r62:c7861b56e1d8 default

parent child

Context file:

r62:c7861b56e1d8

Collapse all files

common/build.gradle +1 -1

             publishing {
                 repositories {
                     ivy {
-                        url "${System.properties["user.home"]}/ivy-repo"
+                        url = "${System.properties["user.home"]}/ivy-repo"
                     }
                 }
                 publications {

gradle/wrapper/gradle-wrapper.jar binary modified 0 0

NO CONTENT: modified file, binary diff hidden

gradle/wrapper/gradle-wrapper.properties +1 -1

             distributionBase=GRADLE_USER_HOME
             distributionPath=wrapper/dists
-            distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+            distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
             networkTimeout=10000
             validateDistributionUrl=true
             zipStoreBase=GRADLE_USER_HOME

gradlew +5 -2

             # See the License for the specific language governing permissions and
             # limitations under the License.
             #
+            # SPDX-License-Identifier: Apache-2.0
+            #
             ##############################################################################
             #
             #       Darwin, MinGW, and NonStop.
             #
             #   (3) This script is generated from the Groovy template
-            #       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+            #       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
             #       within the Gradle project.
             #
             #       You can find Gradle at https://github.com/gradle/gradle/.
             # shellcheck disable=SC2034
             APP_BASE_NAME=${0##*/}
             # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-            APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+            APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+            ' "$PWD" ) || exit
             # Use the maximum available, or set MAX_FD != -1 to use that value.
             MAX_FD=maximum

gradlew.bat +2 0

             @rem See the License for the specific language governing permissions and
             @rem limitations under the License.
             @rem
+            @rem SPDX-License-Identifier: Apache-2.0
+            @rem
             @if "%DEBUG%"=="" @echo off
             @rem ##########################################################################

settings.gradle +1 -1

                     mavenCentral()
                     mavenLocal()
                     ivy {
-                        url "${System.properties["user.home"]}/ivy-repo"
+                        url = "${System.properties["user.home"]}/ivy-repo"
                     }
                 }
             }

variants/build.gradle +1 -1

             publishing {
                 repositories {
                     ivy {
-                        url "${System.properties["user.home"]}/ivy-repo"
+                        url = "${System.properties["user.home"]}/ivy-repo"
                     }
                 }
                 publications {

variants/src/test/java/org/implab/gradle/variants/AbstractFunctionalTest.java +25 0

@@ -9,6 +9,7 import java.nio.file.Path;
9	import java.util.LinkedHashSet;	9	import java.util.LinkedHashSet;
10	import java.util.List;	10	import java.util.List;
11	import java.util.stream.Collectors;	11	import java.util.stream.Collectors;
		12	import java.util.regex.Pattern;
12		13
13	import org.gradle.testkit.runner.GradleRunner;	14	import org.gradle.testkit.runner.GradleRunner;
14	import org.gradle.testkit.runner.UnexpectedBuildFailure;	15	import org.gradle.testkit.runner.UnexpectedBuildFailure;
@@ -19,6 +20,8 import org.junit.jupiter.api.io.TempDir;
19	abstract class AbstractFunctionalTest {	20	abstract class AbstractFunctionalTest {
20	private static final String SETTINGS_FILE = "settings.gradle";	21	private static final String SETTINGS_FILE = "settings.gradle";
21	private static final String BUILD_FILE = "build.gradle";	22	private static final String BUILD_FILE = "build.gradle";
		23	private static final Pattern INCLUDE_DECLARATION = Pattern.compile("^include(?:\\s\|\\().*");
		24	private static final Pattern QUOTED_LITERAL = Pattern.compile("['\"]([^'\"]+)['\"]");
22		25
23	@TempDir	26	@TempDir
24	Path testProjectDir;	27	Path testProjectDir;
@@ -94,5 +97,27 abstract class AbstractFunctionalTest {
94	Path path = testProjectDir.resolve(relativePath);	97	Path path = testProjectDir.resolve(relativePath);
95	Files.createDirectories(path.getParent());	98	Files.createDirectories(path.getParent());
96	Files.writeString(path, content);	99	Files.writeString(path, content);
		100
		101	if (SETTINGS_FILE.equals(relativePath))
		102	ensureIncludedProjectDirectories(content);
		103	}
		104
		105	private void ensureIncludedProjectDirectories(String settingsContent) throws IOException {
		106	for (var line : settingsContent.split("\\R")) {
		107	var trimmed = line.strip();
		108	if (!INCLUDE_DECLARATION.matcher(trimmed).matches())
		109	continue;
		110
		111	var matcher = QUOTED_LITERAL.matcher(trimmed);
		112	while (matcher.find()) {
		113	var projectPath = matcher.group(1);
		114	if (projectPath.startsWith(":"))
		115	projectPath = projectPath.substring(1);
		116	if (projectPath.isBlank())
		117	continue;
		118
		119	Files.createDirectories(testProjectDir.resolve(projectPath.replace(':', File.separatorChar)));
97	}	120	}
98	}	121	}
		122	}
		123	}

variants/src/test/java/org/implab/gradle/variants/VariantArtifactsPluginFunctionalTest.java +5 -5

                 }
                 @Test
-                void gradleReferenceRegisteredSecondaryArtifactVariantIsNotRealizedBeforeResolution() throws Exception {
+                void gradleReferenceRegisteredSecondaryArtifactVariantAllowsSecondaryArtifactSelection() throws Exception {
-                    // Gradle issue: https://github.com/gradle/gradle/issues/27441
-                    // Registered outgoing artifact variants are not realized before dependency resolution.
                     writeFile("settings.gradle", """
                             rootProject.name = 'gradle-reference-registered-secondary-variant'
                             include 'producer', 'consumer'
                             }
                             """);
-                    assertBuildFails("Cannot create variant 'js' after dependency configuration ':producer:browserElements' has been resolved",
+                    BuildResult result = runner(":consumer:probe").build();
-                            ":consumer:probe");
+                    assertTrue(result.getOutput().contains("compileFiles=typesPackage"));
+                    assertTrue(result.getOutput().contains("jsFiles=js"));
                 }
                 @Test

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages