Skip to content

Added Gradle config to README, updated dep version#3699

Closed
BomBardyGamer wants to merge 5 commits into
PaperMC:ver/1.16from
BomBardyGamer:master
Closed

Added Gradle config to README, updated dep version#3699
BomBardyGamer wants to merge 5 commits into
PaperMC:ver/1.16from
BomBardyGamer:master

Conversation

@BomBardyGamer
Copy link
Copy Markdown
Contributor

Okay I believe I've got everything right this time, or as one would say, I nailed it. I've added a section to the README that shows an example of how to depend on the Paper API with Gradle, to help developers who choose Gradle over Maven. I've also updated the <version> tag in the Maven section and set the version in my new Gradle guide to 1.16.1-R0.1-SNAPSHOT (as it should be), from 1.15.2-R0.1-SNAPSHOT.

Again, please let me know if I screwed something up.

Comment thread LICENSE.md Outdated
DoNotSpamPls <7570108+DoNotSpamPls@users.noreply.github.com>
JRoy <joshroy126@gmail.com>
Robert Norman <spottedleaf@spottedleaf.dev>, <Spottedleaf@users.noreply.github.com>
Callum Seabrook <callum.seabrook@prevarinite.com>
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Incredible.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Well, thought I might as well as I'm more than happy to license this under MIT

Comment thread README.md Outdated
<groupId>com.destroystokyo.paper</groupId>
<artifactId>paper-api</artifactId>
<version>1.15.2-R0.1-SNAPSHOT</version>
<version>1.16.1-R0.1-SNAPSHOT</version>
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The master branch is not 1.16.1.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Fixed, reverted back to 1.15.2-R0.1-SNAPSHOT, my bad.

Comment thread README.md Outdated
* Artifact:
```groovy
dependencies {
compileOnly('com.destroystokyo.paper:paper-api:1.16.1-R0.1-SNAPSHOT')
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Ditto

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Same as above.

@BomBardyGamer
Copy link
Copy Markdown
Contributor Author

Yeah you're right. Time for attempt 4?

@mdcfe
Copy link
Copy Markdown
Contributor

mdcfe commented Jun 29, 2020

You know you don't need to keep creating new PRs, right? You can push new commits to existing PR branches and it will update the PR, and the Paper team can squash these commits down to a single commit if they decide to merge your PR.

@wizjany
Copy link
Copy Markdown
Contributor

wizjany commented Jun 29, 2020

please stop closing and re-opening new pull requests. it creates unnecessary spam. you can continue adding commits to this PR, and squash if needed.

edit: md ninja'd me

Copy link
Copy Markdown
Member

@JRoy JRoy left a comment

Choose a reason for hiding this comment

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

master isn't 1.16 yet, so targeting the master branch here is wrong. Also, you aren't providing patches so don't add your name to the LICENSE.md since the readme isn't code

Comment thread README.md Outdated
```groovy
repositories {
maven {
url('https://papermc.io/repo/repository/maven-public/')
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Suggested change
url('https://papermc.io/repo/repository/maven-public/')
url 'https://papermc.io/repo/repository/maven-public/'

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Same as below

Comment thread README.md Outdated
* Artifact:
```groovy
dependencies {
compileOnly('com.destroystokyo.paper:paper-api:1.16.1-R0.1-SNAPSHOT')
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Suggested change
compileOnly('com.destroystokyo.paper:paper-api:1.16.1-R0.1-SNAPSHOT')
compileOnly 'com.destroystokyo.paper:paper-api:1.16.1-R0.1-SNAPSHOT'

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

That actually wasn't my idea, it was suggested by @Proximyst

Comment thread LICENSE.md Outdated
DoNotSpamPls <7570108+DoNotSpamPls@users.noreply.github.com>
JRoy <joshroy126@gmail.com>
Robert Norman <spottedleaf@spottedleaf.dev>, <Spottedleaf@users.noreply.github.com>
Callum Seabrook <callum.seabrook@prevarinite.com>
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Suggested change
Callum Seabrook <callum.seabrook@prevarinite.com>

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

What's the issue with that? I thought you just had to put your name in there to license your stuff under MIT... or am I missing something.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

YOU. CANNOT. LICENSE. YOUR. CHANGES. TO. THE. README. IT'S. ONLY. PATCHES.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Yours truly licensing 10 lines of generic important statements

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Okay, okay, I'll change it hold on. Didn't know, my apologies.

@BomBardyGamer
Copy link
Copy Markdown
Contributor Author

please stop closing and re-opening new pull requests. it creates unnecessary spam. you can continue adding commits to this PR, and squash if needed.

edit: md ninja'd me

Didn't know that until I googled it a minute ago, thanks

@BomBardyGamer
Copy link
Copy Markdown
Contributor Author

Should all be fixed now, let me know if you guys find anything else 🙂

@JRoy
Copy link
Copy Markdown
Member

JRoy commented Jun 29, 2020

You're still targeting master, needs to target ver/1.16

@BomBardyGamer
Copy link
Copy Markdown
Contributor Author

My apologies, how do I change the branch on existing commits? or do I have to revert and re-commit

@DenWav
Copy link
Copy Markdown
Member

DenWav commented Jun 29, 2020

You can't change the branch a PR is targeting. You have to open a new PR.

@zachbr zachbr changed the base branch from master to ver/1.16 June 29, 2020 19:34
@DenWav
Copy link
Copy Markdown
Member

DenWav commented Jun 29, 2020

Apparently I was wrong. That's neat.

@zachbr
Copy link
Copy Markdown
Contributor

zachbr commented Jun 29, 2020

I just changed the base, but you'll have to fix some of the conflicts that snuck in somehow?
I think all you care about is the readme.

@BomBardyGamer
Copy link
Copy Markdown
Contributor Author

Okay thanks, yeah the commits are all over the place since I had to fix a couple of things I screwed up in the initial commit. Any idea how to change those commits?

@kennytv
Copy link
Copy Markdown
Member

kennytv commented Jun 29, 2020

Search for resetting, rebasing, and force-pushing

@clrxbl
Copy link
Copy Markdown
Member

clrxbl commented Jun 29, 2020

bruh moment

@BomBardyGamer
Copy link
Copy Markdown
Contributor Author

BomBardyGamer commented Jun 29, 2020

Okay, so I've gotta reset the commits back to the latest commit from Aikar, then re-commit on the ver/1.16 branch. On it.

The only problem with that is if I reset softly it seems to give me many patch files that just apparently don't count as having been committed any more.

@kennytv
Copy link
Copy Markdown
Member

kennytv commented Jun 29, 2020

Hard reset and do a new commit with your changes then, shouldn't be too hard to copy paste a bunch of text again

@BomBardyGamer
Copy link
Copy Markdown
Contributor Author

Still seems to give me like 6 locally changed files if I hard reset to the latest commit before mine. 🤔

@BomBardyGamer
Copy link
Copy Markdown
Contributor Author

Just me being stupid and trying to reset back to the ver/1.16 branch

@BomBardyGamer
Copy link
Copy Markdown
Contributor Author

Sorted. Am I gonna need a new PR to change the merge branch?

@zachbr
Copy link
Copy Markdown
Contributor

zachbr commented Jun 29, 2020

No, just make sure that it looks how you want locally and force push over this branch.

@BomBardyGamer
Copy link
Copy Markdown
Contributor Author

BomBardyGamer commented Jun 29, 2020

Can't seem to change the branch it's merging from, since my commit is now on ver/1.16 on my fork.

@PaperMC PaperMC locked and limited conversation to collaborators Jun 29, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.