Migrate most classpath-related code onto `Loose.OSet` abstraction, to enforce deduplication

1 files changed, 4 insertions, 5 deletions

diff --git a/integration/src/test/resources/acyclic/build.sc b/integration/src/test/resources/acyclic/build.sc
index 66d64501..094893f5 100644
--- a/integration/src/test/resources/acyclic/build.sc
+++ b/integration/src/test/resources/acyclic/build.sc
@@ -1,9 +1,9 @@
 import mill.Cross
-import mill.scalalib.{SbtModule, PublishModule, Dep}
+import mill.scalalib.{SbtModule, PublishModule, Dep, CrossSbtModule}
 import mill.scalalib.publish.{PomSettings, License, Developer, SCM}
 
 object acyclic extends Cross[AcyclicModule]("2.10.6", "2.11.8", "2.12.3", "2.12.4")
-class AcyclicModule(crossVersion: String) extends SbtModule with PublishModule {
+class AcyclicModule(val crossScalaVersion: String) extends CrossSbtModule with PublishModule {
   def basePath = super.basePath / ammonite.ops.up
   def artifactName = "acyclic"
   def publishVersion = "0.1.7"
@@ -24,13 +24,12 @@ class AcyclicModule(crossVersion: String) extends SbtModule with PublishModule {
     )
   )
 
-  def scalaVersion = crossVersion
-  def ivyDeps = Seq(
+  def ivyDeps = OSet(
     Dep.Java("org.scala-lang", "scala-compiler", scalaVersion())
   )
   object test extends Tests{
     def forkWorkingDir = ammonite.ops.pwd / 'target / 'workspace / 'acyclic
-    def ivyDeps = Seq(
+    def ivyDeps = OSet(
       Dep("com.lihaoyi", "utest", "0.6.0")
     )
     def testFramework = "utest.runner.Framework"