From 6523a87c8f3facb13850bae9ddbf523bddf70ec6 Mon Sep 17 00:00:00 2001 From: daz Date: Fri, 12 Jan 2024 10:42:14 -0700 Subject: [PATCH] Update supported Gradle versions to match plugin --- ...gradle-build-action.github-dependency-graph.init.gradle | 6 ++++-- .../com/gradle/gradlebuildaction/BaseInitScriptTest.groovy | 1 + .../gradle/gradlebuildaction/TestDependencyGraph.groovy | 7 ++++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/resources/init-scripts/gradle-build-action.github-dependency-graph.init.gradle b/src/resources/init-scripts/gradle-build-action.github-dependency-graph.init.gradle index 56fd262..9131788 100644 --- a/src/resources/init-scripts/gradle-build-action.github-dependency-graph.init.gradle +++ b/src/resources/init-scripts/gradle-build-action.github-dependency-graph.init.gradle @@ -6,8 +6,10 @@ if (getVariable('GITHUB_DEPENDENCY_GRAPH_ENABLED') != "true") { } // Do not run for unsupported versions of Gradle -if (GradleVersion.current().baseVersion < GradleVersion.version("5.0")) { - println "::warning::Dependency Graph is not supported for Gradle versions < 5.0. No dependency snapshot will be generated." +def gradleVersion = GradleVersion.current().baseVersion +if (gradleVersion < GradleVersion.version("5.2") || + (gradleVersion >= GradleVersion.version("7.0") && gradleVersion < GradleVersion.version("7.1"))) { + println "::warning::Dependency Graph is not supported for ${gradleVersion}. No dependency snapshot will be generated." return } diff --git a/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/BaseInitScriptTest.groovy b/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/BaseInitScriptTest.groovy index a83bfe9..79512e4 100644 --- a/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/BaseInitScriptTest.groovy +++ b/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/BaseInitScriptTest.groovy @@ -24,6 +24,7 @@ class BaseInitScriptTest extends Specification { static final TestGradleVersion GRADLE_5_X = new TestGradleVersion(GradleVersion.version('5.6.4'), 8, 12) static final TestGradleVersion GRADLE_6_NO_BUILD_SERVICE = new TestGradleVersion(GradleVersion.version('6.5.1'), 8, 14) static final TestGradleVersion GRADLE_6_X = new TestGradleVersion(GradleVersion.version('6.9.4'), 8, 15) + static final TestGradleVersion GRADLE_7_1 = new TestGradleVersion(GradleVersion.version('7.6.2'), 8, 19) static final TestGradleVersion GRADLE_7_X = new TestGradleVersion(GradleVersion.version('7.6.2'), 8, 19) static final TestGradleVersion GRADLE_8_0 = new TestGradleVersion(GradleVersion.version('8.0.2'), 8, 19) static final TestGradleVersion GRADLE_8_X = new TestGradleVersion(GradleVersion.version('8.5'), 8, 19) diff --git a/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestDependencyGraph.groovy b/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestDependencyGraph.groovy index e823b84..7ad51b0 100644 --- a/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestDependencyGraph.groovy +++ b/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestDependencyGraph.groovy @@ -1,11 +1,16 @@ package com.gradle.gradlebuildaction +import org.gradle.util.GradleVersion + import static org.junit.Assume.assumeTrue class TestDependencyGraph extends BaseInitScriptTest { def initScript = 'gradle-build-action.github-dependency-graph.init.gradle' - static final List NO_DEPENDENCY_GRAPH_VERSIONS = [GRADLE_3_X, GRADLE_4_X] + static final TestGradleVersion GRADLE_5_1 = new TestGradleVersion(GradleVersion.version('5.1.1'), 8, 12) + static final TestGradleVersion GRADLE_7_0 = new TestGradleVersion(GradleVersion.version('7.0.1'), 8, 12) + + static final List NO_DEPENDENCY_GRAPH_VERSIONS = [GRADLE_3_X, GRADLE_4_X, GRADLE_5_1, GRADLE_7_0] static final List DEPENDENCY_GRAPH_VERSIONS = ALL_VERSIONS - NO_DEPENDENCY_GRAPH_VERSIONS def "does not produce dependency graph when not enabled"() {