From b9abb7b19598f538c0251832e1632b9b0abad7e4 Mon Sep 17 00:00:00 2001 From: Daz DeBoer Date: Thu, 27 Jun 2024 19:42:01 -0600 Subject: [PATCH] Use latest dependency graph plugin (#269) --- ...actions.github-dependency-graph-gradle-plugin-apply.groovy | 2 +- .../com/gradle/gradlebuildaction/BaseInitScriptTest.groovy | 2 +- .../com/gradle/gradlebuildaction/TestDependencyGraph.groovy | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sources/src/resources/init-scripts/gradle-actions.github-dependency-graph-gradle-plugin-apply.groovy b/sources/src/resources/init-scripts/gradle-actions.github-dependency-graph-gradle-plugin-apply.groovy index ce1c3ac..268333e 100644 --- a/sources/src/resources/init-scripts/gradle-actions.github-dependency-graph-gradle-plugin-apply.groovy +++ b/sources/src/resources/init-scripts/gradle-actions.github-dependency-graph-gradle-plugin-apply.groovy @@ -6,7 +6,7 @@ buildscript { def pluginRepositoryUrl = getInputParam('gradle.plugin-repository.url') ?: 'https://plugins.gradle.org/m2' def pluginRepositoryUsername = getInputParam('gradle.plugin-repository.username') def pluginRepositoryPassword = getInputParam('gradle.plugin-repository.password') - def dependencyGraphPluginVersion = getInputParam('dependency-graph-plugin.version') ?: '1.3.0' + def dependencyGraphPluginVersion = getInputParam('dependency-graph-plugin.version') ?: '1.3.1' logger.lifecycle("Resolving dependency graph plugin ${dependencyGraphPluginVersion} from plugin repository: ${pluginRepositoryUrl}") repositories { diff --git a/sources/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/BaseInitScriptTest.groovy b/sources/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/BaseInitScriptTest.groovy index 3e27eae..92524c6 100644 --- a/sources/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/BaseInitScriptTest.groovy +++ b/sources/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/BaseInitScriptTest.groovy @@ -27,7 +27,7 @@ class BaseInitScriptTest extends Specification { 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) + static final TestGradleVersion GRADLE_8_X = new TestGradleVersion(GradleVersion.version('8.8'), 8, 22) static final List ALL_VERSIONS = [ GRADLE_3_X, // First version where TestKit supports environment variables diff --git a/sources/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestDependencyGraph.groovy b/sources/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestDependencyGraph.groovy index 5338400..b8181ac 100644 --- a/sources/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestDependencyGraph.groovy +++ b/sources/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestDependencyGraph.groovy @@ -146,7 +146,7 @@ class TestDependencyGraph extends BaseInitScriptTest { then: assert reportFile.exists() - assert result.output.contains("Resolving dependency graph plugin 1.3.0 from plugin repository: https://plugins.grdev.net/m2") + assert result.output.find("Resolving dependency graph plugin [\\d\\.]+ from plugin repository: https://plugins.grdev.net/m2") where: testGradleVersion << DEPENDENCY_GRAPH_VERSIONS @@ -170,7 +170,7 @@ class TestDependencyGraph extends BaseInitScriptTest { then: assert reportFile.exists() - assert result.output.contains("Resolving dependency graph plugin 1.3.0 from plugin repository: https://plugins.grdev.net/m2") + assert result.output.find("Resolving dependency graph plugin [\\d\\.]+ from plugin repository: https://plugins.grdev.net/m2") assert result.output.contains("Applying credentials for plugin repository: https://plugins.grdev.net/m2") where: