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

Upgrade JGit and SBT 1.0.x #148

Merged
merged 5 commits into from
Nov 9, 2017
Merged

Conversation

oliverlockwood
Copy link
Contributor

@oliverlockwood oliverlockwood commented Nov 8, 2017

I wanted to upgrade the version of JGit, so that we can begin to make use of new features.

In order to do so, as noted in existing PR #121 (which I believe is superseded by this PR), we need to bump the version of the JDK, since JGit no longer supports Java 7.

While I was at it, it seemed like a good opportunity to bump the 1.0.x track of SBT to be 1.0.3 instead of a release candidate.

Could I have a review of this, please?

@oliverlockwood
Copy link
Contributor Author

Tagging @dwijnand, @bchazalet, and @hseeberger - sorry to bug you directly, but from looking at the other existing PRs this seems to be a fairly quiet repo, and you were involved in the discussions in #121.

@@ -1 +1 @@
sbt.version=0.13.7
sbt.version=0.13.16
Copy link
Member

Choose a reason for hiding this comment

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

Why is this still 0.13?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fair point - apologies for missing that. I'll bump this.

README.md Outdated

Latest:

Add the following to your `project/plugins.sbt` or `~/.sbt/0.13/plugins/plugins.sbt` file:

addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.9.3")
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.10.0")
Copy link
Member

Choose a reason for hiding this comment

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

Hm ... these changes should only become effective after a 0.10.0 release, not?

Copy link
Member

Choose a reason for hiding this comment

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

I agree, we should do this on 0.10.0 release: referring to the master version of the README as reference is common.

README.md Outdated
@@ -7,13 +7,13 @@ well as allowing other plugins to make use of git.


## Installation ##
This plugin now requires at least **Java 7** (the latest version supporting Java 6 was `0.8.5`)
This plugin now requires at least **Java 8** (the latest version supporting Java 7 was `0.9.3`)
Copy link
Member

Choose a reason for hiding this comment

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

Two things:

  • I think it would be useful to preserve the information about the latest version supporting Java 6
  • To avoid confusion I think we should rewrite this to avoid saying "now".

So something like:

As of 0.10.0 (not released yet) this plugin requires at least Java 8.
The latest version supporting Java 7 was 0.9.3, while the latest version supporting Java 6 was 0.8.5

Copy link
Member

Choose a reason for hiding this comment

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

+1

README.md Outdated

Latest:

Add the following to your `project/plugins.sbt` or `~/.sbt/0.13/plugins/plugins.sbt` file:

addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.9.3")
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.10.0")
Copy link
Member

Choose a reason for hiding this comment

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

I agree, we should do this on 0.10.0 release: referring to the master version of the README as reference is common.

@oliverlockwood
Copy link
Contributor Author

@dwijnand @hseeberger thank you for the prompt feedback. I believe I've addressed the comments you raised, and the Travis PR build is green, so please take another look when you have the chance.

@dwijnand
Copy link
Member

dwijnand commented Nov 9, 2017

I'll just give @hseeberger a chance to weigh in before merging.

@hseeberger
Copy link
Member

LGTM too!

@hseeberger hseeberger merged commit 2ab92a6 into sbt:master Nov 9, 2017
@hseeberger
Copy link
Member

Thanks, @oliverlockwood!

@hseeberger
Copy link
Member

I'll leave a release for @dwijnand ...

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.

3 participants