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

Start migrating to gradle (non-working solution) #167

Merged
merged 5 commits into from
Feb 16, 2024

Conversation

SandwichBtw
Copy link
Contributor

I will fix it tomorrow but here is the start...

@natereprogle natereprogle linked an issue Feb 15, 2024 that may be closed by this pull request
@natereprogle natereprogle marked this pull request as draft February 15, 2024 22:10
@natereprogle
Copy link
Member

Thanks for your help! I see this is still WIP, so I converted it to a draft. I’ll continue looking at this, please add commits if you do more work on this!

@SandwichBtw
Copy link
Contributor Author

Ofcourse! I'll try to make another commit tomorrow.

@natereprogle natereprogle marked this pull request as ready for review February 16, 2024 06:39
@natereprogle
Copy link
Member

natereprogle commented Feb 16, 2024

@SandwichBtw Please review the changes I made in the SandwichBtw-master branch to the Gradle files, and rebase them into your PR. They are in a working state now, and ready to be merged. However, I can't merge your PR without you rebasing first. If you need assistance please reach out via my Discord server, which is located in the project's README.

I unfortunately cannot push any changes into this fork since it was based on the master branch of the project, and that branch is protected for a reason.

Summary of changes:

  • Updated Gradle to 8.6. It appears you may be using IntelliJ because the default gradlew wrapper that was in the project when I cloned it was 8.0.2, which is 6 minor versions behind.
  • Added libs.version.toml file as it appears that was missed from your original commit
  • Removed all build logic from the subprojects, and instead placed it in the main build.gradle.kts file. This is so each project can be built using the same logic and changed much easier. This was done via an afterEvaluate block within the subprojects section.
  • I was quite confused when ./gradlew build wasn't working. Turns out, it was never configured. I've configured the build script to depend on shadowJar, as well as two other tasks of my authoring, in order to ensure the builds are done properly, and that they make sense. If you attempt to run shadowJar on its own, you will receive an exception
    image
  • Updated config.yml to give credit to you for build tools modernization
  • Updated README to reflect not running shadowJar
  • Add Javadoc and Source jarfile generation
  • Add Javadoc HTML generation

I want to thank you for assisting with this PR so quickly. The project is building in ~5 seconds now, while with Maven was nearly 10 seconds. The only thing that needs configured is publishing, and that's something I must due for security reasons. Again, please rebase your PR and if you need assistance let me know.

…tignore

Add javadoc and sources to kotlin build

Need to configure publishing to GitHub Packages / Maven repo
@natereprogle natereprogle self-requested a review February 16, 2024 07:37
honeypot-core/build.gradle.kts Outdated Show resolved Hide resolved
@natereprogle natereprogle self-requested a review February 16, 2024 07:53
Copy link
Member

@natereprogle natereprogle left a comment

Choose a reason for hiding this comment

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

Looks good!

@natereprogle
Copy link
Member

TODO:

  • Fix publishing since that's broken now
  • Update Java CI with Maven since it's no longer maven lol

@natereprogle natereprogle merged commit d0901da into TerrorByteTW:master Feb 16, 2024
1 of 2 checks passed
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.

Clean up build scripts
2 participants