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

Add lin-bus dependency #2004

Closed
wants to merge 1 commit into from
Closed

Add lin-bus dependency #2004

wants to merge 1 commit into from

Conversation

MattBDev
Copy link
Contributor

@MattBDev MattBDev commented Nov 4, 2022

Overview

Adds a dependency on EngineHub/lin-bus.

Description

Adds a dependency on EngineHub/lin-bus which has been used by upstream since July. It updates the ccom.sk89q.jnbt package with the upstream changes required for this change. This change brings us closer to being compatible with the WorldEdit API again.

Submitter Checklist

  • Make sure you are opening from a topic branch (/feature/fix/docs/ branch (right side)) and not your main branch.
  • Ensure that the pull request title represents the desired changelog entry.
  • New public fields and methods are annotated with @since TODO.
  • I read and followed the contribution guidelines.

@MattBDev MattBDev added the upstream This PR pulls in upstream changes label Nov 4, 2022
@MattBDev MattBDev self-assigned this Nov 4, 2022
@MattBDev MattBDev requested a review from a team as a code owner November 4, 2022 23:33
@MattBDev MattBDev marked this pull request as draft November 5, 2022 02:45
implementation(libs.jchronic) {
exclude(group = "junit", module = "junit")
}
implementation("com.thoughtworks.paranamer:paranamer:2.6")
Copy link
Member

Choose a reason for hiding this comment

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

Paranamer is built in to Java 8 onwards, we don't need to add it, hence we removed it years ago.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This will be fixed in the next commit.

maven {
name = "PaperMC"
url = uri("https://repo.papermc.io/repository/maven-public/")
url = uri("https://papermc.io/repo/repository/maven-public/")
Copy link
Contributor

Choose a reason for hiding this comment

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

Why was this changed back? On 20.05.2022 PaperMC announced the change to the new URLs. After the announcement, the URL got changed here by a pull request coming from me (#1756)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for that info. I wasn't aware. Those changes came from upstream. I'll revert them.

@@ -14,7 +14,7 @@ applyShadowConfiguration()
repositories {
maven {
name = "PaperMC"
url = uri("https://repo.papermc.io/repository/maven-public/")
url = uri("https://papermc.io/repo/repository/maven-public/")
Copy link
Contributor

Choose a reason for hiding this comment

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

Same as last comment

@github-actions
Copy link

Please take a moment and address the merge conflicts of your pull request. Thanks!

@PierreSchwang
Copy link
Member

#2778

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
unresolved-merge-conflict upstream This PR pulls in upstream changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants