From b9e043a110065e74afd314f4fd36f728a511ff76 Mon Sep 17 00:00:00 2001 From: Anthony Moulds <37540211+armoulds@users.noreply.github.com> Date: Wed, 19 Apr 2023 12:57:06 +0100 Subject: [PATCH 01/14] version 3.1.0 update --- README.md | 2 +- pom.xml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 1eeaf99..9868b5e 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ This repository contains the plugins for the RoboSim textual editor. ### Development platform requirements ### -* Eclipse 2020-03 (or above) +* Eclipse 2021-12 * Sirius 6.2.0 http://download.eclipse.org/sirius/updates/releases/6.2.0/2018-12 * Xtext 2.25.0 (at least 2.23.0 or above) can be found in the standard repository in http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/ but the option "Show only the latest versions of available software" needs to be unchecked. * Maven diff --git a/pom.xml b/pom.xml index 245c86d..4983f8c 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 circus.robocalc.robosim.textual - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT circus.robocalc.robosim.textual.parent pom @@ -13,7 +13,7 @@ 11 11 - 1.7.0 + 2.6.0 @@ -28,7 +28,7 @@ circus.robocalc.robosim.textual.feature circus.robocalc.robosim.textual.repository circus.robocalc.robosim.textual.tests - + @@ -303,17 +303,17 @@ robochart-metamodel - https://www.cs.york.ac.uk/robostar/robotool/metamodel/update/ + https://robostar.cs.york.ac.uk/robotool/metamodel/update/ p2 robochart-textual - https://www.cs.york.ac.uk/robostar/robotool/textual/update/ + https://robostar.cs.york.ac.uk/robotool/textual/update/ p2 robosim-metamodel - https://www.cs.york.ac.uk/robostar/robotool/robosim-metamodel/update/ + https://robostar.cs.york.ac.uk/robotool/robosim-metamodel/update/ p2 From d8d1c374a7461dd8a65d7eff049d1e62db318410 Mon Sep 17 00:00:00 2001 From: Anthony Moulds <37540211+armoulds@users.noreply.github.com> Date: Wed, 19 Apr 2023 12:58:29 +0100 Subject: [PATCH 02/14] version 3.1.0 update --- circus.robocalc.robosim.textual.feature/feature.xml | 2 +- circus.robocalc.robosim.textual.feature/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/circus.robocalc.robosim.textual.feature/feature.xml b/circus.robocalc.robosim.textual.feature/feature.xml index 68b586f..6ba468e 100644 --- a/circus.robocalc.robosim.textual.feature/feature.xml +++ b/circus.robocalc.robosim.textual.feature/feature.xml @@ -2,7 +2,7 @@ circus.robocalc.robosim.textual circus.robocalc.robosim.textual.parent - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT circus.robocalc.robosim.textual.feature eclipse-feature From 7a54ede03f6fb181441f2993a1deeacce6b4d844 Mon Sep 17 00:00:00 2001 From: Anthony Moulds <37540211+armoulds@users.noreply.github.com> Date: Wed, 19 Apr 2023 12:59:06 +0100 Subject: [PATCH 03/14] version 3.1.0 update --- circus.robocalc.robosim.textual.ide/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circus.robocalc.robosim.textual.ide/pom.xml b/circus.robocalc.robosim.textual.ide/pom.xml index 95d8004..305ba0d 100644 --- a/circus.robocalc.robosim.textual.ide/pom.xml +++ b/circus.robocalc.robosim.textual.ide/pom.xml @@ -4,7 +4,7 @@ circus.robocalc.robosim.textual circus.robocalc.robosim.textual.parent - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT circus.robocalc.robosim.textual.ide eclipse-plugin From e24ed0d25008bcd2b9ee3d7144452632ad62b414 Mon Sep 17 00:00:00 2001 From: Anthony Moulds <37540211+armoulds@users.noreply.github.com> Date: Wed, 19 Apr 2023 12:59:34 +0100 Subject: [PATCH 04/14] version 3.1.0 update --- circus.robocalc.robosim.textual.ide/META-INF/MANIFEST.MF | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/circus.robocalc.robosim.textual.ide/META-INF/MANIFEST.MF b/circus.robocalc.robosim.textual.ide/META-INF/MANIFEST.MF index 580b5af..175f283 100644 --- a/circus.robocalc.robosim.textual.ide/META-INF/MANIFEST.MF +++ b/circus.robocalc.robosim.textual.ide/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Automatic-Module-Name: circus.robocalc.robosim.textual.ide Bundle-ManifestVersion: 2 Bundle-Name: RoboSim Textual Editor IDE Plugin Bundle-Vendor: RoboCalc Project -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.1.0.qualifier Bundle-SymbolicName: circus.robocalc.robosim.textual.ide; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: circus.robocalc.robosim.textual, @@ -12,6 +12,6 @@ Require-Bundle: circus.robocalc.robosim.textual, org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", circus.robocalc.robochart.textual;bundle-version="3.0.0", circus.robocalc.robosim;bundle-version="2.0.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: circus.robocalc.robosim.textual.ide.contentassist.antlr.internal, circus.robocalc.robosim.textual.ide.contentassist.antlr From 3481acca78f881f63ae7c5c1414fda776180ff4a Mon Sep 17 00:00:00 2001 From: Anthony Moulds <37540211+armoulds@users.noreply.github.com> Date: Wed, 19 Apr 2023 13:00:13 +0100 Subject: [PATCH 05/14] version 3.1.0 update --- circus.robocalc.robosim.textual.repository/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circus.robocalc.robosim.textual.repository/pom.xml b/circus.robocalc.robosim.textual.repository/pom.xml index 389f75a..7c93de9 100644 --- a/circus.robocalc.robosim.textual.repository/pom.xml +++ b/circus.robocalc.robosim.textual.repository/pom.xml @@ -4,7 +4,7 @@ circus.robocalc.robosim.textual circus.robocalc.robosim.textual.parent - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT circus.robocalc.robosim.textual.repository eclipse-repository From 1d41763ce98648a35b29b9408582ea71ebdddd16 Mon Sep 17 00:00:00 2001 From: Anthony Moulds <37540211+armoulds@users.noreply.github.com> Date: Wed, 19 Apr 2023 13:05:51 +0100 Subject: [PATCH 06/14] version 3.1.0 update --- circus.robocalc.robosim.textual.target/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circus.robocalc.robosim.textual.target/pom.xml b/circus.robocalc.robosim.textual.target/pom.xml index f974f85..6c96052 100644 --- a/circus.robocalc.robosim.textual.target/pom.xml +++ b/circus.robocalc.robosim.textual.target/pom.xml @@ -4,7 +4,7 @@ circus.robocalc.robosim.textual circus.robocalc.robosim.textual.parent - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT circus.robocalc.robosim.textual.target eclipse-target-definition From 88ca132c2de3ffb0cfafa84e9f0f92b5d0e25b2b Mon Sep 17 00:00:00 2001 From: Anthony Moulds <37540211+armoulds@users.noreply.github.com> Date: Wed, 19 Apr 2023 13:06:30 +0100 Subject: [PATCH 07/14] version 3.1.0 update --- circus.robocalc.robosim.textual.tests/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circus.robocalc.robosim.textual.tests/pom.xml b/circus.robocalc.robosim.textual.tests/pom.xml index 58074cd..e8054d9 100644 --- a/circus.robocalc.robosim.textual.tests/pom.xml +++ b/circus.robocalc.robosim.textual.tests/pom.xml @@ -4,7 +4,7 @@ circus.robocalc.robosim.textual circus.robocalc.robosim.textual.parent - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT circus.robocalc.robosim.textual.tests eclipse-test-plugin From 7e35405038a37ef299bc45ac193dcd1ea3138a7b Mon Sep 17 00:00:00 2001 From: Anthony Moulds <37540211+armoulds@users.noreply.github.com> Date: Wed, 19 Apr 2023 13:06:59 +0100 Subject: [PATCH 08/14] version 3.1.0 update --- circus.robocalc.robosim.textual.tests/META-INF/MANIFEST.MF | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/circus.robocalc.robosim.textual.tests/META-INF/MANIFEST.MF b/circus.robocalc.robosim.textual.tests/META-INF/MANIFEST.MF index bcd02f9..a0f1be4 100644 --- a/circus.robocalc.robosim.textual.tests/META-INF/MANIFEST.MF +++ b/circus.robocalc.robosim.textual.tests/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Automatic-Module-Name: circus.robocalc.robosim.textual.tests Bundle-ManifestVersion: 2 Bundle-Name: RoboSim Textual Editor Tests Bundle-Vendor: RoboCalc Project -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.1.0.qualifier Bundle-SymbolicName: circus.robocalc.robosim.textual.tests; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: circus.robocalc.robosim.textual, @@ -12,5 +12,5 @@ Require-Bundle: circus.robocalc.robosim.textual, org.eclipse.xtext.testing, org.eclipse.xtext.xbase.testing, org.eclipse.xtext.xbase.lib;bundle-version="2.14.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: circus.robocalc.robosim.textual.tests;x-internal=true From 27d25bf65f0b05cd4e6baadbe9381a8c3d000fce Mon Sep 17 00:00:00 2001 From: Anthony Moulds <37540211+armoulds@users.noreply.github.com> Date: Wed, 19 Apr 2023 13:07:41 +0100 Subject: [PATCH 09/14] version 3.1.0 update --- circus.robocalc.robosim.textual.ui.tests/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circus.robocalc.robosim.textual.ui.tests/pom.xml b/circus.robocalc.robosim.textual.ui.tests/pom.xml index bd4cf4e..263da9d 100644 --- a/circus.robocalc.robosim.textual.ui.tests/pom.xml +++ b/circus.robocalc.robosim.textual.ui.tests/pom.xml @@ -4,7 +4,7 @@ circus.robocalc.robosim.textual circus.robocalc.robosim.textual.parent - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT circus.robocalc.robosim.textual.ui.tests eclipse-test-plugin From 6cf77dbbc494e378505774fec703823369ecc1a6 Mon Sep 17 00:00:00 2001 From: Anthony Moulds <37540211+armoulds@users.noreply.github.com> Date: Wed, 19 Apr 2023 13:08:12 +0100 Subject: [PATCH 10/14] version 3.1.0 update --- circus.robocalc.robosim.textual.ui.tests/META-INF/MANIFEST.MF | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/circus.robocalc.robosim.textual.ui.tests/META-INF/MANIFEST.MF b/circus.robocalc.robosim.textual.ui.tests/META-INF/MANIFEST.MF index 9ffd5e8..8266af8 100644 --- a/circus.robocalc.robosim.textual.ui.tests/META-INF/MANIFEST.MF +++ b/circus.robocalc.robosim.textual.ui.tests/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Automatic-Module-Name: circus.robocalc.robosim.textual.ui.tests Bundle-ManifestVersion: 2 Bundle-Name: RoboSim Textual Editor UI Tests Bundle-Vendor: RoboCalc Project -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.1.0.qualifier Bundle-SymbolicName: circus.robocalc.robosim.textual.ui.tests; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: circus.robocalc.robosim.textual.ui, @@ -16,5 +16,5 @@ Require-Bundle: circus.robocalc.robosim.textual.ui, org.eclipse.core.runtime, org.eclipse.ui.workbench;resolution:=optional, org.eclipse.xtext.ui.testing -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: circus.robocalc.robosim.textual.ui.tests;x-internal=true From 14eebb93c44026d0d28824c6e27ba4d651ad8394 Mon Sep 17 00:00:00 2001 From: Anthony Moulds <37540211+armoulds@users.noreply.github.com> Date: Wed, 19 Apr 2023 13:09:04 +0100 Subject: [PATCH 11/14] version 3.1.0 update --- circus.robocalc.robosim.textual.ui/plugin.xml | 2 +- circus.robocalc.robosim.textual.ui/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/circus.robocalc.robosim.textual.ui/plugin.xml b/circus.robocalc.robosim.textual.ui/plugin.xml index 9a08aef..2da354a 100644 --- a/circus.robocalc.robosim.textual.ui/plugin.xml +++ b/circus.robocalc.robosim.textual.ui/plugin.xml @@ -1,5 +1,5 @@ - + diff --git a/circus.robocalc.robosim.textual.ui/pom.xml b/circus.robocalc.robosim.textual.ui/pom.xml index 75f19af..1dc9a56 100644 --- a/circus.robocalc.robosim.textual.ui/pom.xml +++ b/circus.robocalc.robosim.textual.ui/pom.xml @@ -4,7 +4,7 @@ circus.robocalc.robosim.textual circus.robocalc.robosim.textual.parent - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT circus.robocalc.robosim.textual.ui eclipse-plugin From 760a6fa60c56d973f0fca9e9aed90e5ae41ef075 Mon Sep 17 00:00:00 2001 From: Anthony Moulds <37540211+armoulds@users.noreply.github.com> Date: Wed, 19 Apr 2023 13:09:29 +0100 Subject: [PATCH 12/14] version 3.1.0 update --- circus.robocalc.robosim.textual.ui/META-INF/MANIFEST.MF | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/circus.robocalc.robosim.textual.ui/META-INF/MANIFEST.MF b/circus.robocalc.robosim.textual.ui/META-INF/MANIFEST.MF index c620916..5293fd9 100644 --- a/circus.robocalc.robosim.textual.ui/META-INF/MANIFEST.MF +++ b/circus.robocalc.robosim.textual.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Automatic-Module-Name: circus.robocalc.robosim.textual.ui Bundle-ManifestVersion: 2 Bundle-Name: RoboSim Textual Editor UI Plugin Bundle-Vendor: RoboCalc Project -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.1.0.qualifier Bundle-SymbolicName: circus.robocalc.robosim.textual.ui; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: circus.robocalc.robosim.textual, @@ -21,7 +21,7 @@ Require-Bundle: circus.robocalc.robosim.textual, org.eclipse.xtend.lib;bundle-version="2.14.0";resolution:=optional, circus.robocalc.robochart.textual.ui;bundle-version="3.0.0" Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: circus.robocalc.robosim.textual.ui.quickfix, circus.robocalc.robosim.textual.ui.contentassist, circus.robocalc.robosim.textual.ui.internal From 9fda6b2f7be696927a0f70a9de2a54fc26587003 Mon Sep 17 00:00:00 2001 From: Anthony Moulds <37540211+armoulds@users.noreply.github.com> Date: Wed, 19 Apr 2023 13:11:34 +0100 Subject: [PATCH 13/14] version 3.1.0 update --- circus.robocalc.robosim.textual/plugin.xml | 2 +- circus.robocalc.robosim.textual/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/circus.robocalc.robosim.textual/plugin.xml b/circus.robocalc.robosim.textual/plugin.xml index f99f13b..4232dbe 100644 --- a/circus.robocalc.robosim.textual/plugin.xml +++ b/circus.robocalc.robosim.textual/plugin.xml @@ -1,5 +1,5 @@ - + diff --git a/circus.robocalc.robosim.textual/pom.xml b/circus.robocalc.robosim.textual/pom.xml index 1e5de68..76603f8 100644 --- a/circus.robocalc.robosim.textual/pom.xml +++ b/circus.robocalc.robosim.textual/pom.xml @@ -4,7 +4,7 @@ circus.robocalc.robosim.textual circus.robocalc.robosim.textual.parent - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT circus.robocalc.robosim.textual eclipse-plugin From 11b5003c8a130bdfc6e378d9adc8047f3695b09c Mon Sep 17 00:00:00 2001 From: Anthony Moulds <37540211+armoulds@users.noreply.github.com> Date: Wed, 19 Apr 2023 13:14:14 +0100 Subject: [PATCH 14/14] version 3.1.0 update --- .../META-INF/MANIFEST.MF | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/circus.robocalc.robosim.textual/META-INF/MANIFEST.MF b/circus.robocalc.robosim.textual/META-INF/MANIFEST.MF index a527fbd..3d7f698 100644 --- a/circus.robocalc.robosim.textual/META-INF/MANIFEST.MF +++ b/circus.robocalc.robosim.textual/META-INF/MANIFEST.MF @@ -3,30 +3,30 @@ Automatic-Module-Name: circus.robocalc.robosim.textual Bundle-ManifestVersion: 2 Bundle-Name: RoboSim Textual Editor Plugin Bundle-Vendor: RoboCalc Project -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.1.0.qualifier Bundle-SymbolicName: circus.robocalc.robosim.textual; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.xtext;bundle-version="2.23.0", +Require-Bundle: org.eclipse.xtext;bundle-version="2.25.0", org.eclipse.xtext.xbase, org.eclipse.equinox.common;bundle-version="3.5.0", - circus.robocalc.robochart.textual;bundle-version="2.0.0", + circus.robocalc.robochart.textual;bundle-version="3.0.0", org.eclipse.emf.ecore, - org.eclipse.xtext.xbase.lib;bundle-version="2.14.0", + org.eclipse.xtext.xbase.lib;bundle-version="2.25.0", org.eclipse.xtext.util, org.eclipse.emf.common, - org.eclipse.xtend.lib;bundle-version="2.14.0", + org.eclipse.xtend.lib;bundle-version="2.25.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", circus.robocalc.robosim;bundle-version="2.0.0", - org.eclipse.core.runtime;bundle-version="3.15.200" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 + org.eclipse.core.runtime;bundle-version="3.14.0" +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: circus.robocalc.robosim.textual, circus.robocalc.robosim.textual.formatting2, circus.robocalc.robosim.textual.generator, - circus.robocalc.robosim.textual.parser.antlr, - circus.robocalc.robosim.textual.parser.antlr.internal, circus.robocalc.robosim.textual.scoping, circus.robocalc.robosim.textual.serializer, circus.robocalc.robosim.textual.services, circus.robocalc.robosim.textual.validation, - robosim + robosim, + circus.robocalc.robosim.textual.parser.antlr.internal, + circus.robocalc.robosim.textual.parser.antlr Import-Package: org.apache.log4j