diff --git a/sources/src/configuration.ts b/sources/src/configuration.ts index a99689dc..ca807d50 100644 --- a/sources/src/configuration.ts +++ b/sources/src/configuration.ts @@ -71,6 +71,10 @@ export class DependencyGraphConfig { return getOptionalInput('dependency-graph-include-configurations') } + getPluginRepository(): PluginRepositoryConfig { + return new PluginRepositoryConfig() + } + static constructJobCorrelator(workflow: string, jobId: string, matrixJson: string): string { const matrixString = this.describeMatrix(matrixJson) const label = matrixString ? `${workflow}-${jobId}-${matrixString}` : `${workflow}-${jobId}` @@ -301,16 +305,8 @@ export class BuildScanConfig { return core.getInput('develocity-ccud-plugin-version') } - getGradlePluginRepositoryUrl(): string { - return core.getInput('gradle-plugin-repository-url') - } - - getGradlePluginRepositoryUsername(): string { - return core.getInput('gradle-plugin-repository-username') - } - - getGradlePluginRepositoryPassword(): string { - return core.getInput('gradle-plugin-repository-password') + getPluginRepository(): PluginRepositoryConfig { + return new PluginRepositoryConfig() } private verifyTermsOfUseAgreement(): boolean { @@ -328,6 +324,20 @@ export class BuildScanConfig { } } +export class PluginRepositoryConfig { + getUrl(): string | undefined { + return getOptionalInput('gradle-plugin-repository-url') + } + + getUsername(): string | undefined { + return getOptionalInput('gradle-plugin-repository-username') + } + + getPassword(): string | undefined { + return getOptionalInput('gradle-plugin-repository-password') + } +} + export class GradleExecutionConfig { getGradleVersion(): string { return core.getInput('gradle-version') diff --git a/sources/src/dependency-graph.ts b/sources/src/dependency-graph.ts index 464f186c..19581d94 100644 --- a/sources/src/dependency-graph.ts +++ b/sources/src/dependency-graph.ts @@ -40,6 +40,10 @@ export async function setup(config: DependencyGraphConfig): Promise { maybeExportVariable('DEPENDENCY_GRAPH_INCLUDE_PROJECTS', config.getIncludeProjects()) maybeExportVariable('DEPENDENCY_GRAPH_EXCLUDE_CONFIGURATIONS', config.getExcludeConfigurations()) maybeExportVariable('DEPENDENCY_GRAPH_INCLUDE_CONFIGURATIONS', config.getIncludeConfigurations()) + + maybeExportVariable('GRADLE_PLUGIN_REPOSITORY_URL', config.getPluginRepository().getUrl()) + maybeExportVariable('GRADLE_PLUGIN_REPOSITORY_USERNAME', config.getPluginRepository().getUsername()) + maybeExportVariable('GRADLE_PLUGIN_REPOSITORY_PASSWORD', config.getPluginRepository().getPassword()) } function maybeExportVariable(variableName: string, value: string | boolean | undefined): void { diff --git a/sources/src/develocity/build-scan.ts b/sources/src/develocity/build-scan.ts index 0640f465..da9f124f 100644 --- a/sources/src/develocity/build-scan.ts +++ b/sources/src/develocity/build-scan.ts @@ -19,14 +19,14 @@ export async function setup(config: BuildScanConfig): Promise { maybeExportVariableNotEmpty('DEVELOCITY_INJECTION_ENFORCE_URL', config.getDevelocityEnforceUrl()) maybeExportVariableNotEmpty('DEVELOCITY_INJECTION_DEVELOCITY_PLUGIN_VERSION', config.getDevelocityPluginVersion()) maybeExportVariableNotEmpty('DEVELOCITY_INJECTION_CCUD_PLUGIN_VERSION', config.getDevelocityCcudPluginVersion()) - maybeExportVariableNotEmpty('DEVELOCITY_INJECTION__PLUGIN_REPOSITORY_URL', config.getGradlePluginRepositoryUrl()) + maybeExportVariableNotEmpty('DEVELOCITY_INJECTION_PLUGIN_REPOSITORY_URL', config.getPluginRepository().getUrl()) maybeExportVariableNotEmpty( - 'DEVELOCITY_INJECTION__PLUGIN_REPOSITORY_USERNAME', - config.getGradlePluginRepositoryUsername() + 'DEVELOCITY_INJECTION_PLUGIN_REPOSITORY_USERNAME', + config.getPluginRepository().getUsername() ) maybeExportVariableNotEmpty( - 'DEVELOCITY_INJECTION__PLUGIN_REPOSITORY_PASSWORD', - config.getGradlePluginRepositoryPassword() + 'DEVELOCITY_INJECTION_PLUGIN_REPOSITORY_PASSWORD', + config.getPluginRepository().getPassword() ) // If build-scan-publish is enabled, ensure the environment variables are set