Skip to content

Commit 6d64fe5

Browse files
committed
Merge remote branch 'upstream/master'
2 parents a61fbad + 36cf74f commit 6d64fe5

File tree

8 files changed

+11
-12
lines changed

8 files changed

+11
-12
lines changed

it.baeyens.arduino.common/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Bundle-Activator: it.baeyens.arduino.common.Activator
77
Require-Bundle: org.eclipse.ui,
88
org.eclipse.core.runtime,
99
org.eclipse.jface.text
10-
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
10+
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
1111
Bundle-ActivationPolicy: lazy
1212
Export-Package: it.baeyens.arduino.arduino,
1313
it.baeyens.arduino.common

it.baeyens.arduino.core.nl1/META-INF/MANIFEST.MF

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ Bundle-Name: it.baeyens.arduino.core.nl1 Fragment
44
Bundle-SymbolicName: it.baeyens.arduino.core.nl1
55
Bundle-Version: 1.0.0.qualifier
66
Fragment-Host: it.baeyens.arduino.core;bundle-version="[2.1.0,2.2.0)"
7+
Bundle-RequiredExecutionEnvironment: JavaSE-1.6

it.baeyens.arduino.core/META-INF/MANIFEST.MF

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ Bundle-ManifestVersion: 2
33
Bundle-Name: Arduino eclipse plugin
44
Bundle-SymbolicName: it.baeyens.arduino.core;singleton:=true
55
Bundle-Version: 2.1.4.qualifier
6-
Bundle-RequiredExecutionEnvironment: JavaSE-1.6,
7-
JavaSE-1.7
6+
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
87
Require-Bundle: org.eclipse.core.runtime,
98
org.eclipse.ui,
109
org.eclipse.core.resources,

it.baeyens.arduino.monitor/META-INF/MANIFEST.MF

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ Bundle-Vendor: jan baeyens
88
Require-Bundle: org.eclipse.ui,
99
org.eclipse.core.runtime,
1010
it.baeyens.arduino.common
11-
Bundle-RequiredExecutionEnvironment: JavaSE-1.6,
12-
JavaSE-1.7
11+
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
1312
Bundle-ActivationPolicy: lazy
1413
Export-Package: it.baeyens.arduino.monitor;uses:="org.eclipse.jface.resource,org.eclipse.ui.plugin,org.osgi.framework",
1514
it.baeyens.arduino.monitor.views;

it.baeyens.arduino.parent/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
<configuration>
4141
<debug>true</debug>
4242
<encoding>UTF-8</encoding>
43-
<source>1.7</source>
44-
<target>1.7</target>
43+
<source>1.6</source>
44+
<target>1.6</target>
4545
</configuration>
4646
</plugin>
4747

it.baeyens.arduino.product/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
44
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
55
<classpathentry kind="src" path="src"/>
66
<classpathentry kind="output" path="bin"/>
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
4-
org.eclipse.jdt.core.compiler.compliance=1.7
3+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
4+
org.eclipse.jdt.core.compiler.compliance=1.6
55
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
66
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
7-
org.eclipse.jdt.core.compiler.source=1.7
7+
org.eclipse.jdt.core.compiler.source=1.6

it.baeyens.arduino.product/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ Bundle-ManifestVersion: 2
33
Bundle-Name: Product
44
Bundle-SymbolicName: it.baeyens.arduino.product
55
Bundle-Version: 1.0.0.qualifier
6-
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
6+
Bundle-RequiredExecutionEnvironment: JavaSE-1.6

0 commit comments

Comments
 (0)