Skip to content

Commit f3b698b

Browse files
jantjejantje
authored
Merge pull request #1523 from Sloeber/#1499_replace_automatic_upgrade_with_manual_upgrade
#1499 replace automatic project update to manual upgrade
2 parents 57d563a + 6b596e6 commit f3b698b

File tree

11 files changed

+342
-209
lines changed

11 files changed

+342
-209
lines changed

‎io.sloeber.core/.classpath

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
33
<classpathentry kind="src" path="src"/>
4-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
4+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
55
<attributes>
66
<attribute name="module" value="true"/>
77
</attributes>

‎io.sloeber.core/.settings/org.eclipse.jdt.core.prefs

-9
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,3 @@ org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
99
org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
1010
org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
1111
org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
12-
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
13-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
14-
org.eclipse.jdt.core.compiler.compliance=17
15-
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
16-
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
17-
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
18-
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
19-
org.eclipse.jdt.core.compiler.release=enabled
20-
org.eclipse.jdt.core.compiler.source=17

‎io.sloeber.core/.settings/org.eclipse.jdt.ui.prefs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
eclipse.preferences.version=1
2-
formatter_profile=org.eclipse.jdt.ui.default.eclipse_profile
32
formatter_settings_version=14
43
org.eclipse.jdt.ui.exception.name=e
54
org.eclipse.jdt.ui.gettersetter.use.is=true
65
org.eclipse.jdt.ui.keywordthis=false
76
org.eclipse.jdt.ui.overrideannotation=true
7+
org.eclipse.jdt.ui.text.custom_code_templates=

‎io.sloeber.core/src/io/sloeber/core/api/SloeberProject.java

+184-159
Large diffs are not rendered by default.

‎io.sloeber.product/sloeber.target

+137-30
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,10 @@
44
<locations>
55
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
66
<repository location="https://download.eclipse.org/tools/orbit/downloads/latest-R/"/>
7-
<unit id="org.apache.commons.lang" version="2.6.0.v20220406-2305"/>
8-
<unit id="org.apache.commons.lang.source" version="2.6.0.v20220406-2305"/>
7+
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
98
<unit id="org.apache.commons.compress" version="1.21.0.v20211103-2100"/>
10-
<unit id="org.apache.commons.compress.source" version="1.21.0.v20211103-2100"/>
119
<unit id="org.apache.commons.io" version="2.8.0.v20210415-0900"/>
12-
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
13-
<unit id="org.junit.jupiter.api" version="5.8.2.v20220624-2009"/>
14-
<unit id="org.junit.jupiter.api.source" version="5.8.2.v20220624-2009"/>
15-
<unit id="org.junit.jupiter.engine" version="5.8.2.v20220624-2009"/>
16-
<unit id="org.junit.jupiter.engine.source" version="5.8.2.v20220624-2009"/>
17-
<unit id="org.junit.jupiter.migrationsupport" version="5.8.2.v20220624-2009"/>
18-
<unit id="org.junit.jupiter.migrationsupport.source" version="5.8.2.v20220624-2009"/>
19-
<unit id="org.junit.jupiter.params" version="5.8.2.v20220624-2009"/>
20-
<unit id="org.junit.jupiter.params.source" version="5.8.2.v20220624-2009"/>
21-
<unit id="org.junit.platform.commons" version="1.8.2.v20220624-2009"/>
22-
<unit id="org.junit.platform.commons.source" version="1.8.2.v20220624-2009"/>
23-
<unit id="org.junit.platform.engine" version="1.8.2.v20220624-2009"/>
24-
<unit id="org.junit.platform.engine.source" version="1.8.2.v20220624-2009"/>
25-
<unit id="org.junit.platform.launcher" version="1.8.2.v20220624-2009"/>
26-
<unit id="org.junit.platform.launcher.source" version="1.8.2.v20220624-2009"/>
27-
<unit id="org.junit.platform.runner" version="1.8.2.v20220624-2009"/>
28-
<unit id="org.junit.platform.runner.source" version="1.8.2.v20220624-2009"/>
29-
<unit id="org.junit.platform.suite.api" version="1.8.2.v20220624-2009"/>
30-
<unit id="org.junit.platform.suite.api.source" version="1.8.2.v20220624-2009"/>
31-
<unit id="org.junit.platform.suite.commons" version="1.8.2.v20220624-2009"/>
32-
<unit id="org.junit.platform.suite.commons.source" version="1.8.2.v20220624-2009"/>
33-
<unit id="org.junit.platform.suite.engine" version="1.8.2.v20220624-2009"/>
34-
<unit id="org.junit.platform.suite.engine.source" version="1.8.2.v20220624-2009"/>
35-
<unit id="org.junit.source" version="4.13.2.v20211018-1956"/>
36-
<unit id="org.junit.vintage.engine" version="5.8.2.v20220624-2009"/>
37-
<unit id="org.junit.vintage.engine.source" version="5.8.2.v20220624-2009"/>
10+
<unit id="org.apache.commons.lang" version="2.6.0.v20220406-2305"/>
3811
</location>
3912
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
4013
<repository location="https://download.eclipse.org/nebula/releases/latest/"/>
@@ -68,5 +41,139 @@
6841
<plugin id="org.eclipse.platform"/>
6942
<plugin id="org.eclipse.cdt"/>
7043
</implicitDependencies>
71-
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
44+
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
45+
<includeBundles>
46+
<feature id="org.eclipse.cdt"/>
47+
<feature id="org.eclipse.cdt.autotools"/>
48+
<feature id="org.eclipse.cdt.build.crossgcc"/>
49+
<feature id="org.eclipse.cdt.debug.gdbjtag"/>
50+
<feature id="org.eclipse.cdt.debug.ui.memory"/>
51+
<feature id="org.eclipse.cdt.gdb"/>
52+
<feature id="org.eclipse.cdt.gdb.source"/>
53+
<feature id="org.eclipse.cdt.gnu.build"/>
54+
<feature id="org.eclipse.cdt.gnu.build.source"/>
55+
<feature id="org.eclipse.cdt.gnu.debug"/>
56+
<feature id="org.eclipse.cdt.gnu.debug.source"/>
57+
<feature id="org.eclipse.cdt.gnu.dsf"/>
58+
<feature id="org.eclipse.cdt.gnu.dsf.source"/>
59+
<feature id="org.eclipse.cdt.gnu.multicorevisualizer"/>
60+
<feature id="org.eclipse.cdt.launch.remote"/>
61+
<feature id="org.eclipse.cdt.managedbuilder.llvm"/>
62+
<feature id="org.eclipse.cdt.msw"/>
63+
<feature id="org.eclipse.cdt.native"/>
64+
<feature id="org.eclipse.cdt.native.source"/>
65+
<feature id="org.eclipse.cdt.platform"/>
66+
<feature id="org.eclipse.cdt.platform.source"/>
67+
<feature id="org.eclipse.cdt.sdk"/>
68+
<feature id="org.eclipse.cdt.source"/>
69+
<feature id="org.eclipse.cdt.testsrunner.feature"/>
70+
<feature id="org.eclipse.e4.rcp"/>
71+
<feature id="org.eclipse.e4.rcp.source"/>
72+
<feature id="org.eclipse.ecf.core.feature"/>
73+
<feature id="org.eclipse.ecf.core.feature.source"/>
74+
<feature id="org.eclipse.ecf.core.ssl.feature"/>
75+
<feature id="org.eclipse.ecf.core.ssl.feature.source"/>
76+
<feature id="org.eclipse.ecf.filetransfer.feature"/>
77+
<feature id="org.eclipse.ecf.filetransfer.feature.source"/>
78+
<feature id="org.eclipse.ecf.filetransfer.httpclient5.feature"/>
79+
<feature id="org.eclipse.ecf.filetransfer.httpclient5.feature.source"/>
80+
<feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>
81+
<feature id="org.eclipse.ecf.filetransfer.ssl.feature.source"/>
82+
<feature id="org.eclipse.emf.common"/>
83+
<feature id="org.eclipse.emf.common.source"/>
84+
<feature id="org.eclipse.emf.databinding"/>
85+
<feature id="org.eclipse.emf.databinding.edit"/>
86+
<feature id="org.eclipse.emf.databinding.edit.source"/>
87+
<feature id="org.eclipse.emf.databinding.source"/>
88+
<feature id="org.eclipse.emf.ecore"/>
89+
<feature id="org.eclipse.emf.ecore.source"/>
90+
<feature id="org.eclipse.emf.edit"/>
91+
<feature id="org.eclipse.emf.edit.source"/>
92+
<feature id="org.eclipse.equinox.p2.core.feature"/>
93+
<feature id="org.eclipse.equinox.p2.core.feature.source"/>
94+
<feature id="org.eclipse.equinox.p2.extras.feature"/>
95+
<feature id="org.eclipse.equinox.p2.extras.feature.source"/>
96+
<feature id="org.eclipse.equinox.p2.rcp.feature"/>
97+
<feature id="org.eclipse.equinox.p2.rcp.feature.source"/>
98+
<feature id="org.eclipse.equinox.p2.user.ui"/>
99+
<feature id="org.eclipse.equinox.p2.user.ui.source"/>
100+
<feature id="org.eclipse.help"/>
101+
<feature id="org.eclipse.help.source"/>
102+
<feature id="org.eclipse.jdt"/>
103+
<feature id="org.eclipse.jdt.source"/>
104+
<feature id="org.eclipse.nebula.widgets.oscilloscope.css.feature"/>
105+
<feature id="org.eclipse.nebula.widgets.oscilloscope.feature"/>
106+
<feature id="org.eclipse.pde"/>
107+
<feature id="org.eclipse.pde.source"/>
108+
<feature id="org.eclipse.platform"/>
109+
<feature id="org.eclipse.platform.source"/>
110+
<feature id="org.eclipse.rcp"/>
111+
<feature id="org.eclipse.rcp.source"/>
112+
<feature id="org.eclipse.remote"/>
113+
<feature id="org.eclipse.sdk"/>
114+
<feature id="org.eclipse.swtbot"/>
115+
<feature id="org.eclipse.swtbot.eclipse"/>
116+
<feature id="org.eclipse.swtbot.forms"/>
117+
<feature id="org.eclipse.tcf.core.feature"/>
118+
<feature id="org.eclipse.tcf.te.feature"/>
119+
<feature id="org.eclipse.tcf.te.tcf.core.feature"/>
120+
<feature id="org.eclipse.tcf.te.tcf.launch.cdt.feature"/>
121+
<feature id="org.eclipse.tm.terminal.connector.local.feature"/>
122+
<feature id="org.eclipse.tm.terminal.connector.ssh.feature"/>
123+
<feature id="org.eclipse.tm.terminal.connector.telnet.feature"/>
124+
<feature id="org.eclipse.tm.terminal.control.feature"/>
125+
<feature id="org.eclipse.tm.terminal.feature"/>
126+
<feature id="org.eclipse.tm.terminal.view.feature"/>
127+
<plugin id="com.google.gson"/>
128+
<plugin id="com.google.gson.source"/>
129+
<plugin id="com.sun.xml.bind"/>
130+
<plugin id="com.sun.xml.bind.source"/>
131+
<plugin id="jakarta.activation"/>
132+
<plugin id="jakarta.activation.source"/>
133+
<plugin id="jakarta.xml.bind"/>
134+
<plugin id="jakarta.xml.bind.source"/>
135+
<plugin id="javax.activation"/>
136+
<plugin id="javax.activation.source"/>
137+
<plugin id="javax.xml"/>
138+
<plugin id="org.apache.commons.compress"/>
139+
<plugin id="org.apache.commons.compress.source"/>
140+
<plugin id="org.apache.commons.io"/>
141+
<plugin id="org.apache.commons.io.source"/>
142+
<plugin id="org.apache.commons.lang"/>
143+
<plugin id="org.apache.commons.lang.source"/>
144+
<plugin id="org.eclipse.cdt.remote.core"/>
145+
<plugin id="org.eclipse.cdt.visualizer.core"/>
146+
<plugin id="org.eclipse.cdt.visualizer.ui"/>
147+
<plugin id="org.eclipse.e4.tools.emf.ui"/>
148+
<plugin id="org.eclipse.e4.tools.emf.ui.source"/>
149+
<plugin id="org.eclipse.e4.tools.services"/>
150+
<plugin id="org.eclipse.e4.tools.services.source"/>
151+
<plugin id="org.eclipse.e4.ui.progress"/>
152+
<plugin id="org.eclipse.e4.ui.progress.source"/>
153+
<plugin id="org.eclipse.launchbar.core"/>
154+
<plugin id="org.eclipse.launchbar.ui"/>
155+
<plugin id="org.eclipse.remote.console"/>
156+
<plugin id="org.eclipse.remote.serial.core"/>
157+
<plugin id="org.eclipse.remote.serial.ui"/>
158+
<plugin id="org.eclipse.remote.telnet.core"/>
159+
<plugin id="org.eclipse.remote.telnet.ui"/>
160+
<plugin id="org.eclipse.tools.templates.core"/>
161+
<plugin id="org.eclipse.tools.templates.freemarker"/>
162+
<plugin id="org.eclipse.tools.templates.ui"/>
163+
<plugin id="org.freemarker"/>
164+
<plugin id="org.freemarker.source"/>
165+
<plugin id="org.hamcrest.library"/>
166+
<plugin id="org.hamcrest.library.source"/>
167+
<plugin id="org.objectweb.asm"/>
168+
<plugin id="org.objectweb.asm.source"/>
169+
<plugin id="org.objectweb.asm.tree"/>
170+
<plugin id="org.objectweb.asm.tree.source"/>
171+
<plugin id="org.osgi.annotation.bundle"/>
172+
<plugin id="org.osgi.annotation.versioning"/>
173+
<plugin id="org.osgi.service.component.annotations"/>
174+
<plugin id="org.sat4j.core"/>
175+
<plugin id="org.sat4j.core.source"/>
176+
<plugin id="org.sat4j.pb"/>
177+
<plugin id="org.sat4j.pb.source"/>
178+
</includeBundles>
72179
</target>

‎io.sloeber.tests/.classpath

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<attribute name="test" value="true"/>
66
</attributes>
77
</classpathentry>
8-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
8+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
99
<attributes>
1010
<attribute name="module" value="true"/>
1111
</attributes>

‎io.sloeber.tests/.settings/org.eclipse.jdt.core.prefs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
4-
org.eclipse.jdt.core.compiler.compliance=17
3+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
4+
org.eclipse.jdt.core.compiler.compliance=11
55
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
66
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
77
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
88
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
99
org.eclipse.jdt.core.compiler.release=enabled
10-
org.eclipse.jdt.core.compiler.source=17
10+
org.eclipse.jdt.core.compiler.source=11

‎io.sloeber.tests/src/io/sloeber/core/UpgradeTest.java

+12-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import org.junit.Test;
1212

1313
import io.sloeber.core.api.Preferences;
14+
import io.sloeber.core.api.SloeberProject;
1415
import io.sloeber.providers.Arduino;
1516

1617
/**
@@ -43,7 +44,9 @@ public void setup() {
4344

4445
@Test
4546
public void upgradeSingleConfigProjectFromVersion4_3_3() throws Exception {
46-
47+
/*
48+
* A arduino uno project is upgraded that need the extra compile option extraCPP
49+
*/
4750
String projectName = "upgradeSingleConfigProject";
4851
String inputZipFile = Shared.getprojectZip("upgradeSingleConfigProject4_3_3.zip").toOSString();
4952
// /io.sloeber.tests/src/projects/upgradeSingleConfigProject4_3_3.zip
@@ -55,8 +58,15 @@ public void upgradeSingleConfigProjectFromVersion4_3_3() throws Exception {
5558
theTestProject.open(null);
5659
Shared.waitForAllJobsToFinish(); // for the indexer
5760
theTestProject.build(IncrementalProjectBuilder.FULL_BUILD, null);
61+
if (!Shared.hasBuildErrors(theTestProject)) {
62+
fail("The project has been automagically upgraded:" + projectName);
63+
}
64+
//try to convert the project
65+
SloeberProject.convertToArduinoProject(theTestProject, null);
66+
Shared.waitForAllJobsToFinish(); // for the indexer
67+
theTestProject.build(IncrementalProjectBuilder.FULL_BUILD, null);
5868
if (Shared.hasBuildErrors(theTestProject)) {
59-
fail("Failed to compile the project:" + projectName);
69+
fail("Failed to compile the upgraded project:" + projectName);
6070
}
6171
}
6272

‎io.sloeber.ui/plugin.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@
218218
icon="icons/convertToSloeber.png"
219219
id="io.sloeber.convert.wizard"
220220
name="Convert to Sloeber project"
221-
project="false">
221+
project="true">
222222
<selection
223223
class="org.eclipse.core.resources.IProject">
224224
</selection>

‎website/WebContent/fragments/install_advice/mac.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ There are some mac fans using Sloeber. Mac support has grown over the years with
88

99
Mac has implemented some rules for download safety that will affect you. [Do not launch from the download location.](http://lapcatsoftware.com/articles/app-translocation.html)
1010

11-
Standard Mac tells you java 8 is latest greatest, but you need 10 or higher since 4.4.0. [Download java 11 from here https://adoptopenjdk.net/](https://adoptopenjdk.net/)
11+
Standard Mac tells you java 8 is latest greatest, but you need 10 or higher since 4.4.0. [Download java 11 from here https://adoptium.net/](https://adoptium.net/)
1212

1313
If you system does not have make in its path the most appropriate solution is to get make in the path.
1414
If you do not have the Make utility on your system: Make comes with xcode and with pre-1.5.7 arduino IDE versions.

‎website/WebContent/stable.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
Arduino eclipse IDE!</p>
6060
<p>The product is the only supported setup!</p>
6161
<p>Sloeber needs java 10 or higher and lower than 16 ! Other java versions will not work!</p>
62-
<P>Download a java from <a href="https://adoptopenjdk.net/" >https://adoptopenjdk.net/</a>
62+
<P>Download a java from <a href="https://adoptium.net/" >https://adoptium.net/</a>
6363
<?php if($os=="win"){echo "<p>The product includes java.</p>";}; ?>
6464
<?php if($os=="mac"){echo "<p>Due to mac new security approach a simple download and extract will not work.</p>";}; ?>
6565
<?php if($os=="mac"){echo "<p>Follow following steps to install.</p>";}; ?>

0 commit comments

Comments
 (0)