Merge branch '5.3.x'
This commit is contained in:
commit
a1f14e8eeb
|
@ -72,6 +72,7 @@ eclipse.classpath.file.whenMerged {
|
||||||
// Include project specific settings
|
// Include project specific settings
|
||||||
task eclipseSettings(type: Copy) {
|
task eclipseSettings(type: Copy) {
|
||||||
from rootProject.files(
|
from rootProject.files(
|
||||||
|
'src/eclipse/org.eclipse.core.resources.prefs',
|
||||||
'src/eclipse/org.eclipse.jdt.core.prefs',
|
'src/eclipse/org.eclipse.jdt.core.prefs',
|
||||||
'src/eclipse/org.eclipse.jdt.ui.prefs')
|
'src/eclipse/org.eclipse.jdt.ui.prefs')
|
||||||
into project.file('.settings/')
|
into project.file('.settings/')
|
||||||
|
@ -79,6 +80,7 @@ task eclipseSettings(type: Copy) {
|
||||||
}
|
}
|
||||||
|
|
||||||
task cleanEclipseSettings(type: Delete) {
|
task cleanEclipseSettings(type: Delete) {
|
||||||
|
delete project.file('.settings/org.eclipse.core.resources.prefs')
|
||||||
delete project.file('.settings/org.eclipse.jdt.core.prefs')
|
delete project.file('.settings/org.eclipse.jdt.core.prefs')
|
||||||
delete project.file('.settings/org.eclipse.jdt.ui.prefs')
|
delete project.file('.settings/org.eclipse.jdt.ui.prefs')
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
eclipse.preferences.version=1
|
||||||
|
encoding/<project>=UTF-8
|
Loading…
Reference in New Issue