Skip to content

Allow dependencies with scopes other than "compile" on the transpiler classpath #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
EricWittmann wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow dependencies with scopes other than "compile" on the transpiler classpath #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 20 additions & 7 deletions src/main/java/org/jsweet/AbstractJSweetMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public abstract class AbstractJSweetMojo extends AbstractMojo {
*/
@Parameter(required = false)
private List<String> compileSourceRootsOverride;

@Parameter(required = false)
protected Boolean verbose;

Expand All @@ -117,6 +117,9 @@ public abstract class AbstractJSweetMojo extends AbstractMojo {
@Parameter(required = false)
protected File candiesJsOut;

@Parameter(required = false)
protected String[] allowedDependencyScopes;

@Parameter
protected String[] includes;

Expand Down Expand Up @@ -158,7 +161,7 @@ public abstract class AbstractJSweetMojo extends AbstractMojo {

@Parameter(required = false)
protected String javaCompilerExtraOptions;

@Parameter(required = false)
protected Boolean ignoreTypeScriptErrors;

Expand Down Expand Up @@ -228,7 +231,7 @@ private void scanForJavaFiles(List<SourceFile> sources, File sourceDirectory) {
getLog().debug(sourceDirectory.getAbsolutePath() + " is declared but doesn't exist");
return;
}

DirectoryScanner dirScanner = new DirectoryScanner();
dirScanner.setBasedir(sourceDirectory);
dirScanner.setIncludes(includes);
Expand Down Expand Up @@ -567,12 +570,22 @@ protected List<File> getCandiesJars() throws ArtifactResolutionException, Artifa
List<Dependency> dependencies = project.getDependencies();
logInfo("dependencies=" + dependencies);

Set<String> allowedScopes = new HashSet<>();
if (allowedDependencyScopes != null) {
allowedScopes.addAll(Set.of(allowedDependencyScopes));
} else {
allowedScopes.add(Artifact.SCOPE_COMPILE);
}

// add artifacts of declared dependencies
List<Artifact> directDependencies = new LinkedList<>();
for (Dependency dependency : dependencies) {
if (!dependency.getType().equals("jar")
|| dependency.getScope() != null && !dependency.getScope().equals(Artifact.SCOPE_COMPILE)) {
getLog().warn("dependency type not-jar excluded from candies detection: " + dependency);
if (!dependency.getType().equals("jar")) {
getLog().warn("dependency of type other than jar excluded from candies detection: " + dependency);
continue;
}
if (!allowedScopes.contains(dependency.getScope())) {
getLog().warn("dependency with scope '" + dependency.getScope() + "' excluded from candies detection: " + dependency);
continue;
}
Artifact mavenArtifact = artifactFactory.createArtifact(dependency.getGroupId(), dependency.getArtifactId(),
Expand Down Expand Up @@ -610,7 +623,7 @@ protected MavenProject getMavenProject() {
MavenProject project = (MavenProject) ctx.get("project");
return project;
}

protected List<String> getCompileSourceRoots(MavenProject project) {
if (compileSourceRootsOverride == null || compileSourceRootsOverride.isEmpty()) {
return project.getCompileSourceRoots();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jsweet/JSweetWatchMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ public void run() {
}
__Lock.unlock();
}
yield();
Thread.yield();
}
}
}
Expand Down