From f0262b555e454fa05fdf676586b473be606b7887 Mon Sep 17 00:00:00 2001 From: Lorenzo Gabriele Date: Wed, 1 May 2024 17:53:38 +0200 Subject: [PATCH] Fix Sbt plugin --- build.sc | 8 ++++---- versions.sc | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build.sc b/build.sc index 1d86cfe..4c7007d 100644 --- a/build.sc +++ b/build.sc @@ -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()) @@ -279,8 +279,8 @@ 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}" ) @@ -288,7 +288,7 @@ object `snunit-mill-plugin` extends ScalaModule with Publish { 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"))) diff --git a/versions.sc b/versions.sc index 06cef1c..4c5be2a 100644 --- a/versions.sc +++ b/versions.sc @@ -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"