Skip to content

Update Gradle projects automatically when aspectj.enabled is changed #3675

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

Merged
fbricon merged 1 commit into from
Jan 14, 2026
Merged

Update Gradle projects automatically when aspectj.enabled is changed #3675

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
32 changes: 26 additions & 6 deletions ...ls.core/src/org/eclipse/jdt/ls/core/internal/managers/GradlePreferenceChangeListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jdt.apt.core.util.AptConfig;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
Expand All @@ -48,6 +50,7 @@ public void preferencesChange(Preferences oldPreferences, Preferences newPrefere
if (projectsManager != null) {
boolean gradleJavaHomeChanged = !Objects.equals(oldPreferences.getGradleJavaHome(), newPreferences.getGradleJavaHome());
if (gradleJavaHomeChanged || hasAllowedChecksumsChanged(oldPreferences, newPreferences)) {
waitForGradleJobs();
for (IProject project : ProjectUtils.getGradleProjects()) {
if (newPreferences.isGradleWrapperEnabled() || gradleJavaHomeChanged) {
updateProject(projectsManager, project, gradleJavaHomeChanged);
Expand All @@ -57,16 +60,17 @@ public void preferencesChange(Preferences oldPreferences, Preferences newPrefere

boolean protobufSupportChanged = !Objects.equals(oldPreferences.isProtobufSupportEnabled(), newPreferences.isProtobufSupportEnabled());
if (protobufSupportChanged) {
for (IProject project : ProjectUtils.getGradleProjects()) {
projectsManager.updateProject(project, true);
}
updateProjects(projectsManager);
}

boolean androidSupportChanged = !Objects.equals(oldPreferences.isAndroidSupportEnabled(), newPreferences.isAndroidSupportEnabled());
if (androidSupportChanged) {
for (IProject project : ProjectUtils.getGradleProjects()) {
projectsManager.updateProject(project, true);
}
updateProjects(projectsManager);
}

boolean aspectjSupportChanged = !Objects.equals(oldPreferences.isAspectjSupportEnabled(), newPreferences.isAspectjSupportEnabled());
if (aspectjSupportChanged) {
updateProjects(projectsManager);
}

boolean annotationProcessingChanged = !Objects.equals(oldPreferences.isGradleAnnotationProcessingEnabled(), newPreferences.isGradleAnnotationProcessingEnabled());
Expand All @@ -84,6 +88,7 @@ public void preferencesChange(Preferences oldPreferences, Preferences newPrefere
}
boolean updateBuildConfigurationChanged = !Objects.equals(oldPreferences.getUpdateBuildConfigurationStatus(), newPreferences.getUpdateBuildConfigurationStatus());
if (updateBuildConfigurationChanged) {
waitForGradleJobs();
for (IProject project : ProjectUtils.getGradleProjects()) {
String projectPath = project.getLocation().toFile().getAbsolutePath();
BuildConfiguration buildConfiguration = GradleProjectImporter.getBuildConfiguration(Paths.get(projectPath));
Expand All @@ -94,6 +99,21 @@ public void preferencesChange(Preferences oldPreferences, Preferences newPrefere
}
}

private void waitForGradleJobs() {
try {
Job.getJobManager().join(CorePlugin.GRADLE_JOB_FAMILY, new NullProgressMonitor());
} catch (OperationCanceledException | InterruptedException e) {
// ignore
}
}

private void updateProjects(ProjectsManager projectsManager) {
waitForGradleJobs();
for (IProject project : ProjectUtils.getGradleProjects()) {
projectsManager.updateProject(project, true);
}
}

private void updateProject(ProjectsManager projectsManager, IProject project, boolean gradleJavaHomeChanged) {
String projectDir = project.getLocation().toFile().getAbsolutePath();
Path projectPath = Paths.get(projectDir);
Expand Down