From 694d323d67b492d38c15759d9b25f38e3119a767 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Sun, 19 May 2019 18:39:59 +0800 Subject: fix for 2.13.0-RC2 --- scalalib/src/ZincWorkerModule.scala | 3 +-- scratch/build.sc | 28 ++-------------------------- 2 files changed, 3 insertions(+), 28 deletions(-) diff --git a/scalalib/src/ZincWorkerModule.scala b/scalalib/src/ZincWorkerModule.scala index 7d81cb97..4c94102c 100644 --- a/scalalib/src/ZincWorkerModule.scala +++ b/scalalib/src/ZincWorkerModule.scala @@ -69,11 +69,10 @@ trait ZincWorkerModule extends mill.Module{ instance.asInstanceOf[mill.scalalib.api.ZincWorkerApi] } - private val Milestone213 = raw"""2.13.(\d+)-M(\d+)""".r def scalaCompilerBridgeSourceJar(scalaVersion: String, scalaOrganization: String) = { val (scalaVersion0, scalaBinaryVersion0) = scalaVersion match { - case Milestone213(_, _) => ("2.13.0-M2", "2.13.0-M2") + case s if s.startsWith("2.13.") => ("2.13.0-M2", "2.13.0-M2") case _ => (scalaVersion, mill.scalalib.api.Util.scalaBinaryVersion(scalaVersion)) } diff --git a/scratch/build.sc b/scratch/build.sc index 0a33c86e..d9271f2d 100644 --- a/scratch/build.sc +++ b/scratch/build.sc @@ -1,31 +1,7 @@ import mill.Agg import mill.scalalib._ -trait JUnitTests extends TestModule{ - def testFrameworks = Seq("com.novocode.junit.JUnitFramework") - - /** - * Overriden ivyDeps Docs!!! - */ - def ivyDeps = Agg(ivy"com.novocode:junit-interface:0.11") - def task = T{ - "???" - } -} - -/** - * The Core Module Docz! - */ -object core extends JavaModule{ - object test extends Tests with JUnitTests - - /** - * Core Task Docz! - */ - def task = T{ - import collection.JavaConverters._ - println(this.getClass.getClassLoader.getResources("scalac-plugin.xml").asScala.toList) - "Hello!" - } +object core extends ScalaModule{ + def scalaVersion = "2.13.0-RC2" } -- cgit v1.2.3