Skip to content

fix: gradle plugin update #3

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
Boris (dzodkin33) wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: gradle plugin update #3

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
31 changes: 19 additions & 12 deletions elide-gradle-plugin/src/main/java/dev/elide/gradle/ElideGradlePlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import org.gradle.api.Project;
import org.gradle.api.Task;
import org.gradle.api.tasks.compile.JavaCompile;
import org.gradle.api.configuration.BuildFeatures;

import javax.inject.Inject;
import java.io.BufferedReader;
Expand All @@ -30,9 +31,13 @@ public class ElideGradlePlugin implements Plugin<Project> {
// Project where the plugin is installed.
private final Project activeProject;

// Project build features
private final BuildFeatures buildFeatures;

@Inject
public ElideGradlePlugin(Project project) {
public ElideGradlePlugin(Project project, BuildFeatures buildFeatures) {
this.activeProject = project;
this.buildFeatures = buildFeatures;
}

// Configure a Java compile task to use Elide instead of the standard compiler API.
Expand Down Expand Up @@ -136,6 +141,9 @@ private Collection<Task> installMavenDepsSupport(Project project, ElideExtension
repos.mavenLocal(it -> {
it.setName("elide");
it.setUrl(URI.create("file://" + localDepsPath.toAbsolutePath()));
it.metadataSources(sources -> {
sources.artifact();
});
});
return Collections.emptyList();
}
Expand Down Expand Up @@ -245,7 +253,7 @@ private String callElideCaptured(Path path, String[] args) {
public void apply(Project project) {
var elideResolved = resolvePathToElide();
project.getLogger().debug("Elide resolved to '{}'", elideResolved);
if (!project.getGradle().getStartParameter().isConfigurationCacheRequested()) {
if (!buildFeatures.getConfigurationCache().getRequested().getOrElse(false)) {
var versionPrinted = callElideCaptured(elideResolved, new String[]{"--version"});
var version = versionPrinted.replace("\n", "");
project.getLogger().lifecycle("Using Elide " + version);
Expand Down Expand Up @@ -284,27 +292,26 @@ public void apply(Project project) {
// be aware of our Maven dependencies before `elide install` is run.
allPrepTasks.addAll(installMavenDepsSupport(project, extension, mustGenerateManifest));
installerEnabled = true;
} else {
project.getRepositories().mavenCentral();
}
if (installerEnabled && hasProjectManifest) {
// if a project manifest is present, we should run `elide install` regardless of other criteria, as it
// may install non-JVM dependencies on the user's behalf.
shouldRunInstallWithOrWithoutMaven = true;
}
if (shouldRunInstallWithOrWithoutMaven) {
// add a precursor task to run `elide install`.
allPrepTasks.add(project.getTasks().create(ElideTaskName.ELIDE_TASK_INSTALL, Task.class, task -> {
// run elide install during configuration phase
project.getLogger().lifecycle("Running `elide install`...");
callElideCaptured(elideResolved, new String[]{"install"});

project.getTasks().create(ElideTaskName.ELIDE_TASK_INSTALL, Task.class, task -> {
task.setGroup("Elide");
task.setDescription("Runs `elide install` to prepare the project for compilation.");
task.dependsOn(allPrepTasks.stream().filter(it -> it != task).collect(Collectors.toList()));
task.doLast(_ -> {
var start = System.currentTimeMillis();
project.getLogger().info("Running `elide install`");
var result = callElideCaptured(elideResolved, new String[]{"install"});
var end = System.currentTimeMillis();
project.getLogger().info(result);
project.getLogger().lifecycle("`elide install` completed in {}ms", (end - start));
callElideCaptured(elideResolved, new String[]{"install"});
});
}));
});
}
if (!allPrepTasks.isEmpty() && javacTasks != null && !javacTasks.isEmpty()) {
javacTasks.forEach(javacTask -> {
Expand Down
Loading