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

Restructure Grails-Core repository #13552

Open
sdelamo opened this issue Jul 17, 2024 · 4 comments
Open

Restructure Grails-Core repository #13552

sdelamo opened this issue Jul 17, 2024 · 4 comments
Assignees
Labels

Comments

@sdelamo
Copy link
Contributor

sdelamo commented Jul 17, 2024

see: https://github.com/orgs/grails/discussions/13516

repo: https://github.com/grails/grails-async

@sdelamo sdelamo added the relates-to: v7 Grails 7 label Jul 17, 2024
@sdelamo sdelamo added this to Grails 7 Jul 17, 2024
@codeconsole codeconsole removed this from Grails 7 Jul 27, 2024
@jdaugherty jdaugherty self-assigned this Dec 23, 2024
@jdaugherty jdaugherty changed the title Moving grails-async into grails-core repository Restructure Grails-Core repository Jan 3, 2025
@jdaugherty
Copy link
Contributor

Per discussion we have agreed to move the following into grails-core:

  1. grails-async
  2. grails-testing-support for non-gorm based testing

@jdaugherty jdaugherty moved this to In Progress in Grails 7 Jan 3, 2025
@jdaugherty
Copy link
Contributor

I was able to import grails-async's project history into the grails-core repository (locally) with the following commands:

git remote add async [email protected]:grails/grails-async.git
git fetch async
git merge -s ours --no-commit --allow-unrelated-histories async/6.0.x
git read-tree --prefix=grails-async/ -u async/6.0.x
git commit -m "Imported grails-async"

But when I started testing includeBuild approach to keep the build isolated, I ran into these issues:

This means we'll likely have to just use include in the grails projects.

At a high level, here's what needs to happen for any migrations:

  1. Clean up the project to use the same dependency management as grails core (async uses version catalogs while core does not)
  2. Remove buildSrc in the project to facilitate easier moves
  3. Clean up the gh-pages branch in the child project
  4. Import the code history into the default branch
  5. Import the pages branch into the gh-pages branch
  6. Remove old .github folders in child project
  7. Move child project's gradle projects into root
  8. Update any includes / references

@jdaugherty
Copy link
Contributor

grails-async will move to the following locations:

  1. grails-core in the grails-events , grails-async , and grails-test-examples folders
    #13552 Merge grails-async into grails-core #13955

  2. grails-doc in the async section the grails doc guide
    #13552 - Move Async docs to grails-doc grails-doc#947

@jdaugherty
Copy link
Contributor

jdaugherty commented Jan 7, 2025

Project Restructure Plan

jdaugherty added a commit to jdaugherty/grails-core that referenced this issue Jan 15, 2025
jdaugherty added a commit to jdaugherty/grails-core that referenced this issue Jan 16, 2025
* fix grails-async
* fix grails-events
* fix converters
* fix testing support split
* remove spotbugs from bom
* add rxjava1, 2, 3 to bom (spring includes 3)
jdaugherty added a commit to jdaugherty/grails-core that referenced this issue Jan 16, 2025
* fix grails-async
* fix grails-events
* fix converters
* fix testing support split
* remove spotbugs from bom
* add rxjava1, 2, 3 to bom (spring includes 3)
jdaugherty added a commit that referenced this issue Jan 16, 2025
 #13552 Integrate `grails-testing-support` from grails/grails-testing-support into grails-core
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Status: In Progress
Development

No branches or pull requests

2 participants