Skip to content

Commit

Permalink
Update to Xtext 2.25
Browse files Browse the repository at this point in the history
  • Loading branch information
@natzei
natzei committed Apr 2, 2021
1 parent ecdcea1 commit e6201a2
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 17 deletions.
6 changes: 4 additions & 2 deletions xyz.balzaclang.balzac.parent/pom.xml
View file
Expand Up @@ -8,9 +8,11 @@
<packaging>pom</packaging>

<properties>
<xtext-version>2.22.0</xtext-version>
<mwe2Version>2.12.1</mwe2Version>
<xtext-version>2.25.0</xtext-version>
<tycho-version>1.7.0</tycho-version>
<xsemantics-version>1.19.0-SNAPSHOT</xsemantics-version>
<xsemantics-version>1.20.0-SNAPSHOT</xsemantics-version>
<xsemantics-p2-url>http://download.eclipse.org/xsemantics/milestones/1.20</xsemantics-p2-url>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
Expand Down
24 changes: 16 additions & 8 deletions xyz.balzaclang.balzac.target/xyz.balzaclang.balzac.target.target
View file
Expand Up @@ -7,14 +7,22 @@
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xsemantics.runtime.feature.feature.group" version="1.19.0.v20191203-1556"/>
<repository location="http://download.eclipse.org/xsemantics/milestones/1.19"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="http://download.eclipse.org/releases/2020-06"/>
<unit id="org.eclipse.emf.mwe2.runtime.sdk.feature.group" version="2.11.3.v20200520-0756"/>
<unit id="org.eclipse.xtext.sdk.feature.group" version="2.22.0.v20200602-1533"/>
<repository location="http://download.eclipse.org/xsemantics/milestones/1.20"/>
<unit id="org.eclipse.xsemantics.doc.feature.feature.group" version="1.20.0.v20210401-0731"/>
<unit id="org.eclipse.xsemantics.examples.feature.feature.group" version="1.20.0.v20210401-0731"/>
<unit id="org.eclipse.xsemantics.feature.feature.group" version="1.20.0.v20210401-0731"/>
<unit id="org.eclipse.xsemantics.feature.source.feature.group" version="1.20.0.v20210401-0731"/>
<unit id="org.eclipse.xsemantics.implemented.examples.feature.feature.group" version="1.20.0.v20210401-0731"/>
<unit id="org.eclipse.xsemantics.runtime.feature.feature.group" version="1.20.0.v20210401-0731"/>
<unit id="org.eclipse.xsemantics.runtime.feature.source.feature.group" version="1.20.0.v20210401-0731"/>
<unit id="org.eclipse.xsemantics.sdk.feature.group" version="1.20.0.v20210401-0731"/>
<unit id="org.eclipse.xsemantics.sdk.source.feature.group" version="1.20.0.v20210401-0731"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="http://download.eclipse.org/releases/2021-03"/>
<unit id="org.eclipse.emf.mwe2.runtime.sdk.feature.group" version="2.12.1.v20210218-2134"/>
<unit id="org.eclipse.xtext.sdk.feature.group" version="2.25.0.v20210301-1429"/>
</location>
</locations>
</target>
</target>
4 changes: 2 additions & 2 deletions xyz.balzaclang.balzac.web/WebRoot/index.html
View file
Expand Up @@ -8,7 +8,7 @@

<link rel="stylesheet" type="text/css" href="webjars/codemirror/5.49.0/lib/codemirror.css" />
<link rel="stylesheet" type="text/css" href="webjars/codemirror/5.49.0/addon/hint/show-hint.css" />
<link rel="stylesheet" type="text/css" href="xtext/2.22.0/xtext-codemirror.css"/>
<link rel="stylesheet" type="text/css" href="xtext/2.25.0/xtext-codemirror.css"/>

<!-- Loading buttons -->
<link rel="stylesheet" type="text/css" href="loading-btn/loading.css"/>
Expand Down Expand Up @@ -36,7 +36,7 @@
paths: {
"xtext/balzac": "xtext-resources/generated/mode-balzac",
"jquery": "webjars/jquery/3.4.1/jquery.min",
"xtext/xtext-codemirror": "xtext/2.22.0/xtext-codemirror",
"xtext/xtext-codemirror": "xtext/2.25.0/xtext-codemirror",
"bootstrap": "webjars/bootstrap/4.3.1/js/bootstrap.bundle.min",
"bootstrap-toggle": "webjars/bootstrap-toggle/2.2.2/js/bootstrap-toggle.min"
},
Expand Down
4 changes: 2 additions & 2 deletions xyz.balzaclang.balzac/META-INF/MANIFEST.MF
View file
Expand Up @@ -6,9 +6,9 @@ Bundle-Vendor: University of Cagliari
Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: xyz.balzaclang.balzac; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.xtext;bundle-version="2.22.0",
Require-Bundle: org.eclipse.xtext;bundle-version="2.25.0",
org.eclipse.xtext.xbase,
org.eclipse.xsemantics.runtime;bundle-version="1.19.0",
org.eclipse.xsemantics.runtime;bundle-version="1.20.0",
org.eclipse.equinox.security;bundle-version="1.2.300",
org.eclipse.equinox.common;bundle-version="3.9.0",
org.eclipse.emf.ecore,
Expand Down
6 changes: 3 additions & 3 deletions xyz.balzaclang.balzac/pom.xml
View file
Expand Up @@ -35,7 +35,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.4.0</version>
<version>1.6.0</version>
<executions>
<execution>
<id>mwe2Launcher</id>
Expand All @@ -61,7 +61,7 @@
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.mwe2.launch</artifactId>
<version>2.11.3</version>
<version>${mwe2Version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
Expand Down Expand Up @@ -232,7 +232,7 @@
so it needs to resolve xsemantics runtime dependencies from the p2 repository -->
<id>Xsemantics</id>
<layout>p2</layout>
<url>http://download.eclipse.org/xsemantics/milestones/</url>
<url>${xsemantics-p2-url}</url>
</repository>
<repository>
<id>sonatype_releases</id>
Expand Down

0 comments on commit e6201a2

Please sign in to comment.