Skip to content

Update collections, command, completion, ... to 1.4.9 #22

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Mar 17, 2021
Merged

Update collections, command, completion, ... to 1.4.9 #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00a34c9
Update collections, command, completion, ... to 1.4.9
scala-steward Mar 10, 2021
8872da9
Merge branch 'main' into update/collections-1.4.9
steinybot Mar 11, 2021
76e6230
Ignore sbt jline version differences
steinybot Mar 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion project/SbtPluginSubProjectPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import sbt.ScriptedPlugin.autoImport.scripted
import sbt._
import sbt.plugins.SbtPlugin
import sbtversionpolicy.SbtVersionPolicyMima
import sbtversionpolicy.SbtVersionPolicyPlugin.autoImport.versionPolicyDependencySchemes

// This is all the crazy hacks to get cross compiling working with an sub-project that is an sbt plugin.
object SbtPluginSubProjectPlugin extends AutoPlugin {
Expand All @@ -23,6 +24,7 @@ object SbtPluginSubProjectPlugin extends AutoPlugin {
override def projectSettings: Seq[Def.Setting[_]] =
List(
crossScalaVersions := Nil,
mimaPreviousArtifacts := defaultIfCannotBuild(mimaPreviousArtifacts, Set.empty[ModuleID]).value,
// Remove all project dependencies for Scala 2.13 as they will not resolve when cross building.
projectDependencies := taskDefaultIfSkipped(projectDependencies, Nil).value,
scripted := inputDefaultIfSkipped(scripted, ()).evaluated,
Expand All @@ -32,7 +34,10 @@ object SbtPluginSubProjectPlugin extends AutoPlugin {
// Skip everything else otherwise it will just fail.
skip := !spspCanBuild.value,
undeclaredCompileDependenciesFilter -= moduleFilter(),
mimaPreviousArtifacts := defaultIfCannotBuild(mimaPreviousArtifacts, Set.empty[ModuleID]).value
// These transitive dependencies that have been "vendored" by sbt appear as though they are
// pre-release as they contain build metadata.
// Trust that sbt correctly manages its own version policy in accordance with its dependencies.
versionPolicyDependencySchemes += "org.scala-sbt.jline" % "*" % "always"
)

def defaultIfCannotBuild[A](setting: Def.Initialize[A], default: => A): Def.Initialize[A] =
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version = 1.4.8
sbt.version = 1.4.9