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

Remove sbt 0.13.x support and syntax improvements #118

Merged

Conversation

mdedetrich
Copy link
Collaborator

Removes sbt 0.13.x support since its ancient, syntax improvements, use sbt slash syntax and also use lazy val's

@@ -16,19 +16,20 @@

package com.typesafe.sbt.osgi

import java.nio.file.{FileVisitOption, Files, Path}
import java.nio.file.{ FileVisitOption, Files, Path }
Copy link
Collaborator Author

@mdedetrich mdedetrich Jan 24, 2024

Choose a reason for hiding this comment

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

Imports were messed up in this PR, this fixes it back

@mdedetrich mdedetrich force-pushed the remove-sbt-0.13-support-and-syntax-cleanup branch from ed5f11a to e4bbce0 Compare January 24, 2024 22:51
@mdedetrich mdedetrich requested a review from mkurz January 24, 2024 22:53
@mkurz
Copy link
Member

mkurz commented Jan 24, 2024

Why not replace


with
artifact in (Compile, packageBin) ~= (_.withType("bundle"))

and delete src/main/scala-sbt-1.0/com/typesafe/sbt/osgi/SbtCompat.scala?
Also that line needs to be changed to the newer sbt slash syntax anyway.

@mdedetrich mdedetrich force-pushed the remove-sbt-0.13-support-and-syntax-cleanup branch from e4bbce0 to 7077f08 Compare January 24, 2024 23:12
@mdedetrich
Copy link
Collaborator Author

@mkurz Done, thanks

@mdedetrich
Copy link
Collaborator Author

mdedetrich commented Jan 25, 2024

@mkurz Sorry for pinging you but can you review this PR? I have another fix coming through and I coded it against these changes (see apache/pekko#1039 (comment) for context) and it would be good to get it out soon

@mkurz mkurz merged commit bddf019 into sbt:main Jan 25, 2024
10 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.

2 participants