From a93fce3f5105854eeb8341437779e5e3e2bb72f1 Mon Sep 17 00:00:00 2001 From: Silenio Quarti Date: Wed, 17 Jul 2013 13:24:56 -0400 Subject: Bug 413116 - Build fails due to SWT at 1.5 level? --- bundles/org.eclipse.swt.tools/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 13 +++++++------ bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF | 2 +- bundles/org.eclipse.swt/.classpath_carbon | 3 ++- bundles/org.eclipse.swt/.classpath_cocoa | 3 ++- bundles/org.eclipse.swt/.classpath_dojo | 1 + bundles/org.eclipse.swt/.classpath_gtk | 3 ++- bundles/org.eclipse.swt/.classpath_motif | 3 ++- bundles/org.eclipse.swt/.classpath_photon | 3 ++- bundles/org.eclipse.swt/.classpath_win32 | 3 ++- bundles/org.eclipse.swt/.classpath_wpf | 3 ++- bundles/org.eclipse.swt/.classpath_wpf_e4 | 3 ++- .../org.eclipse.swt/.settings/org.eclipse.jdt.core.prefs | 16 ++++++---------- bundles/org.eclipse.swt/META-INF/MANIFEST.MF | 3 ++- bundles/org.eclipse.swt/buildFragment.xml | 12 +++++++++--- examples/org.eclipse.swt.examples/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 13 +++++++------ examples/org.eclipse.swt.examples/META-INF/MANIFEST.MF | 2 +- 18 files changed, 52 insertions(+), 38 deletions(-) diff --git a/bundles/org.eclipse.swt.tools/.classpath b/bundles/org.eclipse.swt.tools/.classpath index a23e6d08aa..22ab26bdb9 100644 --- a/bundles/org.eclipse.swt.tools/.classpath +++ b/bundles/org.eclipse.swt.tools/.classpath @@ -1,6 +1,6 @@ - + diff --git a/bundles/org.eclipse.swt.tools/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.swt.tools/.settings/org.eclipse.jdt.core.prefs index 416f4fb696..7f64b31e75 100644 --- a/bundles/org.eclipse.swt.tools/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.swt.tools/.settings/org.eclipse.jdt.core.prefs @@ -1,11 +1,12 @@ +#Mon Dec 11 15:13:24 EST 2006 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.4 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.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning +org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning +org.eclipse.jdt.core.compiler.source=1.3 diff --git a/bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF index 51da5abe2e..6d520a5009 100644 --- a/bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Export-Package: org.eclipse.swt.tools, org.eclipse.swt.tools.internal; x-internal:=true Bundle-ActivationPolicy: lazy Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: J2SE-1.4 Require-Bundle: org.eclipse.swt;bundle-version="3.4.0", org.eclipse.core.runtime;bundle-version="3.4.0", org.eclipse.core.resources;bundle-version="3.4.0", diff --git a/bundles/org.eclipse.swt/.classpath_carbon b/bundles/org.eclipse.swt/.classpath_carbon index 6b105fc372..3a1e47883d 100644 --- a/bundles/org.eclipse.swt/.classpath_carbon +++ b/bundles/org.eclipse.swt/.classpath_carbon @@ -1,6 +1,6 @@ - + @@ -34,5 +34,6 @@ + diff --git a/bundles/org.eclipse.swt/.classpath_cocoa b/bundles/org.eclipse.swt/.classpath_cocoa index a959a32cd6..8ed1d226a6 100644 --- a/bundles/org.eclipse.swt/.classpath_cocoa +++ b/bundles/org.eclipse.swt/.classpath_cocoa @@ -1,6 +1,6 @@ - + @@ -34,5 +34,6 @@ + diff --git a/bundles/org.eclipse.swt/.classpath_dojo b/bundles/org.eclipse.swt/.classpath_dojo index 0a1cc61a4c..dcf6d5e451 100644 --- a/bundles/org.eclipse.swt/.classpath_dojo +++ b/bundles/org.eclipse.swt/.classpath_dojo @@ -28,5 +28,6 @@ + diff --git a/bundles/org.eclipse.swt/.classpath_gtk b/bundles/org.eclipse.swt/.classpath_gtk index 2f04c32e4f..babfb2899d 100644 --- a/bundles/org.eclipse.swt/.classpath_gtk +++ b/bundles/org.eclipse.swt/.classpath_gtk @@ -1,6 +1,6 @@ - + @@ -38,5 +38,6 @@ + diff --git a/bundles/org.eclipse.swt/.classpath_motif b/bundles/org.eclipse.swt/.classpath_motif index 69459c707b..7c18c5c6d0 100644 --- a/bundles/org.eclipse.swt/.classpath_motif +++ b/bundles/org.eclipse.swt/.classpath_motif @@ -1,6 +1,6 @@ - + @@ -45,5 +45,6 @@ + diff --git a/bundles/org.eclipse.swt/.classpath_photon b/bundles/org.eclipse.swt/.classpath_photon index 9d8a6124bf..3c7f8847ab 100644 --- a/bundles/org.eclipse.swt/.classpath_photon +++ b/bundles/org.eclipse.swt/.classpath_photon @@ -1,6 +1,6 @@ - + @@ -38,5 +38,6 @@ + diff --git a/bundles/org.eclipse.swt/.classpath_win32 b/bundles/org.eclipse.swt/.classpath_win32 index 68a2d44fbb..c981b48520 100644 --- a/bundles/org.eclipse.swt/.classpath_win32 +++ b/bundles/org.eclipse.swt/.classpath_win32 @@ -1,6 +1,6 @@ - + @@ -31,5 +31,6 @@ + diff --git a/bundles/org.eclipse.swt/.classpath_wpf b/bundles/org.eclipse.swt/.classpath_wpf index 8d34cbf331..9d2426f0ec 100644 --- a/bundles/org.eclipse.swt/.classpath_wpf +++ b/bundles/org.eclipse.swt/.classpath_wpf @@ -1,6 +1,6 @@ - + @@ -34,5 +34,6 @@ + diff --git a/bundles/org.eclipse.swt/.classpath_wpf_e4 b/bundles/org.eclipse.swt/.classpath_wpf_e4 index 295916de48..9f35602dca 100644 --- a/bundles/org.eclipse.swt/.classpath_wpf_e4 +++ b/bundles/org.eclipse.swt/.classpath_wpf_e4 @@ -1,6 +1,6 @@ - + @@ -36,5 +36,6 @@ + diff --git a/bundles/org.eclipse.swt/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.swt/.settings/org.eclipse.jdt.core.prefs index 63c55971c2..887df88193 100644 --- a/bundles/org.eclipse.swt/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.swt/.settings/org.eclipse.jdt.core.prefs @@ -1,14 +1,10 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 -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.codegen.inlineJsrBytecode=disabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 +org.eclipse.jdt.core.compiler.compliance=1.4 org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning +org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled @@ -23,4 +19,4 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.3 diff --git a/bundles/org.eclipse.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt/META-INF/MANIFEST.MF index d02483a011..8aee340d57 100644 --- a/bundles/org.eclipse.swt/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.swt/META-INF/MANIFEST.MF @@ -24,4 +24,5 @@ Export-Package: org.eclipse.swt.internal.image; x-internal:=true, org.eclipse.swt.internal.theme; x-internal:=true Eclipse-ExtensibleAPI: true -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0, + J2SE-1.3 diff --git a/bundles/org.eclipse.swt/buildFragment.xml b/bundles/org.eclipse.swt/buildFragment.xml index ba230aba08..f5fb504a98 100644 --- a/bundles/org.eclipse.swt/buildFragment.xml +++ b/bundles/org.eclipse.swt/buildFragment.xml @@ -25,8 +25,8 @@ - - + + @@ -36,6 +36,12 @@ + + + + + + @@ -66,7 +72,7 @@ - + diff --git a/examples/org.eclipse.swt.examples/.classpath b/examples/org.eclipse.swt.examples/.classpath index 472ee29b11..b7464f3ca2 100644 --- a/examples/org.eclipse.swt.examples/.classpath +++ b/examples/org.eclipse.swt.examples/.classpath @@ -2,6 +2,6 @@ - + diff --git a/examples/org.eclipse.swt.examples/.settings/org.eclipse.jdt.core.prefs b/examples/org.eclipse.swt.examples/.settings/org.eclipse.jdt.core.prefs index 416f4fb696..2a57571e9c 100644 --- a/examples/org.eclipse.swt.examples/.settings/org.eclipse.jdt.core.prefs +++ b/examples/org.eclipse.swt.examples/.settings/org.eclipse.jdt.core.prefs @@ -1,11 +1,12 @@ +#Mon Dec 11 14:31:37 EST 2006 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.4 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.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning +org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning +org.eclipse.jdt.core.compiler.source=1.3 diff --git a/examples/org.eclipse.swt.examples/META-INF/MANIFEST.MF b/examples/org.eclipse.swt.examples/META-INF/MANIFEST.MF index 729e3692f2..2ea3ec2971 100644 --- a/examples/org.eclipse.swt.examples/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.swt.examples/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 3.102.0.qualifier Bundle-ClassPath: swtexamples.jar Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: J2SE-1.4 Export-Package: org.eclipse.swt.examples.accessibility, org.eclipse.swt.examples.addressbook, org.eclipse.swt.examples.browserexample, -- cgit