compile zinc compiler bridges on demand to remove restriction on supported scala versions

2 files changed, 4 insertions, 5 deletions

diff --git a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala
index 82000c6e..6f50de53 100644
--- a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala
+++ b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala
@@ -41,7 +41,6 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer =>
     ) else resolveDependencies(
       Seq(Cache.ivy2Local, MavenRepository("https://repo1.maven.org/maven2")),
       "2.12.4",
-      "2.12",
       Seq(Dep(
         "com.lihaoyi",
         s"mill-jsbridge_${scalaJSBridgeVersion().replace('.', '_')}",
@@ -62,7 +61,6 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer =>
     resolveDependencies(
       repositories,
       "2.12.4",
-      "2.12",
       commonDeps :+ envDep
     )
   }
diff --git a/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala b/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala
index 88792366..5ba4343f 100644
--- a/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala
+++ b/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala
@@ -7,11 +7,12 @@ import javax.script.{ScriptContext, ScriptEngineManager}
 import ammonite.ops._
 import mill._
 import mill.define.Discover
-import mill.scalalib.{DepSyntax, PublishModule, TestRunner}
+import mill.scalalib.{DepSyntax, Lib, PublishModule, TestRunner}
 import mill.scalalib.publish.{Developer, License, PomSettings, SCM}
 import mill.util.{TestEvaluator, TestUtil}
 import utest._
 import mill.util.TestEvaluator.implicitDisover
+
 import scala.collection.JavaConverters._
 
 
@@ -38,7 +39,7 @@ object HelloJSWorldTests extends TestSuite {
         override def sources = T.input{ Agg(PathRef(basePath / 'src / 'utest)) }
         def testFramework: T[String] = "utest.runner.Framework"
         override def ivyDeps = Agg(
-          ivy"com.lihaoyi:utest_sjs${scalaJSBinaryVersion()}_${scalaBinaryVersion()}:0.6.3"
+          ivy"com.lihaoyi:utest_sjs${scalaJSBinaryVersion()}_${Lib.scalaBinaryVersion(scalaVersion())}:0.6.3"
         )
       }
     }
@@ -50,7 +51,7 @@ object HelloJSWorldTests extends TestSuite {
         override def sources = T.input{ Agg(PathRef(basePath / 'src / 'scalatest)) }
         def testFramework: T[String] = "org.scalatest.tools.Framework"
         override def ivyDeps = Agg(
-          ivy"org.scalatest:scalatest_sjs${scalaJSBinaryVersion()}_${scalaBinaryVersion()}:3.0.4"
+          ivy"org.scalatest:scalatest_sjs${scalaJSBinaryVersion()}_${Lib.scalaBinaryVersion(scalaVersion())}:3.0.4"
         )
       }
     }