Skip to content

Commit 075ffd7

Browse files
authored
Merge pull request #111 from gradlex-org/gradle-version-compatibility
Fix compatibility with older Gradle versions
2 parents 522eb7e + c6cbb1e commit 075ffd7

File tree

4 files changed

+25
-3
lines changed

4 files changed

+25
-3
lines changed

build.gradle.kts

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,3 +63,24 @@ tasks.test {
6363
maxParallelForks = 4
6464
inputs.dir(layout.projectDirectory.dir("samples"))
6565
}
66+
67+
testing.suites.named<JvmTestSuite>("test") {
68+
useJUnitJupiter()
69+
listOf("7.4", "7.6.4", "8.0.2").forEach { gradleVersionUnderTest ->
70+
targets.register("test${gradleVersionUnderTest}") {
71+
testTask {
72+
group = LifecycleBasePlugin.VERIFICATION_GROUP
73+
description = "Runs tests against Gradle $gradleVersionUnderTest"
74+
systemProperty("gradleVersionUnderTest", gradleVersionUnderTest)
75+
exclude("**/*SamplesTest.class") // Not yet cross-version ready
76+
}
77+
}
78+
}
79+
targets.all {
80+
testTask {
81+
maxParallelForks = 4
82+
inputs.dir(layout.projectDirectory.dir("samples"))
83+
inputs.dir("samples")
84+
}
85+
}
86+
}

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
# Darwin, MinGW, and NonStop.
5656
#
5757
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
58+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5959
# within the Gradle project.
6060
#
6161
# You can find Gradle at https://github.com/gradle/gradle/.

src/main/java/org/gradlex/javamodule/dependencies/tasks/ModuleDependencyReport.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.gradlex.javamodule.dependencies.internal.diagnostics.AsciiModuleDependencyReportRenderer;
2929

3030
import javax.inject.Inject;
31+
import java.util.Collections;
3132
import java.util.Set;
3233

3334
@NonNullApi
@@ -64,7 +65,7 @@ public void setConfigurations(Set<Configuration> configurations) {
6465

6566
private void configurationsChanged() {
6667
getModulePath().setFrom();
67-
getModuleArtifacts().unset();
68+
getModuleArtifacts().set(Collections.emptyMap());
6869
for (Configuration conf : getConfigurations()) {
6970
getModulePath().from(conf);
7071
getModuleArtifacts().put(conf.getName(), getProviders().provider(() -> conf.getIncoming().getArtifacts()));

0 commit comments

Comments
 (0)