implab/gradle-common Commit - r63:79fd940a7856

Add minimum Gradle compatibility functional test

cin -

r63:79fd940a7856 tip default

parent child

Context file:

r63:79fd940a7856

Collapse all files

gradle.properties +1 0

             group=org.implab.gradle
             version=0.1.0
+            testMinGradleVersion=8.10.2

variants/build.gradle +12 0

@@ -36,6 +36,18 test {
36	useJUnitPlatform()	36	useJUnitPlatform()
37	}	37	}
38		38
		39	tasks.register("minGradleCompatibilityTest", Test) {
		40	description = "Runs functional TestKit tests against the minimum supported Gradle version."
		41	group = "verification"
		42	useJUnitPlatform()
		43	testClassesDirs = sourceSets.test.output.classesDirs
		44	classpath = sourceSets.test.runtimeClasspath
		45	include "*/FunctionalTest.class"
		46	systemProperty "org.implab.gradle.test.gradleVersion", providers.gradleProperty("testMinGradleVersion").get()
		47	inputs.property("testMinGradleVersion", providers.gradleProperty("testMinGradleVersion"))
		48	shouldRunAfter test
		49	}
		50
39	javadoc {	51	javadoc {
40	exclude "/internal/"	52	exclude "/internal/"
41	}	53	}

variants/src/test/java/org/implab/gradle/variants/AbstractFunctionalTest.java +16 -1

             import org.gradle.testkit.runner.GradleRunner;
             import org.gradle.testkit.runner.UnexpectedBuildFailure;
+            import org.gradle.util.GradleVersion;
             import org.implab.gradle.common.core.lang.Deferred;
             import org.implab.gradle.variants.sources.GenericSourceSet;
             import org.junit.jupiter.api.io.TempDir;
             abstract class AbstractFunctionalTest {
                 private static final String SETTINGS_FILE = "settings.gradle";
                 private static final String BUILD_FILE = "build.gradle";
+                private static final String TEST_GRADLE_VERSION_PROPERTY = "org.implab.gradle.test.gradleVersion";
                 private static final Pattern INCLUDE_DECLARATION = Pattern.compile("^include(?:\\s|\\().*");
                 private static final Pattern QUOTED_LITERAL = Pattern.compile("['\"]([^'\"]+)['\"]");
                 }
                 protected GradleRunner runner(String... arguments) {
-                    return GradleRunner.create()
+                    var runner = GradleRunner.create()
                             .withProjectDir(testProjectDir.toFile())
                             .withArguments(arguments)
                             .forwardOutput();
+                    var gradleVersion = System.getProperty(TEST_GRADLE_VERSION_PROPERTY);
+                    if (gradleVersion != null && !gradleVersion.isBlank())
+                        runner = runner.withGradleVersion(gradleVersion);
+                    return runner;
+                }
+                protected GradleVersion targetGradleVersion() {
+                    var gradleVersion = System.getProperty(TEST_GRADLE_VERSION_PROPERTY);
+                    if (gradleVersion == null || gradleVersion.isBlank())
+                        return GradleVersion.current();
+                    return GradleVersion.version(gradleVersion);
                 }
                 protected void assertBuildFails(String expectedError, String... arguments) {

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

                 }
                 @Test
-                void gradleReferenceRegisteredSecondaryArtifactVariantAllowsSecondaryArtifactSelection() throws Exception {
+                void gradleReferenceRegisteredSecondaryArtifactVariantMatchesGradleBehavior() throws Exception {
                     writeFile("settings.gradle", """
                             rootProject.name = 'gradle-reference-registered-secondary-variant'
                             include 'producer', 'consumer'
                             }
                             """);
-                    BuildResult result = runner(":consumer:probe").build();
+                    if (targetGradleVersion().compareTo(org.gradle.util.GradleVersion.version("9.4.1")) < 0) {
+                        assertBuildFails("Cannot create variant 'js' after dependency configuration ':producer:browserElements' has been resolved",
+                                ":consumer:probe");
+                    } else {
+                        BuildResult result = runner(":consumer:probe").build();
-                    assertTrue(result.getOutput().contains("compileFiles=typesPackage"));
+                        assertTrue(result.getOutput().contains("compileFiles=typesPackage"));
-                    assertTrue(result.getOutput().contains("jsFiles=js"));
+                        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