From b92f15caee2d76f1e1ac8e0b64212842594033e7 Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Mon, 18 Mar 2024 05:57:27 +0100 Subject: [PATCH] build latest against 202406 and update wizard --- .../mavenTychoJ17.target/mavenTychoJ17.target.target | 2 +- .../mavenTychoP2J17.target/mavenTychoP2J17.target.target | 2 +- .../eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend | 4 ++-- .../org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java | 4 ++-- xtext-latest.target | 4 ++-- xtext-r202203.target | 2 +- xtext-r202206.target | 2 +- xtext-r202209.target | 2 +- xtext-r202212.target | 2 +- xtext-r202303.target | 2 +- xtext-r202306.target | 2 +- xtext-r202309.target | 2 +- xtext-r202312.target | 2 +- xtext-r202403.target | 2 +- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target index 882bed74bb8..304f4fc64ee 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target @@ -8,7 +8,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target index 8af3874ad60..41f3007681e 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target @@ -8,7 +8,7 @@ - + diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend index a48547f38bf..2e2cef20eef 100644 --- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend +++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015, 2023 itemis AG (http://www.itemis.eu) and others. + * Copyright (c) 2015, 2024 itemis AG (http://www.itemis.eu) and others. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at * http://www.eclipse.org/legal/epl-2.0. @@ -62,7 +62,7 @@ class TargetPlatformProject extends ProjectDescriptor { «IF config.javaVersion.isAtLeast(JavaVersion.JAVA17)» - + «ELSE» «ENDIF» diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java index e74ac028bbf..2a36381e7f3 100644 --- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java +++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2015, 2023 itemis AG (http://www.itemis.eu) and others. + * Copyright (c) 2015, 2024 itemis AG (http://www.itemis.eu) and others. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at * http://www.eclipse.org/legal/epl-2.0. @@ -112,7 +112,7 @@ public CharSequence target() { boolean _isAtLeast = this.getConfig().getJavaVersion().isAtLeast(JavaVersion.JAVA17); if (_isAtLeast) { _builder.append("\t\t\t"); - _builder.append(""); + _builder.append(""); _builder.newLine(); } else { _builder.append("\t\t\t"); diff --git a/xtext-latest.target b/xtext-latest.target index 3a77cba6970..d234c5080db 100644 --- a/xtext-latest.target +++ b/xtext-latest.target @@ -1,6 +1,6 @@ - + @@ -15,7 +15,7 @@ - + diff --git a/xtext-r202203.target b/xtext-r202203.target index c1d82e5437e..a9e1bea6a22 100644 --- a/xtext-r202203.target +++ b/xtext-r202203.target @@ -1,6 +1,6 @@ - + diff --git a/xtext-r202206.target b/xtext-r202206.target index 857624a77e6..e67072cd9c0 100644 --- a/xtext-r202206.target +++ b/xtext-r202206.target @@ -1,6 +1,6 @@ - + diff --git a/xtext-r202209.target b/xtext-r202209.target index ae324937445..d7c992a8545 100644 --- a/xtext-r202209.target +++ b/xtext-r202209.target @@ -1,6 +1,6 @@ - + diff --git a/xtext-r202212.target b/xtext-r202212.target index 78c744f30ec..fa9e680b3f6 100644 --- a/xtext-r202212.target +++ b/xtext-r202212.target @@ -1,6 +1,6 @@ - + diff --git a/xtext-r202303.target b/xtext-r202303.target index 63027d5c2d9..b5978de2667 100644 --- a/xtext-r202303.target +++ b/xtext-r202303.target @@ -1,6 +1,6 @@ - + diff --git a/xtext-r202306.target b/xtext-r202306.target index 7b497b373ec..0f8fc998daa 100644 --- a/xtext-r202306.target +++ b/xtext-r202306.target @@ -1,6 +1,6 @@ - + diff --git a/xtext-r202309.target b/xtext-r202309.target index 73a53080f14..69f7104eaf7 100644 --- a/xtext-r202309.target +++ b/xtext-r202309.target @@ -1,6 +1,6 @@ - + diff --git a/xtext-r202312.target b/xtext-r202312.target index af6c329e2cd..df8b056fd73 100644 --- a/xtext-r202312.target +++ b/xtext-r202312.target @@ -1,6 +1,6 @@ - + diff --git a/xtext-r202403.target b/xtext-r202403.target index ceeba5486ea..23da03eabc1 100644 --- a/xtext-r202403.target +++ b/xtext-r202403.target @@ -1,6 +1,6 @@ - +