Navigation Menu

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

Gradle cleanup #6661

Merged
merged 8 commits into from Oct 28, 2020
Merged

Gradle cleanup #6661

merged 8 commits into from Oct 28, 2020

Conversation

pupnewfster
Copy link
Member

Changes proposed in this pull request:

  • Cleaned up deprecated Gradle calls
  • Rewrote gradle calls slightly to remove the majority of IntelliJ warnings on the build.gradle file. The one change I am not too sure about is moving the maven publication to a closure and setting the project for it
  • Copy the modified mods.toml file to the intellij build folder in addition to the gradle build folder. This only somewhat helps as the intellij runconfigs have the wrong paths for MOD_CLASSES by default, but now if they get manually fixed it can actually run now. (I didn't bother experimenting with manually specifying the values as I am fine with continuing to just use the gradlle intellij runconfigs
  • Moved a lot of the all jar merge logic into a separate file and add support for merging tags that are added by multiple modules. In theory I think this fixes all the remaining merge issues the all jar had.

… complains about and use the newer gradle methods instead of the ones deprecated in gradle 5
… and fix some misc issues with replaceResources not actually working properly for clean build
… and add support for merging overlapping tags
build.gradle Outdated Show resolved Hide resolved
build.gradle Outdated Show resolved Hide resolved
@pupnewfster pupnewfster merged commit 31fc74b into 1.16.x Oct 28, 2020
@pupnewfster pupnewfster deleted the gradle_cleanup branch October 28, 2020 17:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants