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

chore: migrate to gestalt v7—fork 🅰, keep subsystems separate #4622

Merged
merged 82 commits into from May 2, 2021

Conversation

keturn
Copy link
Member

@keturn keturn commented Apr 10, 2021

This is a variant of #4593. It diverges after 20546f1 in an attempt to find an alternative to moving subsystems back in to the org.terasology.engine namespace.

The diff is usable if you only include the later commits, i.e. after all the import changes. https://github.com/MovingBlocks/Terasology/pull/4622/files/94e1e419d3d9cff599a2ec4e7bd68cdf4983ebc3..HEAD
but this trick is working less well the longer this branch is around, as that diff includes merge commits in a way that diffs from the branch root do not.

To generate a diff from the command line that excludes the import clutter:

git diff --ignore-matching-lines="^import .*"  --ignore-all-space \
    origin/develop origin/feature/migrate-gestalt-v7.a 

Build Instructions

Use chore/gestalt-v7-migration branches for /modules/*.

Notes for Reviewers

Notes for Testing

To Do

pollend and others added 28 commits March 27, 2021 18:18
A failed "assume" marks the test as skipped, not failed.
…lved modules

Provides a cleaner interface for a use case that currently involves other classes messing with ModuleManager's registry and environment.
Mockito complained `getResources` should not return boolean, which is fair. I'm not clear on what the original intent of that was. The tests pass with it removed, but have I changed their semantics?
but they still fail
it got set to a non-SNAPSHOT value prior to release, so increasing the patch level.
…ture/migrate-gestalt-v7

engine/src/main/java/org/terasology/engine/config/flexible/ui/AutoConfigWidgetFactory.java
engine/src/main/java/org/terasology/engine/config/flexible/ui/SettingWidgetFactory.java
engine/src/main/java/org/terasology/engine/logic/players/LocalPlayerSystem.java
engine/src/main/java/org/terasology/engine/network/internal/ClientConnectionHandler.java
engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/EnterUsernamePopup.java
engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/JoinGameScreen.java
engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/SelectionScreen.java
engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/settings/PlayerSettingsScreen.java
getNextPatchVersion was too narrow when the base version was a snapshot.

(That may be a gestalt-module bug, but it's an edge case and using MinorVersion here seems fine.)
…stalt-v7.a

# Conflicts:
#	engine/src/main/java/org/terasology/engine/logic/debug/DebugPropertiesSystem.java
#	engine/src/main/resources/org/terasology/engine/assets/ui/hud/DebugProperties.ui
Gestalt depends on some annotation library from Google.
This can happen when there is a crash leading to shutdown before everything is set up.
@keturn
Copy link
Member Author

keturn commented Apr 10, 2021

This isn't to the point where it does anything interesting, but it has some gradle chores I wanted to make sure were pushed somewhere.

@keturn keturn mentioned this pull request Apr 10, 2021
5 tasks
keturn added a commit to Terasology/Machines that referenced this pull request May 2, 2021
keturn added a commit to Terasology/ManualLabor that referenced this pull request May 2, 2021
keturn added a commit to Terasology/ManualLaborEventualSkills that referenced this pull request May 2, 2021
keturn added a commit to Terasology/MetalRenegades that referenced this pull request May 2, 2021
keturn added a commit to Terasology/Minesweeper that referenced this pull request May 2, 2021
keturn added a commit to Terasology/Minimap that referenced this pull request May 2, 2021
keturn added a commit to Terasology/MultiBlock that referenced this pull request May 2, 2021
keturn added a commit to Terasology/NameGenerator that referenced this pull request May 2, 2021
keturn added a commit to Terasology/Notifications that referenced this pull request May 2, 2021
keturn added a commit to Terasology-Archived/Pathfinding that referenced this pull request May 2, 2021
keturn added a commit to Terasology/PolyWorld that referenced this pull request May 2, 2021
keturn added a commit to Terasology/Rails that referenced this pull request May 2, 2021
keturn added a commit to Terasology/Sample that referenced this pull request May 2, 2021
keturn added a commit to Terasology/Scenario that referenced this pull request May 2, 2021
keturn added a commit to Terasology/ShatteredPlanes that referenced this pull request May 2, 2021
keturn added a commit to Terasology/StructureTemplates that referenced this pull request May 2, 2021
keturn added a commit to Terasology/SubstanceMatters that referenced this pull request May 2, 2021
keturn added a commit to Terasology/WeatherManager that referenced this pull request May 2, 2021
keturn added a commit to Terasology/WildAnimalsGenome that referenced this pull request May 2, 2021
keturn added a commit to Terasology-Archived/WoodAndStone that referenced this pull request May 2, 2021
keturn added a commit to Terasology-Archived/WoodCrafting that referenced this pull request May 2, 2021
keturn added a commit to Terasology/Workstation that referenced this pull request May 2, 2021
keturn added a commit to Terasology/WorkstationInGameHelp that referenced this pull request May 2, 2021
keturn added a commit to Terasology/WorldlyTooltip that referenced this pull request May 2, 2021
@keturn
Copy link
Member Author

keturn commented May 2, 2021

if you need to check out things before this was merged, see tag https://github.com/MovingBlocks/Terasology/tree/pre-gestalt-v7-merge

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Category: Build/CI Requests, Issues and Changes targeting gradle, groovy, Jenkins, etc. Category: Security Requests, Issues and Changes targeting security Size: L Very big effort likely requiring a lot of research and work in many areas across the codebase Topic: Architecture Requests, Issues and Changes related to software architecture, programming patterns, etc.
Development

Successfully merging this pull request may close these issues.

None yet

5 participants