Skip to content

Commit 6424e3d

Browse files
committed
Merge branch '2.4.x'
Closes spring-projectsgh-26671
2 parents 3c6bf14 + 14f578e commit 6424e3d

File tree

2 files changed

+41
-0
lines changed

2 files changed

+41
-0
lines changed

buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java

+1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ public void apply(Project project) {
4747
new MavenPublishingConventions().apply(project);
4848
new AsciidoctorConventions().apply(project);
4949
new KotlinConventions().apply(project);
50+
new EclipseConventions().apply(project);
5051
}
5152

5253
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
/*
2+
* Copyright 2012-2021 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package org.springframework.boot.build;
18+
19+
import org.gradle.api.Project;
20+
import org.gradle.api.plugins.JavaBasePlugin;
21+
import org.gradle.plugins.ide.eclipse.EclipsePlugin;
22+
import org.gradle.plugins.ide.eclipse.model.EclipseModel;
23+
24+
/**
25+
* Conventions that are applied in the presence of the {@link JavaBasePlugin} in order to
26+
* correctly configure Eclipse.
27+
*
28+
* @author Phillip Webb
29+
*/
30+
class EclipseConventions {
31+
32+
void apply(Project project) {
33+
project.getPlugins().withType(JavaBasePlugin.class, (java) -> {
34+
project.getPlugins().apply(EclipsePlugin.class);
35+
EclipseModel eclipse = project.getExtensions().getByType(EclipseModel.class);
36+
eclipse.getJdt().setJavaRuntimeName("JavaSE-1.8");
37+
});
38+
}
39+
40+
}

0 commit comments

Comments
 (0)