gradle/actions
1
0
Fork 0
mirror of https://github.com/gradle/actions.git synced 2025-04-20 09:49:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove deprecation warning from init-script (#491)

Browse Source
This commit is contained in:
Daz DeBoer 2024-12-17 17:59:42 -07:00 committed by GitHub
parent 4213e7826a
commit 5c7e362ae3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sources/src/resources/init-scripts/gradle-actions.github-dependency-graph-gradle-plugin-apply.groovy
View File

@ -11,7 +11,7 @@ buildscript {
logger.lifecycle("Resolving dependency graph plugin ${dependencyGraphPluginVersion} from plugin repository: ${pluginRepositoryUrl}") logger.lifecycle("Resolving dependency graph plugin ${dependencyGraphPluginVersion} from plugin repository: ${pluginRepositoryUrl}")
repositories { repositories {
maven { maven {
url pluginRepositoryUrl url = pluginRepositoryUrl
if (pluginRepositoryUsername && pluginRepositoryPassword) { if (pluginRepositoryUsername && pluginRepositoryPassword) {
logger.lifecycle("Applying credentials for plugin repository: ${pluginRepositoryUrl}") logger.lifecycle("Applying credentials for plugin repository: ${pluginRepositoryUrl}")
credentials { credentials {

11
sources/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestDependencyGraph.groovy
View File

@ -141,7 +141,7 @@ class TestDependencyGraph extends BaseInitScriptTest {
// TODO:DAZ This props are set too late to control init-script plugin resolution // TODO:DAZ This props are set too late to control init-script plugin resolution
// This makes the tests fail on Mac with Gradle < 6 // This makes the tests fail on Mac with Gradle < 6
def args = jvmArgs def args = jvmArgs
args.add('-DGRADLE_PLUGIN_REPOSITORY_URL=https://plugins.grdev.net/m2') args.add('-Dgradle.plugin-repository.url=https://plugins.grdev.net/m2')
def result = run(['help', '--info'], initScript, testGradleVersion.gradleVersion, args, vars) def result = run(['help', '--info'], initScript, testGradleVersion.gradleVersion, args, vars)
then: then:
@ -160,12 +160,11 @@ class TestDependencyGraph extends BaseInitScriptTest {
vars.put('GRADLE_PLUGIN_REPOSITORY_URL', 'https://plugins.grdev.net/m2') vars.put('GRADLE_PLUGIN_REPOSITORY_URL', 'https://plugins.grdev.net/m2')
vars.put('GRADLE_PLUGIN_REPOSITORY_USERNAME', 'REPO_USER') vars.put('GRADLE_PLUGIN_REPOSITORY_USERNAME', 'REPO_USER')
vars.put('GRADLE_PLUGIN_REPOSITORY_PASSWORD', 'REPO_PASSWORD') vars.put('GRADLE_PLUGIN_REPOSITORY_PASSWORD', 'REPO_PASSWORD')
// TODO:DAZ This props are set too late to control init-script plugin resolution
// This makes the tests fail on Mac with Gradle < 6
def args = jvmArgs def args = jvmArgs
args.add('-DGRADLE_PLUGIN_REPOSITORY_URL=https://plugins.grdev.net/m2') args.add('-Dgradle.plugin-repository.url=https://plugins.grdev.net/m2')
args.add('-DGRADLE_PLUGIN_REPOSITORY_USERNAME=REPO_USER') args.add('-Dgradle.plugin-repository.username=REPO_USER')
args.add('-DGRADLE_PLUGIN_REPOSITORY_PASSWORD=REPO_PASSWORD') args.add('-Dgradle.plugin-repository.password=REPO_PASSWORD')
def result = run(['help', '--info'], initScript, testGradleVersion.gradleVersion, args, vars) def result = run(['help', '--info'], initScript, testGradleVersion.gradleVersion, args, vars)
then: then: