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

enable sbt 2.x build #182

Merged
merged 1 commit into from
Oct 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
run: sbt -v "++2.12.x" test scripted
- if: ${{ matrix.jobtype == 3 }}
shell: bash
run: sbt -v "++3.x" library/test
run: sbt -v "++3.x" test # TODO scripted
- if: ${{ matrix.jobtype == 4 }}
shell: bash
run: sbt -v "++2.12.x" scalafmtSbtCheck scalafmtCheckAll
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@ lazy val plugin = (project in file("plugin"))
scriptedLaunchOpts.value ++
Seq("-Xmx1024M", "-Dplugin.version=" + version.value)
},
crossScalaVersions := Seq(scala212),
crossScalaVersions := Seq(scala212, scala3),
pluginCrossBuild / sbtVersion := {
scalaBinaryVersion.value match {
case "2.13" => "1.2.8"
case "2.12" => "1.2.8" // set minimum sbt version
case _ => "1.2.8"
case _ => "2.0.0-M2"
}
},
publishLocal := (publishLocal dependsOn (library / publishLocal)).value,
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/main/scala/ContrabandPlugin.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package sbt.contraband

import sbt.Keys._
import sbt._
import sbt.{ given, _ }
import sbt.contraband.ast._
import sbt.contraband.parser.{ JsonParser, SchemaParser }

Expand Down
2 changes: 1 addition & 1 deletion plugin/src/main/scala/JsonCodecPlugin.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package sbt.contraband

import sbt._
import sbt.{ given, _ }
import Keys._

object JsonCodecPlugin extends AutoPlugin {
Expand Down