[bot] Update dist directory
Some checks are pending
CI-integ-test / build-scan-publish (push) Blocked by required conditions
CI-integ-test / cache-cleanup (push) Blocked by required conditions
CI-integ-test / caching-config (push) Blocked by required conditions
CI-integ-test / dependency-graph (push) Blocked by required conditions
CI-update-dist / update-dist (push) Waiting to run
CI-check-and-unit-test / check-format-and-unit-test (push) Waiting to run
CI-codeql / Analyze (javascript-typescript) (push) Waiting to run
CI-init-script-check / test-init-scripts (push) Waiting to run
CI-integ-test / dependency-submission (push) Blocked by required conditions
CI-integ-test / dependency-submission-failures (push) Blocked by required conditions
CI-integ-test / develocity-injection (push) Blocked by required conditions
CI-integ-test / provision-gradle-versions (push) Blocked by required conditions
CI-integ-test / restore-configuration-cache (push) Blocked by required conditions
CI-integ-test / restore-containerized-gradle-home (push) Blocked by required conditions
CI-integ-test / restore-custom-gradle-home (push) Blocked by required conditions
CI-integ-test / restore-gradle-home (push) Blocked by required conditions
CI-integ-test / restore-java-toolchain (push) Blocked by required conditions
CI-integ-test / sample-kotlin-dsl (push) Blocked by required conditions
CI-integ-test / sample-gradle-plugin (push) Blocked by required conditions
CI-integ-test / toolchain-detection (push) Blocked by required conditions
CI-integ-test / wrapper-validation (push) Blocked by required conditions
CI-integ-test / determine-suite (push) Waiting to run
CI-integ-test / build-distribution (push) Blocked by required conditions

This commit is contained in:
bigdaz 2024-08-02 21:57:19 +00:00 committed by github-actions[bot]
parent 07190022f8
commit fb2e6938b6
10 changed files with 36 additions and 74 deletions

View file

@ -157632,12 +157632,9 @@ const find = __importStar(__nccwpck_require__(849));
const checksums = __importStar(__nccwpck_require__(50907)); const checksums = __importStar(__nccwpck_require__(50907));
const hash = __importStar(__nccwpck_require__(60079)); const hash = __importStar(__nccwpck_require__(60079));
const path_1 = __nccwpck_require__(71017); const path_1 = __nccwpck_require__(71017);
async function findInvalidWrapperJars(gitRepoRoot, minWrapperCount, allowSnapshots, allowedChecksums, previouslyValidatedChecksums = [], knownValidChecksums = checksums.KNOWN_CHECKSUMS) { async function findInvalidWrapperJars(gitRepoRoot, allowSnapshots, allowedChecksums, previouslyValidatedChecksums = [], knownValidChecksums = checksums.KNOWN_CHECKSUMS) {
const wrapperJars = await find.findWrapperJars(gitRepoRoot); const wrapperJars = await find.findWrapperJars(gitRepoRoot);
const result = new ValidationResult([], []); const result = new ValidationResult([], []);
if (wrapperJars.length < minWrapperCount) {
result.errors.push(`Expected to find at least ${minWrapperCount} Gradle Wrapper JARs but got only ${wrapperJars.length}`);
}
if (wrapperJars.length > 0) { if (wrapperJars.length > 0) {
const notYetValidatedWrappers = []; const notYetValidatedWrappers = [];
for (const wrapperJar of wrapperJars) { for (const wrapperJar of wrapperJars) {
@ -157670,23 +157667,17 @@ exports.findInvalidWrapperJars = findInvalidWrapperJars;
class ValidationResult { class ValidationResult {
constructor(valid, invalid) { constructor(valid, invalid) {
this.fetchedChecksums = false; this.fetchedChecksums = false;
this.errors = [];
this.valid = valid; this.valid = valid;
this.invalid = invalid; this.invalid = invalid;
} }
isValid() { isValid() {
return this.invalid.length === 0 && this.errors.length === 0; return this.invalid.length === 0;
} }
toDisplayString() { toDisplayString() {
let displayString = ''; let displayString = '';
if (this.invalid.length > 0) { if (this.invalid.length > 0) {
displayString += `✗ Found unknown Gradle Wrapper JAR files:\n${ValidationResult.toDisplayList(this.invalid)}`; displayString += `✗ Found unknown Gradle Wrapper JAR files:\n${ValidationResult.toDisplayList(this.invalid)}`;
} }
if (this.errors.length > 0) {
if (displayString.length > 0)
displayString += '\n';
displayString += `✗ Other validation errors:\n ${this.errors.join(`\n `)}`;
}
if (this.valid.length > 0) { if (this.valid.length > 0) {
if (displayString.length > 0) if (displayString.length > 0)
displayString += '\n'; displayString += '\n';
@ -157754,16 +157745,16 @@ async function validateWrappers(config, workspaceRoot, gradleUserHome) {
const checksumCache = new cache_1.ChecksumCache(gradleUserHome); const checksumCache = new cache_1.ChecksumCache(gradleUserHome);
const allowedChecksums = process.env['ALLOWED_GRADLE_WRAPPER_CHECKSUMS']?.split(',') || []; const allowedChecksums = process.env['ALLOWED_GRADLE_WRAPPER_CHECKSUMS']?.split(',') || [];
const previouslyValidatedChecksums = checksumCache.load(); const previouslyValidatedChecksums = checksumCache.load();
const result = await (0, validate_1.findInvalidWrapperJars)(workspaceRoot, 0, config.allowSnapshotWrappers(), allowedChecksums, previouslyValidatedChecksums); const result = await (0, validate_1.findInvalidWrapperJars)(workspaceRoot, config.allowSnapshotWrappers(), allowedChecksums, previouslyValidatedChecksums);
if (result.isValid()) { if (result.isValid()) {
await core.group('All Gradle Wrapper jars are valid', async () => { await core.group('All Gradle Wrapper jars are valid', async () => {
core.info(`Loaded previously validated checksums from cache: ${previouslyValidatedChecksums.join(', ')}`); core.debug(`Loaded previously validated checksums from cache: ${previouslyValidatedChecksums.join(', ')}`);
core.info(result.toDisplayString()); core.info(result.toDisplayString());
}); });
} }
else { else {
core.info(result.toDisplayString()); core.info(result.toDisplayString());
throw new errors_1.JobFailure(`Gradle Wrapper Validation Failed!\n See https://github.com/gradle/actions/blob/main/docs/wrapper-validation.md#validation-failures\n${result.toDisplayString()}`); throw new errors_1.JobFailure(`At least one Gradle Wrapper Jar failed validation!\n See https://github.com/gradle/actions/blob/main/docs/wrapper-validation.md#validation-failures\n${result.toDisplayString()}`);
} }
checksumCache.save(result.valid.map(wrapper => wrapper.checksum)); checksumCache.save(result.valid.map(wrapper => wrapper.checksum));
} }

File diff suppressed because one or more lines are too long

View file

@ -111256,12 +111256,9 @@ const find = __importStar(__nccwpck_require__(849));
const checksums = __importStar(__nccwpck_require__(50907)); const checksums = __importStar(__nccwpck_require__(50907));
const hash = __importStar(__nccwpck_require__(60079)); const hash = __importStar(__nccwpck_require__(60079));
const path_1 = __nccwpck_require__(71017); const path_1 = __nccwpck_require__(71017);
async function findInvalidWrapperJars(gitRepoRoot, minWrapperCount, allowSnapshots, allowedChecksums, previouslyValidatedChecksums = [], knownValidChecksums = checksums.KNOWN_CHECKSUMS) { async function findInvalidWrapperJars(gitRepoRoot, allowSnapshots, allowedChecksums, previouslyValidatedChecksums = [], knownValidChecksums = checksums.KNOWN_CHECKSUMS) {
const wrapperJars = await find.findWrapperJars(gitRepoRoot); const wrapperJars = await find.findWrapperJars(gitRepoRoot);
const result = new ValidationResult([], []); const result = new ValidationResult([], []);
if (wrapperJars.length < minWrapperCount) {
result.errors.push(`Expected to find at least ${minWrapperCount} Gradle Wrapper JARs but got only ${wrapperJars.length}`);
}
if (wrapperJars.length > 0) { if (wrapperJars.length > 0) {
const notYetValidatedWrappers = []; const notYetValidatedWrappers = [];
for (const wrapperJar of wrapperJars) { for (const wrapperJar of wrapperJars) {
@ -111294,23 +111291,17 @@ exports.findInvalidWrapperJars = findInvalidWrapperJars;
class ValidationResult { class ValidationResult {
constructor(valid, invalid) { constructor(valid, invalid) {
this.fetchedChecksums = false; this.fetchedChecksums = false;
this.errors = [];
this.valid = valid; this.valid = valid;
this.invalid = invalid; this.invalid = invalid;
} }
isValid() { isValid() {
return this.invalid.length === 0 && this.errors.length === 0; return this.invalid.length === 0;
} }
toDisplayString() { toDisplayString() {
let displayString = ''; let displayString = '';
if (this.invalid.length > 0) { if (this.invalid.length > 0) {
displayString += `✗ Found unknown Gradle Wrapper JAR files:\n${ValidationResult.toDisplayList(this.invalid)}`; displayString += `✗ Found unknown Gradle Wrapper JAR files:\n${ValidationResult.toDisplayList(this.invalid)}`;
} }
if (this.errors.length > 0) {
if (displayString.length > 0)
displayString += '\n';
displayString += `✗ Other validation errors:\n ${this.errors.join(`\n `)}`;
}
if (this.valid.length > 0) { if (this.valid.length > 0) {
if (displayString.length > 0) if (displayString.length > 0)
displayString += '\n'; displayString += '\n';
@ -111378,16 +111369,16 @@ async function validateWrappers(config, workspaceRoot, gradleUserHome) {
const checksumCache = new cache_1.ChecksumCache(gradleUserHome); const checksumCache = new cache_1.ChecksumCache(gradleUserHome);
const allowedChecksums = process.env['ALLOWED_GRADLE_WRAPPER_CHECKSUMS']?.split(',') || []; const allowedChecksums = process.env['ALLOWED_GRADLE_WRAPPER_CHECKSUMS']?.split(',') || [];
const previouslyValidatedChecksums = checksumCache.load(); const previouslyValidatedChecksums = checksumCache.load();
const result = await (0, validate_1.findInvalidWrapperJars)(workspaceRoot, 0, config.allowSnapshotWrappers(), allowedChecksums, previouslyValidatedChecksums); const result = await (0, validate_1.findInvalidWrapperJars)(workspaceRoot, config.allowSnapshotWrappers(), allowedChecksums, previouslyValidatedChecksums);
if (result.isValid()) { if (result.isValid()) {
await core.group('All Gradle Wrapper jars are valid', async () => { await core.group('All Gradle Wrapper jars are valid', async () => {
core.info(`Loaded previously validated checksums from cache: ${previouslyValidatedChecksums.join(', ')}`); core.debug(`Loaded previously validated checksums from cache: ${previouslyValidatedChecksums.join(', ')}`);
core.info(result.toDisplayString()); core.info(result.toDisplayString());
}); });
} }
else { else {
core.info(result.toDisplayString()); core.info(result.toDisplayString());
throw new errors_1.JobFailure(`Gradle Wrapper Validation Failed!\n See https://github.com/gradle/actions/blob/main/docs/wrapper-validation.md#validation-failures\n${result.toDisplayString()}`); throw new errors_1.JobFailure(`At least one Gradle Wrapper Jar failed validation!\n See https://github.com/gradle/actions/blob/main/docs/wrapper-validation.md#validation-failures\n${result.toDisplayString()}`);
} }
checksumCache.save(result.valid.map(wrapper => wrapper.checksum)); checksumCache.save(result.valid.map(wrapper => wrapper.checksum));
} }

File diff suppressed because one or more lines are too long

View file

@ -157562,12 +157562,9 @@ const find = __importStar(__nccwpck_require__(849));
const checksums = __importStar(__nccwpck_require__(50907)); const checksums = __importStar(__nccwpck_require__(50907));
const hash = __importStar(__nccwpck_require__(60079)); const hash = __importStar(__nccwpck_require__(60079));
const path_1 = __nccwpck_require__(71017); const path_1 = __nccwpck_require__(71017);
async function findInvalidWrapperJars(gitRepoRoot, minWrapperCount, allowSnapshots, allowedChecksums, previouslyValidatedChecksums = [], knownValidChecksums = checksums.KNOWN_CHECKSUMS) { async function findInvalidWrapperJars(gitRepoRoot, allowSnapshots, allowedChecksums, previouslyValidatedChecksums = [], knownValidChecksums = checksums.KNOWN_CHECKSUMS) {
const wrapperJars = await find.findWrapperJars(gitRepoRoot); const wrapperJars = await find.findWrapperJars(gitRepoRoot);
const result = new ValidationResult([], []); const result = new ValidationResult([], []);
if (wrapperJars.length < minWrapperCount) {
result.errors.push(`Expected to find at least ${minWrapperCount} Gradle Wrapper JARs but got only ${wrapperJars.length}`);
}
if (wrapperJars.length > 0) { if (wrapperJars.length > 0) {
const notYetValidatedWrappers = []; const notYetValidatedWrappers = [];
for (const wrapperJar of wrapperJars) { for (const wrapperJar of wrapperJars) {
@ -157600,23 +157597,17 @@ exports.findInvalidWrapperJars = findInvalidWrapperJars;
class ValidationResult { class ValidationResult {
constructor(valid, invalid) { constructor(valid, invalid) {
this.fetchedChecksums = false; this.fetchedChecksums = false;
this.errors = [];
this.valid = valid; this.valid = valid;
this.invalid = invalid; this.invalid = invalid;
} }
isValid() { isValid() {
return this.invalid.length === 0 && this.errors.length === 0; return this.invalid.length === 0;
} }
toDisplayString() { toDisplayString() {
let displayString = ''; let displayString = '';
if (this.invalid.length > 0) { if (this.invalid.length > 0) {
displayString += `✗ Found unknown Gradle Wrapper JAR files:\n${ValidationResult.toDisplayList(this.invalid)}`; displayString += `✗ Found unknown Gradle Wrapper JAR files:\n${ValidationResult.toDisplayList(this.invalid)}`;
} }
if (this.errors.length > 0) {
if (displayString.length > 0)
displayString += '\n';
displayString += `✗ Other validation errors:\n ${this.errors.join(`\n `)}`;
}
if (this.valid.length > 0) { if (this.valid.length > 0) {
if (displayString.length > 0) if (displayString.length > 0)
displayString += '\n'; displayString += '\n';
@ -157684,16 +157675,16 @@ async function validateWrappers(config, workspaceRoot, gradleUserHome) {
const checksumCache = new cache_1.ChecksumCache(gradleUserHome); const checksumCache = new cache_1.ChecksumCache(gradleUserHome);
const allowedChecksums = process.env['ALLOWED_GRADLE_WRAPPER_CHECKSUMS']?.split(',') || []; const allowedChecksums = process.env['ALLOWED_GRADLE_WRAPPER_CHECKSUMS']?.split(',') || [];
const previouslyValidatedChecksums = checksumCache.load(); const previouslyValidatedChecksums = checksumCache.load();
const result = await (0, validate_1.findInvalidWrapperJars)(workspaceRoot, 0, config.allowSnapshotWrappers(), allowedChecksums, previouslyValidatedChecksums); const result = await (0, validate_1.findInvalidWrapperJars)(workspaceRoot, config.allowSnapshotWrappers(), allowedChecksums, previouslyValidatedChecksums);
if (result.isValid()) { if (result.isValid()) {
await core.group('All Gradle Wrapper jars are valid', async () => { await core.group('All Gradle Wrapper jars are valid', async () => {
core.info(`Loaded previously validated checksums from cache: ${previouslyValidatedChecksums.join(', ')}`); core.debug(`Loaded previously validated checksums from cache: ${previouslyValidatedChecksums.join(', ')}`);
core.info(result.toDisplayString()); core.info(result.toDisplayString());
}); });
} }
else { else {
core.info(result.toDisplayString()); core.info(result.toDisplayString());
throw new errors_1.JobFailure(`Gradle Wrapper Validation Failed!\n See https://github.com/gradle/actions/blob/main/docs/wrapper-validation.md#validation-failures\n${result.toDisplayString()}`); throw new errors_1.JobFailure(`At least one Gradle Wrapper Jar failed validation!\n See https://github.com/gradle/actions/blob/main/docs/wrapper-validation.md#validation-failures\n${result.toDisplayString()}`);
} }
checksumCache.save(result.valid.map(wrapper => wrapper.checksum)); checksumCache.save(result.valid.map(wrapper => wrapper.checksum));
} }

File diff suppressed because one or more lines are too long

View file

@ -157557,12 +157557,9 @@ const find = __importStar(__nccwpck_require__(849));
const checksums = __importStar(__nccwpck_require__(50907)); const checksums = __importStar(__nccwpck_require__(50907));
const hash = __importStar(__nccwpck_require__(60079)); const hash = __importStar(__nccwpck_require__(60079));
const path_1 = __nccwpck_require__(71017); const path_1 = __nccwpck_require__(71017);
async function findInvalidWrapperJars(gitRepoRoot, minWrapperCount, allowSnapshots, allowedChecksums, previouslyValidatedChecksums = [], knownValidChecksums = checksums.KNOWN_CHECKSUMS) { async function findInvalidWrapperJars(gitRepoRoot, allowSnapshots, allowedChecksums, previouslyValidatedChecksums = [], knownValidChecksums = checksums.KNOWN_CHECKSUMS) {
const wrapperJars = await find.findWrapperJars(gitRepoRoot); const wrapperJars = await find.findWrapperJars(gitRepoRoot);
const result = new ValidationResult([], []); const result = new ValidationResult([], []);
if (wrapperJars.length < minWrapperCount) {
result.errors.push(`Expected to find at least ${minWrapperCount} Gradle Wrapper JARs but got only ${wrapperJars.length}`);
}
if (wrapperJars.length > 0) { if (wrapperJars.length > 0) {
const notYetValidatedWrappers = []; const notYetValidatedWrappers = [];
for (const wrapperJar of wrapperJars) { for (const wrapperJar of wrapperJars) {
@ -157595,23 +157592,17 @@ exports.findInvalidWrapperJars = findInvalidWrapperJars;
class ValidationResult { class ValidationResult {
constructor(valid, invalid) { constructor(valid, invalid) {
this.fetchedChecksums = false; this.fetchedChecksums = false;
this.errors = [];
this.valid = valid; this.valid = valid;
this.invalid = invalid; this.invalid = invalid;
} }
isValid() { isValid() {
return this.invalid.length === 0 && this.errors.length === 0; return this.invalid.length === 0;
} }
toDisplayString() { toDisplayString() {
let displayString = ''; let displayString = '';
if (this.invalid.length > 0) { if (this.invalid.length > 0) {
displayString += `✗ Found unknown Gradle Wrapper JAR files:\n${ValidationResult.toDisplayList(this.invalid)}`; displayString += `✗ Found unknown Gradle Wrapper JAR files:\n${ValidationResult.toDisplayList(this.invalid)}`;
} }
if (this.errors.length > 0) {
if (displayString.length > 0)
displayString += '\n';
displayString += `✗ Other validation errors:\n ${this.errors.join(`\n `)}`;
}
if (this.valid.length > 0) { if (this.valid.length > 0) {
if (displayString.length > 0) if (displayString.length > 0)
displayString += '\n'; displayString += '\n';
@ -157679,16 +157670,16 @@ async function validateWrappers(config, workspaceRoot, gradleUserHome) {
const checksumCache = new cache_1.ChecksumCache(gradleUserHome); const checksumCache = new cache_1.ChecksumCache(gradleUserHome);
const allowedChecksums = process.env['ALLOWED_GRADLE_WRAPPER_CHECKSUMS']?.split(',') || []; const allowedChecksums = process.env['ALLOWED_GRADLE_WRAPPER_CHECKSUMS']?.split(',') || [];
const previouslyValidatedChecksums = checksumCache.load(); const previouslyValidatedChecksums = checksumCache.load();
const result = await (0, validate_1.findInvalidWrapperJars)(workspaceRoot, 0, config.allowSnapshotWrappers(), allowedChecksums, previouslyValidatedChecksums); const result = await (0, validate_1.findInvalidWrapperJars)(workspaceRoot, config.allowSnapshotWrappers(), allowedChecksums, previouslyValidatedChecksums);
if (result.isValid()) { if (result.isValid()) {
await core.group('All Gradle Wrapper jars are valid', async () => { await core.group('All Gradle Wrapper jars are valid', async () => {
core.info(`Loaded previously validated checksums from cache: ${previouslyValidatedChecksums.join(', ')}`); core.debug(`Loaded previously validated checksums from cache: ${previouslyValidatedChecksums.join(', ')}`);
core.info(result.toDisplayString()); core.info(result.toDisplayString());
}); });
} }
else { else {
core.info(result.toDisplayString()); core.info(result.toDisplayString());
throw new errors_1.JobFailure(`Gradle Wrapper Validation Failed!\n See https://github.com/gradle/actions/blob/main/docs/wrapper-validation.md#validation-failures\n${result.toDisplayString()}`); throw new errors_1.JobFailure(`At least one Gradle Wrapper Jar failed validation!\n See https://github.com/gradle/actions/blob/main/docs/wrapper-validation.md#validation-failures\n${result.toDisplayString()}`);
} }
checksumCache.save(result.valid.map(wrapper => wrapper.checksum)); checksumCache.save(result.valid.map(wrapper => wrapper.checksum));
} }

File diff suppressed because one or more lines are too long

View file

@ -100928,12 +100928,19 @@ async function run() {
(0, deprecation_collector_1.failOnUseOfRemovedFeature)('The action `gradle/wrapper-validation-action` has been replaced by `gradle/actions/wrapper-validation`'); (0, deprecation_collector_1.failOnUseOfRemovedFeature)('The action `gradle/wrapper-validation-action` has been replaced by `gradle/actions/wrapper-validation`');
} }
(0, configuration_1.setActionId)('gradle/actions/wrapper-validation'); (0, configuration_1.setActionId)('gradle/actions/wrapper-validation');
const result = await validate.findInvalidWrapperJars(path.resolve('.'), +core.getInput('min-wrapper-count'), core.getInput('allow-snapshots') === 'true', core.getInput('allow-checksums').split(',')); const result = await validate.findInvalidWrapperJars(path.resolve('.'), core.getInput('allow-snapshots') === 'true', core.getInput('allow-checksums').split(','));
if (result.isValid()) { if (result.isValid()) {
core.info(result.toDisplayString()); core.info(result.toDisplayString());
const minWrapperCount = +core.getInput('min-wrapper-count');
if (result.valid.length < minWrapperCount) {
const message = result.valid.length === 0
? 'Wrapper validation failed: no Gradle Wrapper jars found. Did you forget to checkout the repository?'
: `Wrapper validation failed: expected at least ${minWrapperCount} Gradle Wrapper jars, but found ${result.valid.length}.`;
core.setFailed(message);
}
} }
else { else {
core.setFailed(`Gradle Wrapper Validation Failed!\n See https://github.com/gradle/actions/blob/main/docs/wrapper-validation.md#reporting-failures\n${result.toDisplayString()}`); core.setFailed(`At least one Gradle Wrapper Jar failed validation!\n See https://github.com/gradle/actions/blob/main/docs/wrapper-validation.md#validation-failures\n${result.toDisplayString()}`);
if (result.invalid.length > 0) { if (result.invalid.length > 0) {
core.setOutput('failed-wrapper', `${result.invalid.map(w => w.path).join('|')}`); core.setOutput('failed-wrapper', `${result.invalid.map(w => w.path).join('|')}`);
} }
@ -101770,12 +101777,9 @@ const find = __importStar(__nccwpck_require__(849));
const checksums = __importStar(__nccwpck_require__(907)); const checksums = __importStar(__nccwpck_require__(907));
const hash = __importStar(__nccwpck_require__(79)); const hash = __importStar(__nccwpck_require__(79));
const path_1 = __nccwpck_require__(1017); const path_1 = __nccwpck_require__(1017);
async function findInvalidWrapperJars(gitRepoRoot, minWrapperCount, allowSnapshots, allowedChecksums, previouslyValidatedChecksums = [], knownValidChecksums = checksums.KNOWN_CHECKSUMS) { async function findInvalidWrapperJars(gitRepoRoot, allowSnapshots, allowedChecksums, previouslyValidatedChecksums = [], knownValidChecksums = checksums.KNOWN_CHECKSUMS) {
const wrapperJars = await find.findWrapperJars(gitRepoRoot); const wrapperJars = await find.findWrapperJars(gitRepoRoot);
const result = new ValidationResult([], []); const result = new ValidationResult([], []);
if (wrapperJars.length < minWrapperCount) {
result.errors.push(`Expected to find at least ${minWrapperCount} Gradle Wrapper JARs but got only ${wrapperJars.length}`);
}
if (wrapperJars.length > 0) { if (wrapperJars.length > 0) {
const notYetValidatedWrappers = []; const notYetValidatedWrappers = [];
for (const wrapperJar of wrapperJars) { for (const wrapperJar of wrapperJars) {
@ -101808,23 +101812,17 @@ exports.findInvalidWrapperJars = findInvalidWrapperJars;
class ValidationResult { class ValidationResult {
constructor(valid, invalid) { constructor(valid, invalid) {
this.fetchedChecksums = false; this.fetchedChecksums = false;
this.errors = [];
this.valid = valid; this.valid = valid;
this.invalid = invalid; this.invalid = invalid;
} }
isValid() { isValid() {
return this.invalid.length === 0 && this.errors.length === 0; return this.invalid.length === 0;
} }
toDisplayString() { toDisplayString() {
let displayString = ''; let displayString = '';
if (this.invalid.length > 0) { if (this.invalid.length > 0) {
displayString += `✗ Found unknown Gradle Wrapper JAR files:\n${ValidationResult.toDisplayList(this.invalid)}`; displayString += `✗ Found unknown Gradle Wrapper JAR files:\n${ValidationResult.toDisplayList(this.invalid)}`;
} }
if (this.errors.length > 0) {
if (displayString.length > 0)
displayString += '\n';
displayString += `✗ Other validation errors:\n ${this.errors.join(`\n `)}`;
}
if (this.valid.length > 0) { if (this.valid.length > 0) {
if (displayString.length > 0) if (displayString.length > 0)
displayString += '\n'; displayString += '\n';

File diff suppressed because one or more lines are too long