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.

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

Rename /gen to /generate #6800

Merged
merged 1 commit into from
Aug 27, 2020
Merged

Rename /gen to /generate #6800

merged 1 commit into from
Aug 27, 2020

Conversation

tobiasdiez
Copy link
Member

Triggered by #6794 (comment). All generated files are now placed in src/main/generated which is automatically indexed by Intellj. This removes a few configuration steps that are otherwise needed (see #6794). After running compileJava once, the intellj-based compilation and run is sufficient.

For 2020.1 it was working, but it stopped now that I upgraded to 2020.2. It seems the generated sources are no longer included in the intellj-based build. As @koppor experience the same issues, I guess this is a bug in Intellj.

  • Change in CHANGELOG.md described (if applicable)
  • Tests created for changes (if applicable)
  • Manually tested changed features in running JabRef (always required)
  • Screenshots added in PR description (for UI changes)
  • Checked documentation: Is the information available and up to date? If not created an issue at https://github.com/JabRef/user-documentation/issues or, even better, submitted a pull request to the documentation repository.

@tobiasdiez tobiasdiez added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Aug 27, 2020
@tobiasdiez tobiasdiez requested a review from koppor August 27, 2020 09:57
@Siedlerchr
Copy link
Member

I need to check that with Eclipse first before mergin

@tobiasdiez tobiasdiez requested a review from Siedlerchr August 27, 2020 10:23
Copy link
Member

@koppor koppor left a comment

Choose a reason for hiding this comment

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

Yeah, IntelliJ automatically uses generated:

grafik

@koppor
Copy link
Member

koppor commented Aug 27, 2020

I'd like to have this in the release. In case there are issues with Eclipse, we will discuss and probably revert the change.

@koppor koppor merged commit a8d4f14 into master Aug 27, 2020
@koppor koppor deleted the generate branch August 27, 2020 21:46
@Siedlerchr
Copy link
Member

Siedlerchr commented Aug 28, 2020

Confirmed: Eclipse works. Checkstyle and codecov needed adjustments as well
https://github.com/JabRef/jabref/blob/master/config/checkstyle/suppressions.xml

@koppor
Copy link
Member

koppor commented Aug 28, 2020

Thank you for the quick fix! --> c617d34

Siedlerchr added a commit that referenced this pull request Aug 31, 2020
* upstream/master: (120 commits)
  Follow up fix for copy paste (#6820)
  Add CSS Customisation (#6725)
  Separate signing and notarizing (#6822)
  Remove checkstyle hack. 8.36 got released (#6816)
  Feature/enable lucene query parsing (#6799)
  New release cycle
  Bump WyriHaximus/github-action-wait-for-status from v1.1.2 to v1.2 (#6814)
  Bump mockito-core from 3.5.5 to 3.5.7 (#6813)
  Bump classgraph from 4.8.87 to 4.8.89 (#6812)
  Bump me.champeau.gradle.jmh from 0.5.0 to 0.5.1 (#6811)
  Bump checkstyle from 8.35 to 8.36 (#6810)
  Improve Changelog
  Refactor edit action (#6808)
  Fixed typo in BuildInfo (#6807)
  disable checkstyle for generated
  fix checkstyle
  Simplify check-links.yaml (markdown-link-check) (#6720)
  Rename /gen to /generate (#6800)
  Disable CSL refresh on push (#6803)
  New Crowdin updates (#6804)
  ...

# Conflicts:
#	src/main/java/org/jabref/gui/JabRefFrame.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants