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

Jump to bottom

Modernize Xpect #324

Merged
merged 26 commits into from
Sep 12, 2023
Merged

Modernize Xpect #324

merged 26 commits into from
Sep 12, 2023

Conversation

tjeske
Copy link
Contributor

@tjeske tjeske commented Aug 27, 2023

Resolves #320

tjeske added 21 commits August 15, 2023 10:34
@cdietrich
Copy link
Member

cdietrich commented Aug 27, 2023 •
edited
Loading

@szarnekow @iloveeclipse would be nice if you also could have a look

cdietrich
cdietrich reviewed Aug 27, 2023
View reviewed changes
Jenkinsfile Outdated
stage('test with Eclipse 2022-03 and Xtext nighly') {
try{
sh "JAVA_HOME=${java11Home} ${mvnHome}/bin/mvn -P!plugins -P!xtext-examples -Dtycho-version=2.7.5 -Dtarget-platform=eclipse_2022_03-xtext_nightly ${mvnParams} clean integration-test"
sh "JAVA_HOME=${java11Home} ${mvnHome}/bin/mvn -P!plugins -P!xtext-examples -Dtycho-version=2.7.5 -Dtarget-platform=eclipse_2023_06-xtext_nightly ${mvnParams} clean integration-test"
Copy link
Member

Choose a reason for hiding this comment

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

this does not seem to work.
202306 will need java 17 anyway

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh yes, this cannot work. Can we test the Jenkinsfile of this PR (after I have fixed it)? Jenkins builds this PR with the Jenkinsfile from master which fails (due to Java 8 etc.).

@cdietrich
Copy link
Member

cdietrich commented Aug 27, 2023 •
edited
Loading

nice change. great achievement

TODO / pot. follow ups

  • Deprecated XMLReaderFactory
  • unused imports
  • set minimal java version to 17
  • use mwe 2.15 release in nightly target
  • use 2023-09 in nightly target
  • use newer orbit (check xtext targets)

@cdietrich cdietrich added this to the 0.3.0 milestone Aug 27, 2023
@cdietrich
Copy link
Member 

org.eclipse.xpect/META-INF/MANIFEST.MF:Require-Bundle: org.eclipse.xpect.mwe2;bundle-version="0.2.0",
org.eclipse.xtext.example.domainmodel.xpect.tests/META-INF/MANIFEST.MF: org.eclipse.xpect.xtext.lib;bundle-version="0.2.0",
org.eclipse.xtext.example.domainmodel.xpect.tests/META-INF/MANIFEST.MF: org.eclipse.xpect.xtext.xbase.lib;bundle-version="0.2.0",

might want to bump versions here too

@tjeske
Copy link
Contributor Author

tjeske commented Aug 27, 2023

nice change. great achievement

TODO / pot. follow ups

* Deprecated XMLReaderFactory

* unused imports

* set minimal java version to 17

* use mwe 2.15 release in nightly target

* use 2023-09 in nightly target

* use newer orbit (check xtext targets)

Thanks for having a look!

I didn't want to replace the Java XMLReaderFactory stuff in this PR, but after a closer look I think it is not a big change. I will give it a try tomorrow.

Okay, if nobody is on Java 11 anymore, I set minimum Java version to 17 and switch to latest Eclipse release.

I will refresh the deps etc. tomorrow.

@cdietrich
Copy link
Member

We can do the Java 17 move to a second step / pr

@kuniss
Copy link

kuniss commented Aug 28, 2023

Okay, if nobody is on Java 11 anymore, I set minimum Java version to 17 and switch to latest Eclipse release.

Is there really a need to switch to Java 17? As long as Java 11 LTS is running we may stay with it? I would switch to Java 17 when Eclipse is requiring Java 17...

@tjeske
Copy link
Contributor Author

tjeske commented Aug 28, 2023

Okay, if nobody is on Java 11 anymore, I set minimum Java version to 17 and switch to latest Eclipse release.

Is there really a need to switch to Java 17? As long as Java 11 LTS is running we may stay with it? I would switch to Java 17 when Eclipse is requiring Java 17...

Eclipse 2023-06 requires Java >= 17.

@kuniss
Copy link

kuniss commented Aug 28, 2023

Okay, if nobody is on Java 11 anymore, I set minimum Java version to 17 and switch to latest Eclipse release.

Is there really a need to switch to Java 17? As long as Java 11 LTS is running we may stay with it? I would switch to Java 17 when Eclipse is requiring Java 17...

Eclipse 2023-06 requires Java >= 17.

Guess, I'm out of date... 😄

@tjeske tjeske force-pushed the tjeske/dev branch 2 times, most recently from 2ed5450 to c806521 Compare September 3, 2023 08:45
@tjeske tjeske marked this pull request as ready for review September 3, 2023 09:27
@cdietrich
Copy link
Member

changes look good so far, but i still want to set this up locally to see how workspace looks like.
anyway i propose to bring a first version to the mondernize branch so this can be tested more broadly

@cdietrich cdietrich merged commit 27dab6c into eclipse:modernizeXpect Sep 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cdietrich cdietrich cdietrich left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
0.3.0
Development

Successfully merging this pull request may close these issues.
3 participants
@tjeske @cdietrich @kuniss