Skip to content

Commit

Permalink
Fix Sbt plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
lolgab committed May 1, 2024
1 parent a977fa8 commit f0262b5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
8 changes: 4 additions & 4 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ object integration extends ScalaModule {
}
}

object `snunit-plugins-shared` extends Cross[SnunitPluginsShared](Versions.scala213, Versions.scala212)
object `snunit-plugins-shared` extends Cross[SnunitPluginsShared](mill.main.BuildInfo.scalaVersion, Versions.scala212)
trait SnunitPluginsShared extends CrossScalaModule with Publish with BuildInfo {
def buildInfoMembers = Seq(
BuildInfo.Value("snunitVersion", publishVersion())
Expand All @@ -279,16 +279,16 @@ trait SnunitPluginsShared extends CrossScalaModule with Publish with BuildInfo {
}
object `snunit-mill-plugin` extends ScalaModule with Publish {
def artifactName = s"mill-snunit_mill${Versions.mill011.split('.').take(2).mkString(".")}"
def moduleDeps = Seq(`snunit-plugins-shared`(Versions.scala213))
def scalaVersion = Versions.scala213
def moduleDeps = Seq(`snunit-plugins-shared`(mill.main.BuildInfo.scalaVersion))
def scalaVersion = mill.main.BuildInfo.scalaVersion
def compileIvyDeps = super.compileIvyDeps() ++ Agg(
ivy"com.lihaoyi::mill-scalanativelib:${Versions.mill011}"
)
}
object `snunit-mill-plugin-itest` extends MillIntegrationTestModule {
def millTestVersion = Versions.mill011
def pluginsUnderTest = Seq(`snunit-mill-plugin`)
def temporaryIvyModules = Seq(`snunit-plugins-shared`(Versions.scala213), snunit(Versions.scala3))
def temporaryIvyModules = Seq(`snunit-plugins-shared`(mill.main.BuildInfo.scalaVersion), snunit(Versions.scala3))
}

def buildSources = T(Seq(PathRef(os.pwd / "build.sc")))
1 change: 0 additions & 1 deletion versions.sc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ object Versions {
val upickle = "3.2.0"
val undertow = "2.3.10.Final"
val scala212 = "2.12.19"
val scala213 = mill.main.BuildInfo.scalaVersion
val scala3 = "3.3.3"
val tapir = "1.9.2"
val cask = "0.9.1"
Expand Down

0 comments on commit f0262b5

Please # to comment.