diff options
| -rwxr-xr-x | build.sc | 9 | ||||
| -rw-r--r-- | main/test/src/mill/main/JavaCompileJarTests.scala | 78 | ||||
| -rw-r--r-- | scalajslib/src/mill/scalajslib/ScalaJSModule.scala | 6 | ||||
| -rw-r--r-- | scalalib/src/mill/scalalib/ScalaWorkerApi.scala | 6 |
4 files changed, 55 insertions, 44 deletions
@@ -57,6 +57,9 @@ trait MillModule extends MillPublishModule{ outer => val test = new Tests(implicitly) class Tests(ctx0: mill.define.Ctx) extends mill.Module()(ctx0) with super.Tests{ + def repositories = super.repositories ++ Seq( + MavenRepository("https://oss.sonatype.org/content/repositories/releases") + ) def forkArgs = T{ testArgs() } def moduleDeps = if (this == main.test) Seq(main) @@ -69,8 +72,7 @@ trait MillModule extends MillPublishModule{ outer => object clientserver extends MillModule{ def ivyDeps = Agg( - ivy"com.lihaoyi:::ammonite:1.0.5-14-daf7e0d", - ivy"com.lihaoyi::upickle:0.6.0-RC6", + ivy"com.lihaoyi:::ammonite:1.0.5-22-16b9cde", ivy"org.scala-sbt.ipcsocket:ipcsocket:1.0.0" ) val test = new Tests(implicitly) @@ -85,8 +87,7 @@ object core extends MillModule { def ivyDeps = Agg( ivy"com.lihaoyi::sourcecode:0.1.4", - ivy"com.lihaoyi:::ammonite:1.0.5-14-daf7e0d", - ivy"com.lihaoyi::upickle:0.6.0-RC6", + ivy"com.lihaoyi:::ammonite:1.0.5-22-16b9cde", ivy"jline:jline:2.14.5" ) diff --git a/main/test/src/mill/main/JavaCompileJarTests.scala b/main/test/src/mill/main/JavaCompileJarTests.scala index 635ac3c5..6c45b454 100644 --- a/main/test/src/mill/main/JavaCompileJarTests.scala +++ b/main/test/src/mill/main/JavaCompileJarTests.scala @@ -10,56 +10,58 @@ object JavaCompileJarTests extends ScriptTestSuite(fork = false) { val tests = Tests{ initWorkspace() 'test - { - // Basic target evaluation works - assert(eval("classFiles")) - assert(eval("jar")) + if (!ammonite.util.Util.java9OrAbove) { + // Basic target evaluation works + assert(eval("classFiles")) + assert(eval("jar")) - val classFiles1 = meta("classFiles") - val jar1 = meta("jar") + val classFiles1 = meta("classFiles") + val jar1 = meta("jar") - assert(eval("classFiles")) - assert(eval("jar")) + assert(eval("classFiles")) + assert(eval("jar")) - // Repeated evaluation has the same results - val classFiles2 = meta("classFiles") - val jar2 = meta("jar") + // Repeated evaluation has the same results + val classFiles2 = meta("classFiles") + val jar2 = meta("jar") - assert( - jar1 == jar2, - classFiles1 == classFiles2 - ) + assert( + jar1 == jar2, + classFiles1 == classFiles2 + ) - // If we update resources, classFiles are unchanged but jar changes - for(scalaFile <- ls.rec(workspacePath).filter(_.ext == "txt")){ - write.append(scalaFile, "\n") - } + // If we update resources, classFiles are unchanged but jar changes + for(scalaFile <- ls.rec(workspacePath).filter(_.ext == "txt")){ + write.append(scalaFile, "\n") + } - assert(eval("classFiles")) - assert(eval("jar")) + assert(eval("classFiles")) + assert(eval("jar")) - val classFiles3 = meta("classFiles") - val jar3 = meta("jar") + val classFiles3 = meta("classFiles") + val jar3 = meta("jar") - assert( - jar2 != jar3, - classFiles2 == classFiles3 - ) + assert( + jar2 != jar3, + classFiles2 == classFiles3 + ) - // We can intentionally break the code, have the targets break, then - // fix the code and have them recover. - for(scalaFile <- ls.rec(workspacePath).filter(_.ext == "java")){ - write.append(scalaFile, "\n}") - } + // We can intentionally break the code, have the targets break, then + // fix the code and have them recover. + for(scalaFile <- ls.rec(workspacePath).filter(_.ext == "java")){ + write.append(scalaFile, "\n}") + } - assert(!eval("classFiles")) - assert(!eval("jar")) + assert(!eval("classFiles")) + assert(!eval("jar")) - for(scalaFile <- ls.rec(workspacePath).filter(_.ext == "java")){ - write.over(scalaFile, read(scalaFile).dropRight(2)) - } + for(scalaFile <- ls.rec(workspacePath).filter(_.ext == "java")){ + write.over(scalaFile, read(scalaFile).dropRight(2)) + } - assert(eval("classFiles")) - assert(eval("jar")) + assert(eval("classFiles")) + assert(eval("jar")) + } } } } diff --git a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala index 11b9eaf8..bddf894e 100644 --- a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala +++ b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala @@ -31,7 +31,11 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer => if (jsBridgePath != null) Success( Agg(PathRef(Path(jsBridgePath), quick = true)) ) else resolveDependencies( - Seq(Cache.ivy2Local, MavenRepository("https://repo1.maven.org/maven2")), + Seq( + Cache.ivy2Local, + MavenRepository("https://repo1.maven.org/maven2"), + MavenRepository("https://oss.sonatype.org/content/repositories/releases") + ), "2.12.4", Seq( ivy"com.lihaoyi::mill-scalajslib-jsbridges-${scalaJSBridgeVersion()}:${sys.props("MILL_VERSION")}" diff --git a/scalalib/src/mill/scalalib/ScalaWorkerApi.scala b/scalalib/src/mill/scalalib/ScalaWorkerApi.scala index a3760aed..9739089a 100644 --- a/scalalib/src/mill/scalalib/ScalaWorkerApi.scala +++ b/scalalib/src/mill/scalalib/ScalaWorkerApi.scala @@ -16,7 +16,11 @@ object ScalaWorkerModule extends mill.define.ExternalModule with ScalaWorkerModu lazy val millDiscover = Discover[this.type] } trait ScalaWorkerModule extends mill.Module{ - def repositories = Seq(Cache.ivy2Local, MavenRepository("https://repo1.maven.org/maven2")) + def repositories = Seq( + Cache.ivy2Local, + MavenRepository("https://repo1.maven.org/maven2"), + MavenRepository("https://oss.sonatype.org/content/repositories/releases") + ) def classpath = T{ val scalaWorkerJar = sys.props("MILL_SCALA_WORKER") |