diff options
| author | Pierre-Charles David | 2017-08-24 08:13:18 +0000 |
|---|---|---|
| committer | Joao Barata | 2017-09-22 11:03:17 +0000 |
| commit | a333578f65f15228334b5a7500c851b04608b124 (patch) | |
| tree | 19b5614d49ae7ea9d6927d4b0dccf462aa7a723a | |
| parent | 3bfe39f2db35235c67077d4282de86c8df7a8231 (diff) | |
| download | org.eclipse.amalgam-a333578f65f15228334b5a7500c851b04608b124.tar.gz org.eclipse.amalgam-a333578f65f15228334b5a7500c851b04608b124.tar.xz org.eclipse.amalgam-a333578f65f15228334b5a7500c851b04608b124.zip | |
[509735] Move to Java 8 for the explorer.activity.ui plug-in
The integration with Sirius's aird editor requires a dependency to
Sirius 5.1, which itself requires Java 8, and allowing this explicitly
this will enable cleaner code.
Bug: 509735
Change-Id: I2563c5154a4bb21747ca5d7487d34261b8785fe5
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
3 files changed, 10 insertions, 5 deletions
diff --git a/plugins/org.eclipse.amalgam.explorer.activity.ui/.classpath b/plugins/org.eclipse.amalgam.explorer.activity.ui/.classpath index 88cb07a7..b1ff4593 100644 --- a/plugins/org.eclipse.amalgam.explorer.activity.ui/.classpath +++ b/plugins/org.eclipse.amalgam.explorer.activity.ui/.classpath @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"> <accessrules> <accessrule kind="accessible" pattern="org/eclipse/sirius/**/internal/**"/> </accessrules> </classpathentry> <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/org.eclipse.amalgam.explorer.activity.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.amalgam.explorer.activity.ui/.settings/org.eclipse.jdt.core.prefs index c537b630..a698e596 100644 --- a/plugins/org.eclipse.amalgam.explorer.activity.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.amalgam.explorer.activity.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,12 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/plugins/org.eclipse.amalgam.explorer.activity.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.amalgam.explorer.activity.ui/META-INF/MANIFEST.MF index 8526168f..25a1610a 100644 --- a/plugins/org.eclipse.amalgam.explorer.activity.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.amalgam.explorer.activity.ui/META-INF/MANIFEST.MF @@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.sirius.ext.base, org.eclipse.sirius.diagram, org.eclipse.sirius.diagram.ui -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.amalgam.explorer.activity.ui, org.eclipse.amalgam.explorer.activity.ui.api.actions, |