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

Update Wizard to deal with upcoming Gradle plugin changes

Browse source
This commit is contained in:
Stefan Oehme 2021-08-30 15:54:15 +02:00 committed by Christian Dietrich
parent 3a9bec3f1d
commit 0b2a6a1686
3 changed files with 79 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
org.eclipse.xtext.util/src/org/eclipse/xtext/util/XtextVersion.java
View file

@ -41,11 +41,11 @@ public class XtextVersion {
public static XtextVersion getCurrent() {
String versionFromManifest = XtextVersion.readVersionFromManifest();
return new XtextVersion(versionFromManifest != null ? versionFromManifest : "unknown");
return new XtextVersion(versionFromManifest != null ? versionFromManifest : "unknown");
}
public String getXtextGradlePluginVersion() {
return "2.1.0";
return "3.0.0";
}
/**
@ -54,7 +54,7 @@ public class XtextVersion {
public String getMweVersion() {
return "2.12.2.M1";
}
/**
* @noreference
*/

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

@ -16,19 +16,19 @@ import org.eclipse.xtext.util.JavaVersion
@FinalFieldsConstructor
class ParentProjectDescriptor extends ProjectDescriptor {
String nameQualifier = '.parent'
override getNameQualifier() {
nameQualifier
}
def void setNameQualifier(String nameQualifier) {
this.nameQualifier = nameQualifier
}
override isEnabled() {
config.needsGradleBuild || config.needsMavenBuild || config.projectLayout == ProjectLayout.HIERARCHICAL
}
override setEnabled(boolean enabled) {
throw new UnsupportedOperationException("The parent project is automatically enabled depending on the build system")
}
@ -40,11 +40,11 @@ class ParentProjectDescriptor extends ProjectDescriptor {
override isEclipsePluginProject() {
false
}
override isPartOfGradleBuild() {
true
}
override isPartOfMavenBuild() {
true
}
@ -64,19 +64,19 @@ class ParentProjectDescriptor extends ProjectDescriptor {
}
return files
}
def String getJavaVersion() {
config.javaVersion.qualifier
config.javaVersion.qualifier
}
def String getTychoVersion() {
'2.5.0'
}
def String getTychoVersionJ8() {
'1.7.0'
}
def private CharSequence loadResource(String resourcePath) {
Resources.toString(class.classLoader.getResource(resourcePath), Charsets.ISO_8859_1)
}
@ -93,7 +93,7 @@ class ParentProjectDescriptor extends ProjectDescriptor {
classpath 'org.xtext:xtext-gradle-plugin:«config.xtextVersion.xtextGradlePluginVersion»'
}
}
subprojects {
ext.xtextVersion = '«config.xtextVersion»'
repositories {
@ -104,7 +104,7 @@ class ParentProjectDescriptor extends ProjectDescriptor {
}
«ENDIF»
}
apply plugin: 'java-library'
dependencies {
api platform("org.eclipse.xtext:xtext-dev-bom:${xtextVersion}")
@ -113,13 +113,13 @@ class ParentProjectDescriptor extends ProjectDescriptor {
apply plugin: 'org.xtext.xtend'
apply from: "${rootDir}/gradle/source-layout.gradle"
apply plugin: 'eclipse'
group = '«config.baseName»'
version = '1.0.0-SNAPSHOT'
sourceCompatibility = '«javaVersion»'
targetCompatibility = '«javaVersion»'
configurations.all {
exclude group: 'asm'
}
@ -133,7 +133,7 @@ class ParentProjectDescriptor extends ProjectDescriptor {
«IF config.projectLayout == ProjectLayout.FLAT»includeFlat«ELSE»include«ENDIF» '«p.name»'
«ENDFOR»
'''
def sourceLayoutGradle() '''
«IF config.sourceLayout == SourceLayout.PLAIN»
if (name.endsWith(".tests")) {
@ -143,7 +143,7 @@ class ParentProjectDescriptor extends ProjectDescriptor {
resources.srcDirs = []
}
test {
java.srcDirs = ['«Outlet.TEST_JAVA.sourceFolder»', '«Outlet.TEST_SRC_GEN.sourceFolder»']
java.srcDirs = ['«Outlet.TEST_JAVA.sourceFolder»', '«Outlet.TEST_SRC_GEN.sourceFolder»', '«Outlet.MAIN_XTEND_GEN.sourceFolder»']
resources.srcDirs = ['«Outlet.TEST_RESOURCES.sourceFolder»', '«Outlet.TEST_SRC_GEN.sourceFolder»']
xtendOutputDir = '«Outlet.TEST_XTEND_GEN.sourceFolder»'
}
@ -151,7 +151,7 @@ class ParentProjectDescriptor extends ProjectDescriptor {
} else {
sourceSets {
main {
java.srcDirs = ['«Outlet.MAIN_JAVA.sourceFolder»', '«Outlet.MAIN_SRC_GEN.sourceFolder»']
java.srcDirs = ['«Outlet.MAIN_JAVA.sourceFolder»', '«Outlet.MAIN_SRC_GEN.sourceFolder»', '«Outlet.TEST_XTEND_GEN.sourceFolder»']
resources.srcDirs = ['«Outlet.MAIN_RESOURCES.sourceFolder»', '«Outlet.MAIN_SRC_GEN.sourceFolder»']
xtendOutputDir = '«Outlet.MAIN_XTEND_GEN.sourceFolder»'
}
@ -161,25 +161,25 @@ class ParentProjectDescriptor extends ProjectDescriptor {
}
}
}
sourceSets.all {
resources.exclude '**/*.g', '**/*.mwe2', '**/*.xtend', '**/*._trace'
}
«ELSE»
sourceSets {
main {
java.srcDirs = ['«Outlet.MAIN_JAVA.sourceFolder»', '«Outlet.MAIN_SRC_GEN.sourceFolder»']
resources.srcDirs = ['«Outlet.MAIN_RESOURCES.sourceFolder»', '«Outlet.MAIN_SRC_GEN.sourceFolder»']
java.srcDir '«Outlet.MAIN_SRC_GEN.sourceFolder»'
resources.srcDir '«Outlet.MAIN_SRC_GEN.sourceFolder»'
xtendOutputDir = '«Outlet.MAIN_XTEND_GEN.sourceFolder»'
}
test {
java.srcDirs = ['«Outlet.TEST_JAVA.sourceFolder»', '«Outlet.TEST_SRC_GEN.sourceFolder»']
resources.srcDirs = ['«Outlet.TEST_RESOURCES.sourceFolder»', '«Outlet.TEST_SRC_GEN.sourceFolder»']
java.srcDir '«Outlet.TEST_SRC_GEN.sourceFolder»'
resources.srcDir '«Outlet.TEST_SRC_GEN.sourceFolder»'
xtendOutputDir = '«Outlet.TEST_XTEND_GEN.sourceFolder»'
}
}
«ENDIF»
jar {
from('model') {
into('model')
@ -193,12 +193,12 @@ class ParentProjectDescriptor extends ProjectDescriptor {
attributes 'Bundle-SymbolicName': project.name
}
}
plugins.withId('war') {
webAppDirName = "«Outlet.WEBAPP.sourceFolder»"
}
'''
@Deprecated
def CharSequence mavenDeploymentGradle() {
throw new UnsupportedOperationException("Removed with 2.17")
@ -330,8 +330,8 @@ class ParentProjectDescriptor extends ProjectDescriptor {
<id>org.eclipse.xtext.logging</id>
<versionRange>1.2.15</versionRange>
</requirement>
<!-- to get the org.eclipse.osgi.compatibility.state plugin if the target
platform is Luna or later. (backward compatible with kepler and previous
<!-- to get the org.eclipse.osgi.compatibility.state plugin if the target
platform is Luna or later. (backward compatible with kepler and previous
versions) see https://bugs.eclipse.org/bugs/show_bug.cgi?id=492149 -->
<requirement>
<type>eclipse-feature</type>
@ -491,7 +491,7 @@ class ParentProjectDescriptor extends ProjectDescriptor {
</plugin>
«IF config.needsTychoBuild»
<plugin>
<!--
<!--
Can be removed after first generator execution
https://bugs.eclipse.org/bugs/show_bug.cgi?id=480097
-->
@ -596,9 +596,9 @@ class ParentProjectDescriptor extends ProjectDescriptor {
'''
]
}
override getSourceFolders() {
#{}
}
}

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

@ -187,7 +187,6 @@ public class ParentProjectDescriptor extends ProjectDescriptor {
_builder.append("\t");
_builder.append("}");
_builder.newLine();
_builder.append("\t");
_builder.newLine();
_builder.append("\t");
_builder.append("apply plugin: \'java-library\'");
@ -211,7 +210,6 @@ public class ParentProjectDescriptor extends ProjectDescriptor {
_builder.append("\t");
_builder.append("apply plugin: \'eclipse\'");
_builder.newLine();
_builder.append("\t");
_builder.newLine();
_builder.append("\t");
_builder.append("group = \'");
@ -222,7 +220,6 @@ public class ParentProjectDescriptor extends ProjectDescriptor {
_builder.append("\t");
_builder.append("version = \'1.0.0-SNAPSHOT\'");
_builder.newLine();
_builder.append("\t");
_builder.newLine();
_builder.append("\t");
_builder.append("sourceCompatibility = \'");
@ -236,7 +233,6 @@ public class ParentProjectDescriptor extends ProjectDescriptor {
_builder.append(_javaVersion_1, "\t");
_builder.append("\'");
_builder.newLineIfNotEmpty();
_builder.append("\t");
_builder.newLine();
_builder.append("\t");
_builder.append("configurations.all {");
@ -314,21 +310,24 @@ public class ParentProjectDescriptor extends ProjectDescriptor {
_builder.append("\', \'");
String _sourceFolder_1 = this.sourceFolder(Outlet.TEST_SRC_GEN);
_builder.append(_sourceFolder_1, "\t\t\t");
_builder.append("\', \'");
String _sourceFolder_2 = this.sourceFolder(Outlet.MAIN_XTEND_GEN);
_builder.append(_sourceFolder_2, "\t\t\t");
_builder.append("\']");
_builder.newLineIfNotEmpty();
_builder.append("\t\t\t");
_builder.append("resources.srcDirs = [\'");
String _sourceFolder_2 = this.sourceFolder(Outlet.TEST_RESOURCES);
_builder.append(_sourceFolder_2, "\t\t\t");
_builder.append("\', \'");
String _sourceFolder_3 = this.sourceFolder(Outlet.TEST_SRC_GEN);
String _sourceFolder_3 = this.sourceFolder(Outlet.TEST_RESOURCES);
_builder.append(_sourceFolder_3, "\t\t\t");
_builder.append("\', \'");
String _sourceFolder_4 = this.sourceFolder(Outlet.TEST_SRC_GEN);
_builder.append(_sourceFolder_4, "\t\t\t");
_builder.append("\']");
_builder.newLineIfNotEmpty();
_builder.append("\t\t\t");
_builder.append("xtendOutputDir = \'");
String _sourceFolder_4 = this.sourceFolder(Outlet.TEST_XTEND_GEN);
_builder.append(_sourceFolder_4, "\t\t\t");
String _sourceFolder_5 = this.sourceFolder(Outlet.TEST_XTEND_GEN);
_builder.append(_sourceFolder_5, "\t\t\t");
_builder.append("\'");
_builder.newLineIfNotEmpty();
_builder.append("\t\t");
@ -347,26 +346,29 @@ public class ParentProjectDescriptor extends ProjectDescriptor {
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("java.srcDirs = [\'");
String _sourceFolder_5 = this.sourceFolder(Outlet.MAIN_JAVA);
_builder.append(_sourceFolder_5, "\t\t\t");
_builder.append("\', \'");
String _sourceFolder_6 = this.sourceFolder(Outlet.MAIN_SRC_GEN);
String _sourceFolder_6 = this.sourceFolder(Outlet.MAIN_JAVA);
_builder.append(_sourceFolder_6, "\t\t\t");
_builder.append("\']");
_builder.newLineIfNotEmpty();
_builder.append("\t\t\t");
_builder.append("resources.srcDirs = [\'");
String _sourceFolder_7 = this.sourceFolder(Outlet.MAIN_RESOURCES);
_builder.append("\', \'");
String _sourceFolder_7 = this.sourceFolder(Outlet.MAIN_SRC_GEN);
_builder.append(_sourceFolder_7, "\t\t\t");
_builder.append("\', \'");
String _sourceFolder_8 = this.sourceFolder(Outlet.MAIN_SRC_GEN);
String _sourceFolder_8 = this.sourceFolder(Outlet.TEST_XTEND_GEN);
_builder.append(_sourceFolder_8, "\t\t\t");
_builder.append("\']");
_builder.newLineIfNotEmpty();
_builder.append("\t\t\t");
_builder.append("xtendOutputDir = \'");
String _sourceFolder_9 = this.sourceFolder(Outlet.MAIN_XTEND_GEN);
_builder.append("resources.srcDirs = [\'");
String _sourceFolder_9 = this.sourceFolder(Outlet.MAIN_RESOURCES);
_builder.append(_sourceFolder_9, "\t\t\t");
_builder.append("\', \'");
String _sourceFolder_10 = this.sourceFolder(Outlet.MAIN_SRC_GEN);
_builder.append(_sourceFolder_10, "\t\t\t");
_builder.append("\']");
_builder.newLineIfNotEmpty();
_builder.append("\t\t\t");
_builder.append("xtendOutputDir = \'");
String _sourceFolder_11 = this.sourceFolder(Outlet.MAIN_XTEND_GEN);
_builder.append(_sourceFolder_11, "\t\t\t");
_builder.append("\'");
_builder.newLineIfNotEmpty();
_builder.append("\t\t");
@ -404,22 +406,16 @@ public class ParentProjectDescriptor extends ProjectDescriptor {
_builder.append("main {");
_builder.newLine();
_builder.append("\t\t");
_builder.append("java.srcDirs = [\'");
String _sourceFolder_10 = this.sourceFolder(Outlet.MAIN_JAVA);
_builder.append(_sourceFolder_10, "\t\t");
_builder.append("\', \'");
String _sourceFolder_11 = this.sourceFolder(Outlet.MAIN_SRC_GEN);
_builder.append(_sourceFolder_11, "\t\t");
_builder.append("\']");
_builder.append("java.srcDir \'");
String _sourceFolder_12 = this.sourceFolder(Outlet.MAIN_SRC_GEN);
_builder.append(_sourceFolder_12, "\t\t");
_builder.append("\'");
_builder.newLineIfNotEmpty();
_builder.append("\t\t");
_builder.append("resources.srcDirs = [\'");
String _sourceFolder_12 = this.sourceFolder(Outlet.MAIN_RESOURCES);
_builder.append(_sourceFolder_12, "\t\t");
_builder.append("\', \'");
_builder.append("resources.srcDir \'");
String _sourceFolder_13 = this.sourceFolder(Outlet.MAIN_SRC_GEN);
_builder.append(_sourceFolder_13, "\t\t");
_builder.append("\']");
_builder.append("\'");
_builder.newLineIfNotEmpty();
_builder.append("\t\t");
_builder.append("xtendOutputDir = \'");
@ -434,27 +430,21 @@ public class ParentProjectDescriptor extends ProjectDescriptor {
_builder.append("test {");
_builder.newLine();
_builder.append("\t\t");
_builder.append("java.srcDirs = [\'");
String _sourceFolder_15 = this.sourceFolder(Outlet.TEST_JAVA);
_builder.append("java.srcDir \'");
String _sourceFolder_15 = this.sourceFolder(Outlet.TEST_SRC_GEN);
_builder.append(_sourceFolder_15, "\t\t");
_builder.append("\', \'");
String _sourceFolder_16 = this.sourceFolder(Outlet.TEST_SRC_GEN);
_builder.append(_sourceFolder_16, "\t\t");
_builder.append("\']");
_builder.append("\'");
_builder.newLineIfNotEmpty();
_builder.append("\t\t");
_builder.append("resources.srcDirs = [\'");
String _sourceFolder_17 = this.sourceFolder(Outlet.TEST_RESOURCES);
_builder.append(_sourceFolder_17, "\t\t");
_builder.append("\', \'");
String _sourceFolder_18 = this.sourceFolder(Outlet.TEST_SRC_GEN);
_builder.append(_sourceFolder_18, "\t\t");
_builder.append("\']");
_builder.append("resources.srcDir \'");
String _sourceFolder_16 = this.sourceFolder(Outlet.TEST_SRC_GEN);
_builder.append(_sourceFolder_16, "\t\t");
_builder.append("\'");
_builder.newLineIfNotEmpty();
_builder.append("\t\t");
_builder.append("xtendOutputDir = \'");
String _sourceFolder_19 = this.sourceFolder(Outlet.TEST_XTEND_GEN);
_builder.append(_sourceFolder_19, "\t\t");
String _sourceFolder_17 = this.sourceFolder(Outlet.TEST_XTEND_GEN);
_builder.append(_sourceFolder_17, "\t\t");
_builder.append("\'");
_builder.newLineIfNotEmpty();
_builder.append("\t");
@ -508,8 +498,8 @@ public class ParentProjectDescriptor extends ProjectDescriptor {
_builder.newLine();
_builder.append("\t");
_builder.append("webAppDirName = \"");
String _sourceFolder_20 = this.sourceFolder(Outlet.WEBAPP);
_builder.append(_sourceFolder_20, "\t");
String _sourceFolder_18 = this.sourceFolder(Outlet.WEBAPP);
_builder.append(_sourceFolder_18, "\t");
_builder.append("\"");
_builder.newLineIfNotEmpty();
_builder.append("}");
@ -1048,11 +1038,11 @@ public class ParentProjectDescriptor extends ProjectDescriptor {
_builder.newLine();
_builder.append("\t");
_builder.append("\t\t\t\t\t");
_builder.append("<!-- to get the org.eclipse.osgi.compatibility.state plugin if the target ");
_builder.append("<!-- to get the org.eclipse.osgi.compatibility.state plugin if the target");
_builder.newLine();
_builder.append("\t");
_builder.append("\t\t\t\t\t\t");
_builder.append("platform is Luna or later. (backward compatible with kepler and previous ");
_builder.append("platform is Luna or later. (backward compatible with kepler and previous");
_builder.newLine();
_builder.append("\t");
_builder.append("\t\t\t\t\t\t");
@ -1617,7 +1607,7 @@ public class ParentProjectDescriptor extends ProjectDescriptor {
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("\t");
_builder.append("<!-- ");
_builder.append("<!--");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("\t\t");