Skip to content

Commit

Permalink
Merge pull request #23 from UoY-RoboStar/anthony
Browse files Browse the repository at this point in the history 
Update Java and Xtext
  • Loading branch information
@pefribeiro
pefribeiro authored Jun 26, 2023
2 parents fc0645d + 11b5003 commit ea96f7f
Show file tree
Hide file tree
Showing 18 changed files with 36 additions and 36 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion circus.robocalc.robosim.textual.feature/feature.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="circus.robocalc.robosim.textual.feature"
label="RoboSim Textual Editor"
version="3.0.0.qualifier"
version="3.1.0.qualifier"
provider-name="RoboCalc Project">

<plugin
Expand Down
2 changes: 1 addition & 1 deletion circus.robocalc.robosim.textual.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>circus.robocalc.robosim.textual</groupId>
<artifactId>circus.robocalc.robosim.textual.parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<artifactId>circus.robocalc.robosim.textual.feature</artifactId>
<packaging>eclipse-feature</packaging>
Expand Down
4 changes: 2 additions & 2 deletions circus.robocalc.robosim.textual.ide/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
2 changes: 1 addition & 1 deletion circus.robocalc.robosim.textual.ide/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>circus.robocalc.robosim.textual</groupId>
<artifactId>circus.robocalc.robosim.textual.parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<artifactId>circus.robocalc.robosim.textual.ide</artifactId>
<packaging>eclipse-plugin</packaging>
Expand Down
2 changes: 1 addition & 1 deletion circus.robocalc.robosim.textual.repository/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>circus.robocalc.robosim.textual</groupId>
<artifactId>circus.robocalc.robosim.textual.parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<artifactId>circus.robocalc.robosim.textual.repository</artifactId>
<packaging>eclipse-repository</packaging>
Expand Down
2 changes: 1 addition & 1 deletion circus.robocalc.robosim.textual.target/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>circus.robocalc.robosim.textual</groupId>
<artifactId>circus.robocalc.robosim.textual.parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<artifactId>circus.robocalc.robosim.textual.target</artifactId>
<packaging>eclipse-target-definition</packaging>
Expand Down
4 changes: 2 additions & 2 deletions circus.robocalc.robosim.textual.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
2 changes: 1 addition & 1 deletion circus.robocalc.robosim.textual.tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>circus.robocalc.robosim.textual</groupId>
<artifactId>circus.robocalc.robosim.textual.parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<artifactId>circus.robocalc.robosim.textual.tests</artifactId>
<packaging>eclipse-test-plugin</packaging>
Expand Down
4 changes: 2 additions & 2 deletions circus.robocalc.robosim.textual.ui.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
2 changes: 1 addition & 1 deletion circus.robocalc.robosim.textual.ui.tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>circus.robocalc.robosim.textual</groupId>
<artifactId>circus.robocalc.robosim.textual.parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<artifactId>circus.robocalc.robosim.textual.ui.tests</artifactId>
<packaging>eclipse-test-plugin</packaging>
Expand Down
4 changes: 2 additions & 2 deletions circus.robocalc.robosim.textual.ui/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion circus.robocalc.robosim.textual.ui/plugin.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.0"?>
<?eclipse version="4.22"?>
<plugin>
<extension
point="org.eclipse.ui.editors">
Expand Down
2 changes: 1 addition & 1 deletion circus.robocalc.robosim.textual.ui/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>circus.robocalc.robosim.textual</groupId>
<artifactId>circus.robocalc.robosim.textual.parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<artifactId>circus.robocalc.robosim.textual.ui</artifactId>
<packaging>eclipse-plugin</packaging>
Expand Down
20 changes: 10 additions & 10 deletions circus.robocalc.robosim.textual/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion circus.robocalc.robosim.textual/plugin.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.0"?>
<?eclipse version="4.22"?>
<plugin>
<extension-point id="robosim.generator" name="robosim.generator" schema="schema/robosim.generator.exsd"/>
</plugin>
2 changes: 1 addition & 1 deletion circus.robocalc.robosim.textual/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>circus.robocalc.robosim.textual</groupId>
<artifactId>circus.robocalc.robosim.textual.parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<artifactId>circus.robocalc.robosim.textual</artifactId>
<packaging>eclipse-plugin</packaging>
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>circus.robocalc.robosim.textual</groupId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
<artifactId>circus.robocalc.robosim.textual.parent</artifactId>
<packaging>pom</packaging>

Expand All @@ -13,7 +13,7 @@
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<!-- Tycho settings -->
<tycho-version>1.7.0</tycho-version>
<tycho-version>2.6.0</tycho-version>
<!-- Define overridable properties for tycho-surefire-plugin -->
<platformSystemProperties></platformSystemProperties>
<moduleProperties></moduleProperties>
Expand All @@ -28,7 +28,7 @@
<module>circus.robocalc.robosim.textual.feature</module>
<module>circus.robocalc.robosim.textual.repository</module>
<module>circus.robocalc.robosim.textual.tests</module>
<!--<module>circus.robocalc.robosim.textual.ui.tests</module>-->
<!-- <module>circus.robocalc.robosim.textual.ui.tests</module> -->
</modules>
<dependencyManagement>
<dependencies>
Expand Down Expand Up @@ -303,17 +303,17 @@
<repositories>
<repository>
<id>robochart-metamodel</id>
<url>https://www.cs.york.ac.uk/robostar/robotool/metamodel/update/</url>
<url>https://robostar.cs.york.ac.uk/robotool/metamodel/update/</url>
<layout>p2</layout>
</repository>
<repository>
<id>robochart-textual</id>
<url>https://www.cs.york.ac.uk/robostar/robotool/textual/update/</url>
<url>https://robostar.cs.york.ac.uk/robotool/textual/update/</url>
<layout>p2</layout>
</repository>
<repository>
<id>robosim-metamodel</id>
<url>https://www.cs.york.ac.uk/robostar/robotool/robosim-metamodel/update/</url>
<url>https://robostar.cs.york.ac.uk/robotool/robosim-metamodel/update/</url>
<layout>p2</layout>
</repository>
<repository>
Expand Down

1 comment on commit ea96f7f

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed at: https://robostar.cs.york.ac.uk/robotool/robosim-textual/update_3.1.0.202306260829

Please sign in to comment.