implements PLN-0106
JaCoCo Coverage #### Project Overview
No changes detected, that affect the code coverage.
* Line Coverage: 61.49% (17397/28294)
* Branch Coverage: 52.32% (6724/12852)
* Lines of Code: 28294
* Cyclomatic Complexity: 11339
#### Quality Gates Summary
Output truncated.
Test / Build skipped: 15, passed: 608
Intrepid/Prometeu/Studio/pipeline/pr-master This commit looks good
JaCoCo Coverage #### Project Overview
No changes detected, that affect the code coverage.
* Line Coverage: 61.49% (17397/28294)
* Branch Coverage: 52.32% (6724/12852)
* Lines of Code: 28294
* Cyclomatic Complexity: 11339
#### Quality Gates Summary
Output truncated.
Test / Build skipped: 15, passed: 608
Intrepid/Prometeu/Studio/pipeline/pr-master This commit looks good
This commit is contained in:
+1
-1
@@ -60,7 +60,7 @@ public final class PrometeuManifestUtils {
|
||||
.message("[DEPS]: invalid 'target' \"" + dto.target() + "\": " + manifestPathCanon));
|
||||
}
|
||||
final var language = StringUtils.isBlank(dto.language())
|
||||
? FrontendRegistryService.getDefaultFrontendSpec().getLanguageId()
|
||||
? FrontendRegistryService.getDefaultProvider().specification().getLanguageId()
|
||||
: dto.language();
|
||||
final var dependencies = DependencyResolver.resolveDependencies(mainProjectRootPathCanon, dto.dependencies(), issuesLocal);
|
||||
if (ReadOnlyCollection.isNotEmpty(issuesLocal)) {
|
||||
|
||||
+6
-5
@@ -55,23 +55,24 @@ public class DiscoverPhase implements DependencyPhase {
|
||||
ctx.rootStdlib = manifest.get().stdlib();
|
||||
ctx.target = manifest.get().target();
|
||||
}
|
||||
final var frontendSpec = FrontendRegistryService.getFrontendSpec(manifest.get().language());
|
||||
final var frontendProvider = FrontendRegistryService.getProvider(manifest.get().language());
|
||||
// Returns empty when language is unknown
|
||||
if (frontendSpec.isEmpty()) {
|
||||
if (frontendProvider.isEmpty()) {
|
||||
issues.report(builder -> builder
|
||||
.error(true)
|
||||
.message("[DEPS]: unknown language " + manifest.get().language() + " for project " + manifest.get().name()));
|
||||
return Optional.empty();
|
||||
}
|
||||
final var frontendSpec = frontendProvider.get().specification();
|
||||
// Enforces consistent language across projects
|
||||
if (Objects.isNull(ctx.frontendSpec)) {
|
||||
ctx.frontendSpec = frontendSpec.get();
|
||||
} else if (!ctx.frontendSpec.getLanguageId().equals(frontendSpec.get().getLanguageId())) {
|
||||
ctx.frontendSpec = frontendSpec;
|
||||
} else if (!ctx.frontendSpec.getLanguageId().equals(frontendSpec.getLanguageId())) {
|
||||
// Reports language inconsistency across projects
|
||||
issues.report(builder -> builder
|
||||
.error(true)
|
||||
.message(String.format("[DEPS]: inconsistent language: [ %s ] has \"%s\" but should be \"%s\"",
|
||||
manifest.get().name(), frontendSpec.get().getLanguageId(), ctx.frontendSpec.getLanguageId())));
|
||||
manifest.get().name(), frontendSpec.getLanguageId(), ctx.frontendSpec.getLanguageId())));
|
||||
return Optional.empty();
|
||||
}
|
||||
final var projectInfo = ProjectInfo
|
||||
|
||||
Reference in New Issue
Block a user