Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Explicit compiler.apt in target platform configuration #1

Merged
merged 8 commits into from
Jul 7, 2022
Merged

Explicit compiler.apt in target platform configuration #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f7c79df
eclipse releases 2021-06
LorenzoBettini Jun 21, 2021
8728d87
Merge branch 'master' into 2021-06
LorenzoBettini Jun 21, 2021
d99439f
tycho 2.4.0-SNAPSHOT
LorenzoBettini Jun 21, 2021
067a94a
jdt.compiler.apt in tp conf as extra requirement
LorenzoBettini Jun 21, 2021
ca856ce
jdt.compiler.tool
LorenzoBettini Jul 7, 2022
f3d89eb
updated projects
LorenzoBettini Jul 7, 2022
5737b70
Revert "tycho 2.4.0-SNAPSHOT"
LorenzoBettini Jul 7, 2022
3184849
xtext.logging 1.2.15
LorenzoBettini Jul 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions org.xtext.example.mydsl.parent/org.xtext.example.mydsl.ide/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
<arguments>
Expand All @@ -30,6 +25,11 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
Expand Down
2 changes: 1 addition & 1 deletion ...example.mydsl.parent/org.xtext.example.mydsl.target/org.xtext.example.mydsl.target.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
<unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/releases/2021-03"/>
<repository location="https://download.eclipse.org/releases/2021-06"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
Expand Down
10 changes: 5 additions & 5 deletions org.xtext.example.mydsl.parent/org.xtext.example.mydsl.tests/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
<arguments>
Expand All @@ -30,6 +25,11 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
Expand Down
5 changes: 5 additions & 0 deletions ...e.mydsl.parent/org.xtext.example.mydsl.tests/.settings/org.eclipse.xtend.core.Xtend.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
BuilderConfiguration.is_project_specific=true
eclipse.preferences.version=1
outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
10 changes: 5 additions & 5 deletions org.xtext.example.mydsl.parent/org.xtext.example.mydsl.ui.tests/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
<arguments>
Expand All @@ -30,6 +25,11 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
Expand Down
10 changes: 5 additions & 5 deletions org.xtext.example.mydsl.parent/org.xtext.example.mydsl.ui/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
<arguments>
Expand All @@ -30,6 +25,11 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
Expand Down
10 changes: 5 additions & 5 deletions org.xtext.example.mydsl.parent/org.xtext.example.mydsl/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
<arguments>
Expand All @@ -30,6 +25,11 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
Expand Down
5 changes: 5 additions & 0 deletions ...example.mydsl.parent/org.xtext.example.mydsl/.settings/org.eclipse.xtend.core.Xtend.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
BuilderConfiguration.is_project_specific=true
eclipse.preferences.version=1
outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
17 changes: 15 additions & 2 deletions org.xtext.example.mydsl.parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,27 @@
<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>
<id>org.eclipse.rcp</id>
<versionRange>0.0.0</versionRange>
</requirement>
<!-- to force the same version of jdt.compiler.apt and jdt.core
(for xtext-maven-plugin)
see https://github.com/eclipse/xtext-maven/issues/146 -->
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.jdt.compiler.apt</id>
<versionRange>0.0.0</versionRange>
</requirement>
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.jdt.compiler.tool</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration>
Expand Down