From 6e43dd879b80575de0bc3fb67ae48633c77de5e1 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 16 Jun 2021 19:50:23 +0100 Subject: [PATCH] Allow Eclipse to properly detect source and target compatibility Previously, our conventions configured the source and target compatibility on the project's JavaCompile tasks. This causes the settings to be missed when importing the projects into Eclipse [1]. This commit updates the conventions to set the source and target compatibility on the project-wide JavaPluginExtension. This allows the Eclipse import to correctly detect and honour the settings. Closes gh-26932 [1] https://github.com/eclipse/buildship/issues/978 --- .../boot/build/ConventionsPlugin.java | 1 - .../boot/build/EclipseConventions.java | 40 ------------------- .../boot/build/JavaConventions.java | 14 +++---- 3 files changed, 7 insertions(+), 48 deletions(-) delete mode 100644 buildSrc/src/main/java/org/springframework/boot/build/EclipseConventions.java diff --git a/buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java b/buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java index 3aef095deca..e6c02690e72 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java @@ -47,7 +47,6 @@ public class ConventionsPlugin implements Plugin { new MavenPublishingConventions().apply(project); new AsciidoctorConventions().apply(project); new KotlinConventions().apply(project); - new EclipseConventions().apply(project); } } diff --git a/buildSrc/src/main/java/org/springframework/boot/build/EclipseConventions.java b/buildSrc/src/main/java/org/springframework/boot/build/EclipseConventions.java deleted file mode 100644 index 68258a3bab1..00000000000 --- a/buildSrc/src/main/java/org/springframework/boot/build/EclipseConventions.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2012-2021 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.boot.build; - -import org.gradle.api.Project; -import org.gradle.api.plugins.JavaBasePlugin; -import org.gradle.plugins.ide.eclipse.EclipsePlugin; -import org.gradle.plugins.ide.eclipse.model.EclipseModel; - -/** - * Conventions that are applied in the presence of the {@link JavaBasePlugin} in order to - * correctly configure Eclipse. - * - * @author Phillip Webb - */ -class EclipseConventions { - - void apply(Project project) { - project.getPlugins().withType(JavaBasePlugin.class, (java) -> { - project.getPlugins().apply(EclipsePlugin.class); - EclipseModel eclipse = project.getExtensions().getByType(EclipseModel.class); - eclipse.getJdt().setJavaRuntimeName("JavaSE-1.8"); - }); - } - -} diff --git a/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java b/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java index 12058ca9368..9c019d79d1a 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java @@ -43,6 +43,7 @@ import org.gradle.api.artifacts.Dependency; import org.gradle.api.artifacts.DependencySet; import org.gradle.api.plugins.JavaBasePlugin; import org.gradle.api.plugins.JavaPlugin; +import org.gradle.api.plugins.JavaPluginExtension; import org.gradle.api.plugins.quality.Checkstyle; import org.gradle.api.plugins.quality.CheckstyleExtension; import org.gradle.api.plugins.quality.CheckstylePlugin; @@ -64,6 +65,7 @@ import org.springframework.boot.build.toolchain.ToolchainPlugin; * plugin is applied: * *