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

build: increased target platform to eclipse release 2021-06, as that brings support for platform 'macosx.aarch_64' #150

Merged
merged 3 commits into from
Jan 9, 2023
Merged

build: increased target platform to eclipse release 2021-06, as that brings support for platform 'macosx.aarch_64' #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55861a4
klighd.piccolo.batik: trimmed compile classpath to those jars being a…
sailingKieler Dec 20, 2022
40b4ae2
build: increased target platform to eclipse release 2021-06, which br…
sailingKieler Dec 20, 2022
3c5c884
klighd.test, klighd.piccolo.test: refinements in 'ViewChangedNotifica…
sailingKieler Dec 21, 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
2 changes: 1 addition & 1 deletion .github/workflows/buildAndTest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v2
with:
java-version: 8
java-version: 11
distribution: adopt
- name: Cache Maven packages
uses: actions/cache@v2
Expand Down
6 changes: 3 additions & 3 deletions build/de.cau.cs.kieler.klighd.repository/category.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@
<bundle id="de.cau.cs.kieler.klighd.lsp" version="2.2.1.qualifier"/>
<bundle id="de.cau.cs.kieler.klighd.lsp.source" version="2.2.1.qualifier"/>

<repository-reference location="https://download.eclipse.org/releases/2020-06/" enabled="true" />
<repository-reference location="https://download.eclipse.org/releases/2021-06/" enabled="true" />
<repository-reference location="https://download.eclipse.org/modeling/mdt/uml2/updates/5.4/" enabled="true" />
<repository-reference location="https://download.eclipse.org/elk/updates/releases/0.8.1/" enabled="true" />
<repository-reference location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.22.0/" enabled="true" />
<repository-reference location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0/" enabled="true" />
<repository-reference location="https://xtext.github.io/download/updates/releases/2.1.1/" enabled="true" />
<repository-reference location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository/" enabled="true" />
<repository-reference location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository/" enabled="true" />
<repository-reference location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/sprotty/0.9.0/" enabled="true" />
</site>
14 changes: 10 additions & 4 deletions build/de.cau.cs.kieler.klighd.repository/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,16 @@
which has been built meanwhile, doesn't work properly yet,
see https://bugs.eclipse.org/bugs/show_bug.cgi?id=453708#c34
so we have to stick to this plug-in -->
<!-- Update: With https://github.com/eclipse-tycho/tycho/pull/145 (Tycho v2.4.0) the aforementioned issue is fixed.
However, just dropping the <associateSites>...</associateSites> argument and keeping the web content
generation doesn't work here, as this mojo _always_ clears the existing repository references,
or crashes if 'content.jar' doesn't exist. Hence, just binding it to an early build phase doesn't work.
Therefore I submitted PR https://github.com/jbosstools/jbosstools-maven-plugins/pull/88
to fix that, let's see how the committers assess it. -->
<plugin>
<groupId>org.jboss.tools.tycho-plugins</groupId>
<artifactId>repository-utils</artifactId>
<version>1.0.0</version>
<version>2.5.0</version>
Comment on lines +35 to +44
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What speaks against using the eclipse.tycho tycho-p2-repository-plugin here with the newer tycho release used in the build? From what I tested that should work as well without the need for the duplication of the associate sites here in the pom.xml

Copy link
Member Author

@sailingKieler sailingKieler Dec 23, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried to skip that, but ... see

KLighD/build/de.cau.cs.kieler.klighd.repository/pom.xml

Lines 35 to 40 in 3d54c4b

<!-- Update: With https://github.com/eclipse-tycho/tycho/pull/145 (Tycho v2.4.0) the aforementioned issue is fixed.
However, just dropping the <associateSites>...</associateSites> argument and keeping the web content
generation doesn't work here, as this mojo _always_ clears the existing repository references,
or crashes if 'content.jar' doesn't exist. Hence, just binding it to an early build phase doesn't work.
Therefore I submitted PR https://github.com/jbosstools/jbosstools-maven-plugins/pull/88
to fix that, let's see how the committers assess it. -->

<executions>
<execution>
<id>generate-facade</id>
Expand All @@ -46,17 +52,17 @@
<configuration>
<associateSites>
<!-- Eclipse -->
<associateSite>https://download.eclipse.org/releases/2020-06/</associateSite>
<associateSite>https://download.eclipse.org/releases/2021-06/</associateSite>
<!-- UML2 Tools (Meta Model Implemenetation, ...) -->
<associateSite>https://download.eclipse.org/modeling/mdt/uml2/updates/5.4/</associateSite>
<!-- Eclipse Layout Kernel -->
<!-- associateSite>http://build.eclipse.org/modeling/elk/updates/nightly/</associateSite -->
<associateSite>https://download.eclipse.org/elk/updates/releases/0.8.1/</associateSite>>
<!-- Xtext -->
<associateSite>https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.22.0/</associateSite>>
<associateSite>https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0/</associateSite>>
<associateSite>https://xtext.github.io/download/updates/releases/2.1.1/</associateSite>>
<!-- Eclipse Orbit for Google Guave, Apache Batik, ... -->
<associateSite>https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository/</associateSite>
<associateSite>https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository/</associateSite>
<!-- Sprotty ... -->
<associateSite>https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/sprotty/0.9.0/</associateSite>
</associateSites>
Expand Down
6 changes: 3 additions & 3 deletions ....cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.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.emf.ecore.xcore.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
<unit id="org.apache.batik.svggen" version="0.0.0"/>
<repository location="https://download.eclipse.org/releases/2020-06/"/>
<repository location="https://download.eclipse.org/releases/2021-06/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.uml2.uml.feature.group" version="0.0.0"/>
Expand All @@ -25,7 +25,7 @@
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.22.0/"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="de.itemis.xtext.antlr.sdk.feature.group" version="2.1.1.v201405091103"/>
Expand All @@ -36,7 +36,7 @@
<unit id="com.google.inject" version="0.0.0"/>
<unit id="com.google.guava" version="0.0.0"/>
<unit id="org.hamcrest.library" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository/"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.sprotty" version="0.0.0"/>
Expand Down
6 changes: 3 additions & 3 deletions ...er.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.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.emf.ecore.xcore.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
<unit id="org.apache.batik.svggen" version="0.0.0"/>
<repository location="https://download.eclipse.org/releases/2020-06/"/>
<repository location="https://download.eclipse.org/releases/2021-06/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.uml2.uml.feature.group" version="0.0.0"/>
Expand All @@ -25,7 +25,7 @@
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.22.0/"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="de.itemis.xtext.antlr.sdk.feature.group" version="2.1.1.v201405091103"/>
Expand All @@ -40,7 +40,7 @@
<unit id="com.google.inject" version="0.0.0"/>
<unit id="com.google.guava" version="0.0.0"/>
<unit id="org.hamcrest.library" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository/"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.sprotty" version="0.0.0"/>
Expand Down
6 changes: 3 additions & 3 deletions ...cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.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.emf.ecore.xcore.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
<unit id="org.apache.batik.svggen" version="0.0.0"/>
<repository location="https://download.eclipse.org/releases/2020-06/"/>
<repository location="https://download.eclipse.org/releases/2021-06/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.uml2.uml.feature.group" version="0.0.0"/>
Expand All @@ -25,7 +25,7 @@
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.22.0/"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="de.itemis.xtext.antlr.sdk.feature.group" version="2.1.1.v201405091103"/>
Expand All @@ -40,7 +40,7 @@
<unit id="com.google.inject" version="0.0.0"/>
<unit id="com.google.guava" version="0.0.0"/>
<unit id="org.hamcrest.library" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository/"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.sprotty" version="0.0.0"/>
Expand Down
6 changes: 3 additions & 3 deletions build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.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.emf.ecore.xcore.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
<unit id="org.apache.batik.svggen" version="0.0.0"/>
<repository location="https://download.eclipse.org/releases/2020-06/"/>
<repository location="https://download.eclipse.org/releases/2021-06/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.uml2.uml.feature.group" version="0.0.0"/>
Expand All @@ -25,7 +25,7 @@
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.22.0/"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="de.itemis.xtext.antlr.sdk.feature.group" version="2.1.1.v201405091103"/>
Expand All @@ -36,7 +36,7 @@
<unit id="com.google.inject" version="0.0.0"/>
<unit id="com.google.guava" version="0.0.0"/>
<unit id="org.hamcrest.library" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository/"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.sprotty" version="0.0.0"/>
Expand Down
6 changes: 4 additions & 2 deletions plugins/de.cau.cs.kieler.kgraph.text.ide/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@ Bundle-Vendor: Kiel University
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: de.cau.cs.kieler.kgraph.text,
org.eclipse.xtext.ide,
org.eclipse.xtext.xbase.ide
com.google.guava,
org.eclipse.xtext.xbase.lib,
org.eclipse.xtend.lib,
org.eclipse.xtend.lib.macro
Export-Package: de.cau.cs.kieler.kgraph.text.ide,
de.cau.cs.kieler.kgraph.text.ide.contentassist.antlr,
de.cau.cs.kieler.kgraph.text.ide.contentassist.antlr.internal
Automatic-Module-Name: de.cau.cs.kieler.kgraph.text.ide

6 changes: 6 additions & 0 deletions ...s/de.cau.cs.kieler.kgraph.text.ui/src/de/cau/cs/kieler/kgraph/text/ui/KGraphUiModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
package de.cau.cs.kieler.kgraph.text.ui;

import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.xtext.resource.containers.IAllContainersState;

import com.google.inject.Provider;

/**
* Use this class to register components to be used within the IDE.
Expand All @@ -37,4 +40,7 @@ public KGraphUiModule(final AbstractUIPlugin plugin) {
super(plugin);
}

public Provider<IAllContainersState> provideIAllContainersState() {
return org.eclipse.xtext.ui.shared.Access.getWorkspaceProjectsState();
}
}
1 change: 0 additions & 1 deletion plugins/de.cau.cs.kieler.kgraph.text/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport,
org.eclipse.xtext.util,
org.antlr.runtime,
org.eclipse.xtext.xbase.lib,
org.eclipse.xtext.xbase,
org.eclipse.emf.ecore,
org.eclipse.emf.common,
org.eclipse.core.resources,
Expand Down
18 changes: 0 additions & 18 deletions plugins/de.cau.cs.kieler.klighd.piccolo.batik/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="lib/lib/batik-bridge.jar"/>
<classpathentry exported="true" kind="lib" path="lib/lib/batik-codec.jar"/>
<classpathentry exported="true" kind="lib" path="lib/lib/batik-extension.jar"/>
<classpathentry exported="true" kind="lib" path="lib/lib/batik-gui-util.jar"/>
<classpathentry exported="true" kind="lib" path="lib/lib/batik-gvt.jar"/>
<classpathentry exported="true" kind="lib" path="lib/lib/batik-script.jar"/>
<classpathentry exported="true" kind="lib" path="lib/lib/batik-swing.jar"/>
<classpathentry exported="true" kind="lib" path="lib/lib/batik-transcoder.jar"/>
<classpathentry exported="true" kind="lib" path="lib/lib/js.jar"/>
<classpathentry exported="true" kind="lib" path="lib/lib/pdf-transcoder.jar"/>
<classpathentry exported="true" kind="lib" path="lib/lib/xalan-2.6.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/lib/xerces_2_5_0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/lib/batik-anim.jar"/>
<classpathentry exported="true" kind="lib" path="lib/lib/batik-parser.jar"/>
<classpathentry exported="true" kind="lib" path="lib/lib/batik-xml.jar"/>
<classpathentry exported="true" kind="lib" path="lib/lib/xml-apis-ext.jar"/>
<classpathentry exported="true" kind="lib" path="lib/lib/xml-apis.jar"/>
<classpathentry exported="true" kind="lib" path="lib/lib/batik-css.jar"/>
<classpathentry exported="true" kind="lib" path="lib/lib/batik-awt-util.jar"/>
<classpathentry exported="true" kind="lib" path="lib/lib/batik-dom.jar"/>
<classpathentry exported="true" kind="lib" path="lib/lib/batik-ext.jar"/>
<classpathentry exported="true" kind="lib" path="lib/lib/batik-svg-dom.jar"/>
<classpathentry exported="true" kind="lib" path="lib/lib/batik-svggen.jar"/>
<classpathentry exported="true" kind="lib" path="lib/lib/batik-util.jar"/>
<classpathentry exported="true" kind="lib" path="lib/batik.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
Expand Down
17 changes: 14 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,8 @@

<!-- Define a few properties used throughout all build profiles. -->
<properties>
<tycho-version>1.7.0</tycho-version>
<targetJdk>1.8</targetJdk>
<xtext-version>2.22.0</xtext-version>
<tycho-version>2.5.0</tycho-version>
<xtext-version>2.25.0</xtext-version>
<elk-version>0.8.1</elk-version>

<!-- chsch: copied from https://eclipse.googlesource.com/recommenders/org.eclipse.recommenders/+/3dae4575d3370da2da25a1cbce3dfcff198f0611/features/pom.xml -->
Expand All @@ -66,6 +65,13 @@
<project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>

<!-- pin the source code compatibility to 1.8 for the sake of backward compatibility -->
<maven.compiler.source>1.8</maven.compiler.source>

<!-- don't pin the class file compatibility here, as this will overwrite the 'Bundle-RequiredExecutionEnvironment:' settings in the plug-ins' manifest files!
chsch: at the time of writing this all BREEs are pinned to 1.8 except for 'klighd.piccolo.test' that I switched to JavaSE-11 for convenience -->
<!-- maven.compiler.target>1.8</maven.compiler.target -->

<!-- Enable java assertions during junit test runs. -->
<!-- The "enableAssertions" property is only available in the maven-surefire plugin. -->
<tycho.surefire.vmargs>-ea</tycho.surefire.vmargs>
Expand Down Expand Up @@ -202,6 +208,11 @@
<ws>cocoa</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>macosx</os>
<ws>cocoa</ws>
<arch>aarch64</arch>
</environment>
</environments>
</configuration>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion test/de.cau.cs.kieler.klighd.piccolo.test/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-Name: KLighD Piccolo2D Binding Tests
Bundle-SymbolicName: de.cau.cs.kieler.klighd.piccolo.test;singleton:=true
Bundle-Version: 2.2.1.qualifier
Bundle-Vendor: Kiel University
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.junit;bundle-version="4.8.0",
org.eclipse.core.runtime,
org.eclipse.xtext.xbase.lib;bundle-version="2.4.2",
Expand Down
Loading