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

Merge Maven main module into ui module #1254

Merged
merged 3 commits into from
Feb 11, 2024
Merged

Merge Maven main module into ui module #1254

merged 3 commits into from
Feb 11, 2024

Conversation

bevans2000
Copy link
Member

@bevans2000 bevans2000 commented Feb 11, 2024

This PR consists of 3 major changes:

  1. Update version tag to '3.8.0-pre'
  2. Clean the dependencies and plugin for the Maven module to remove unused references
  3. The UI module absorbs main module such that it creates the executable JAR for the Swing version

The 'main' module folder is till left but this can be removed.

Note, this change may need a reload of the project in Eclipse. VSCode is fine.

Chnages:
- Remove unused plugins and dependencies from pom files
- Remove use of customer repositories
- Upgrade version to '3.8.0-pre'

Part of #1241
WalkOutsideTest can randomly fail when run in GitHub. It is because the tests are not thread safe
because ofthe use of the LocalObject cacge which is cleared down by all the tests. This means tests
can interfere with each other.
Changes:
- Move the MarsProject from the main to ui Maven module
- Updated the pom of ui module so it builds the executable jar
- assembly.xml picks Jar out of the UI module
- dist & gdx module has update dependency to the ui module
- moved all the Eclipse launch files from main to ui

Note the main module folder still exists but this can be deleted soon as a tidy up.

Part of #1241
@bevans2000 bevans2000 marked this pull request as ready for review February 11, 2024 17:07
@mokun mokun added this pull request to the merge queue Feb 11, 2024
Merged via the queue into master with commit a5d1853 Feb 11, 2024
3 checks passed
@@ -148,7 +147,6 @@
<modules>
<module>mars-sim-tools</module>
<module>mars-sim-mapdata</module>
<module>mars-sim-main</module>
Copy link
Member

Choose a reason for hiding this comment

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

So, the maven submodule mars-sim-main have no use now ?

Copy link
Member Author

Choose a reason for hiding this comment

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

Correct

@mokun
Copy link
Member

mokun commented Feb 11, 2024

That's a big change !

I wonder if you still want mars-sim-tools.

@bevans2000
Copy link
Member Author

That's a big change !

I wonder if you still want mars-sim-tools.

Yes, this is the first change. Next is to combine tools, map data and core.
Then tools will just contain our own tools like the HTML generator
I want to make sure this change works for you with Eclipse

@mokun
Copy link
Member

mokun commented Feb 11, 2024

I want to make sure this change works for you with Eclipse

Yes. After I choose "Update Project" under "Maven", things got sync-ed. It works.

@mokun
Copy link
Member

mokun commented Feb 11, 2024

VSCode is fine

Somehow I find it uncomfortable to develop mars-sim in IntelliJ.

But I'd love to see how easy mars-sim can be set up for development in VSCode.

This way, I don't have to depend on Eclipse forever.

@bevans2000
Copy link
Member Author

VSCode is fine

Somehow I find it uncomfortable to develop mars-sim in IntelliJ.

But I'd love to see how easy mars-sim can be set up for development in VSCode.

This way, I don't have to depend on Eclipse forever.

VSCode is pretty good. I switched over a year ago. I found Eclipse was getting slower.

Will consolidate the core module next. Overall,this will simplify the build.

@bevans2000 bevans2000 deleted the maven_issue1241 branch February 11, 2024 21:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants