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

Migration to building with Gradle, remove UI and documentation bundles/build #11

Merged
merged 14 commits into from
Aug 20, 2024
Merged

Migration to building with Gradle, remove UI and documentation bundles/build #11

merged 14 commits into from
Aug 20, 2024

Conversation

stempler
Copy link
Member

No description provided.

@stempler
build!: migrate bundles that are not only relevant for UI to Gradle
14d6989 
ING-4375

BREAKING CHANGE: Core libraries are now no longer part of the hale
studio repository but were moved to this repository (hale-core).
@stempler
fix: resolve extension contributions from local projects w/o manifest
282ff53 
This fix is required to load plugin.xml files when running unit tests
for the same project. Otherwise the project would not load because no
MANIFEST.MF file can be located.
@stempler
test: replace spotify docker client by testcontainers
086405d 
ING-4362
@github-actions GitHub Actions
Copy link

This PR cannot be merged yet because a required label is missing: challenged. It needs to be added before this PR can be merged.

@stempler stempler force-pushed the core-migration branch 2 times, most recently from 66c47a7 to 55c9803 Compare August 16, 2024 21:55
@stempler stempler mentioned this pull request Aug 17, 2024
Merged
florianesser
florianesser reviewed Aug 19, 2024
View reviewed changes
buildSrc/src/main/groovy/hale.java-conventions.gradle Outdated
id 'hale.common'
}

spotless {
java {
importOrder()
Copy link
Member

@florianesser florianesser Aug 19, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I think using importOrder('java', 'javax', 'org', 'com', '') would avoid the reordering of imports and restore the previous behaviour of the Eclipse formatter. Would anything speak against that from your perspective?

image

Copy link
Member Author

Choose a reason for hiding this comment

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

Sure, fine for me.

buildSrc/src/main/groovy/hale.groovy-conventions.gradle Outdated

spotless {
groovy {
importOrder()
Copy link
Member

Choose a reason for hiding this comment

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

While not restoring original behaviour, we could use importOrder('groovy', 'java', 'javax', 'org', 'com', '') here to align it with the Java import order I suggested below.

Copy link
Member Author

Choose a reason for hiding this comment

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

Sure, fine for me.

@florianesser
Copy link
Member

@stempler I prepared the changes to the importOrder configuration and ran ./gradlew spotlessApply but I can't push the commits. I assume that I don't have write permission to the repository, could you please check?

@stempler
Copy link
Member Author

@florianesser Should work now

florianesser
florianesser approved these changes Aug 19, 2024
View reviewed changes
Copy link
Member

@florianesser florianesser left a comment

Choose a reason for hiding this comment

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

LGTM

@stempler
ci: add code formatting checks
0d6947f 
ING-4375
@stempler
refactor: apply formatting rules
28d2380 
ING-4375
@stempler
build: add Gradle formatting rules
1c83e48 
ING-4375
@stempler
build: fix issues and failing tests after migration
66a7688 
ING-4375
@stempler
chore: add editorconfig settings for Java and Groovy sources
4988996
@stempler
chore: add script for applying spotless formatting
4688b8e
@stempler
build: configure default license header and whitespace trimming
d80a829 
...for Java and Groovy sources.
@stempler
style: apply unified header and whitespace rules
07a3ba0
@stempler
build: use on-demand configuration for spotless script
f531258 
... to drastically increase performance of updates for individual files.
@stempler
build: enable configuration on demand by default
7143d7e 
Greatly reduces configuration time when running tasks on specific
subprojects.
@stempler
Copy link
Member Author

@florianesser I rebased your changes on top of the first time applying the formatting, so we don't have import changes in between. Would merge once the checks are successful.

@stempler stempler merged commit 96d9bd7 into master Aug 20, 2024
6 of 7 checks passed
@stempler stempler deleted the core-migration branch August 20, 2024 07:59
@florianesser
Copy link
Member

This PR cannot be merged yet because a required label is missing: challenged. It needs to be added before this PR can be merged.

I added the challenged label to this repo now so it can be used for future PRs

@we-release we-release
Copy link

we-release bot commented Sep 5, 2024

🎉 This PR is included in version 6.0.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

@we-release we-release bot added the released label Sep 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@florianesser florianesser florianesser approved these changes

@emanuelaepure10 emanuelaepure10 Awaiting requested review from emanuelaepure10

@kapil-agnihotri kapil-agnihotri Awaiting requested review from kapil-agnihotri

Assignees
No one assigned
Labels
released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@stempler @florianesser