sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-16 00:38:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #310 from eclipse/tycho-update

Browse source 
udpate to tycho 1.0.0
This commit is contained in:
Christian Dietrich 2017-03-27 13:52:52 +02:00 committed by GitHub
commit f06d711965
5 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/pom.xml vendored
View file

@ -7,7 +7,7 @@
<packaging>pom</packaging>
<properties>
<tycho-version>0.25.0</tycho-version>
<tycho-version>1.0.0</tycho-version>
<xtextVersion>unspecified</xtextVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>

2
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/pom.xml vendored
View file

@ -7,7 +7,7 @@
<packaging>pom</packaging>
<properties>
<tycho-version>0.25.0</tycho-version>
<tycho-version>1.0.0</tycho-version>
<xtextVersion>unspecified</xtextVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>

2
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/pom.xml vendored
View file

@ -7,7 +7,7 @@
<packaging>pom</packaging>
<properties>
<tycho-version>0.25.0</tycho-version>
<tycho-version>1.0.0</tycho-version>
<xtextVersion>unspecified</xtextVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>

20
org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend
View file

@ -171,18 +171,18 @@ class ParentProjectDescriptor extends ProjectDescriptor {
}
«ENDIF»
jar {
from('model') {
into('model')
jar {
from('model') {
into('model')
}
«IF config.sourceLayout != SourceLayout.PLAIN»
from(sourceSets.main.allSource) {
include '**/*.xtext'
}
«ENDIF»
manifest {
attributes 'Bundle-SymbolicName': project.name
}
«ENDIF»
manifest {
attributes 'Bundle-SymbolicName': project.name
}
}
plugins.withId('war') {
@ -214,7 +214,7 @@ class ParentProjectDescriptor extends ProjectDescriptor {
buildSection = '''
<properties>
«IF config.needsTychoBuild»
<tycho-version>0.25.0</tycho-version>
<tycho-version>1.0.0</tycho-version>
«ENDIF»
<xtextVersion>«config.xtextVersion»</xtextVersion>
<project.build.sourceEncoding>«config.encoding»</project.build.sourceEncoding>
@ -341,8 +341,8 @@ class ParentProjectDescriptor extends ProjectDescriptor {
<fileset>
«FOR dir : #[Outlet.MAIN_XTEND_GEN, Outlet.TEST_XTEND_GEN].toSet.map[sourceFolder]»
<directory>${basedir}/«dir»</directory>
<includes>
<include>**/*</include>
<includes>
<include>**/*</include>
</includes>
«ENDFOR»
</fileset>

2
org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.java
View file

@ -577,7 +577,7 @@ public class ParentProjectDescriptor extends ProjectDescriptor {
boolean _needsTychoBuild = this.getConfig().needsTychoBuild();
if (_needsTychoBuild) {
_builder.append("\t");
_builder.append("<tycho-version>0.25.0</tycho-version>");
_builder.append("<tycho-version>1.0.0</tycho-version>");
_builder.newLine();
}
}