Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Keller2016-09-08 15:22:10 +0000
committerMarkus Keller2016-09-08 16:14:57 +0000
commitb4982749a45af9f2fcf06a18f401056b55ecb7f8 (patch)
treee09051100750b708fde10ec1cfd144a92aa26cc6 /org.eclipse.jdt.compiler.tool.tests/.settings/org.eclipse.jdt.core.prefs
parente157b21bb74eaf6b41c3411a9206ec3f8b5f29a2 (diff)
parent939cdd38674f6d8def82d09c3784113f9d5616d7 (diff)
downloadeclipse.jdt.core-b4982749a45af9f2fcf06a18f401056b55ecb7f8.tar.gz
eclipse.jdt.core-b4982749a45af9f2fcf06a18f401056b55ecb7f8.tar.xz
eclipse.jdt.core-b4982749a45af9f2fcf06a18f401056b55ecb7f8.zip
Merge remote-tracking branch 'origin/master' into BETA_JAVA9
Conflicts: org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullTypeAnnotationTest.java -> resurrected testBug489674 that was lost in a previous merge org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodScope.java
Diffstat (limited to 'org.eclipse.jdt.compiler.tool.tests/.settings/org.eclipse.jdt.core.prefs')
-rw-r--r--org.eclipse.jdt.compiler.tool.tests/.settings/org.eclipse.jdt.core.prefs6
1 files changed, 3 insertions, 3 deletions
diff --git a/org.eclipse.jdt.compiler.tool.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jdt.compiler.tool.tests/.settings/org.eclipse.jdt.core.prefs
index 492694bdf5..1bcbf0a83d 100644
--- a/org.eclipse.jdt.compiler.tool.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.jdt.compiler.tool.tests/.settings/org.eclipse.jdt.core.prefs
@@ -9,9 +9,9 @@ org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+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
@@ -68,6 +68,6 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.incompatibleJDKLevel=ignore
org.eclipse.jdt.core.incompleteClasspath=error

Back to the top