Merge branch 'master' into bump-zinc

15 files changed, 3 insertions, 3 deletions

diff --git a/scalalib/test/resources/hello-java/app/src/hello/Main.java b/scalalib/test/resources/hello-java/app/src/Main.java
index 23ddd679..23ddd679 100644
--- a/scalalib/test/resources/hello-java/app/src/hello/Main.java
+++ b/scalalib/test/resources/hello-java/app/src/Main.java
diff --git a/scalalib/test/resources/hello-java/app/test/src/hello/MyAppTests.java b/scalalib/test/resources/hello-java/app/test/src/MyAppTests.java
index df0d0351..df0d0351 100644
--- a/scalalib/test/resources/hello-java/app/test/src/hello/MyAppTests.java
+++ b/scalalib/test/resources/hello-java/app/test/src/MyAppTests.java
diff --git a/scalalib/test/resources/hello-java/core/src/hello/Core.java b/scalalib/test/resources/hello-java/core/src/Core.java
index 3ecb1f61..3ecb1f61 100644
--- a/scalalib/test/resources/hello-java/core/src/hello/Core.java
+++ b/scalalib/test/resources/hello-java/core/src/Core.java
diff --git a/scalalib/test/resources/hello-java/core/test/src/hello/MyCoreTests.java b/scalalib/test/resources/hello-java/core/test/src/MyCoreTests.java
index 38bebaeb..38bebaeb 100644
--- a/scalalib/test/resources/hello-java/core/test/src/hello/MyCoreTests.java
+++ b/scalalib/test/resources/hello-java/core/test/src/MyCoreTests.java
diff --git a/scalalib/test/src/mill/scalalib/GenIdeaTests.scala b/scalalib/test/src/GenIdeaTests.scala
index 50db95c0..50db95c0 100644
--- a/scalalib/test/src/mill/scalalib/GenIdeaTests.scala
+++ b/scalalib/test/src/GenIdeaTests.scala
diff --git a/scalalib/test/src/mill/scalalib/HelloJavaTests.scala b/scalalib/test/src/HelloJavaTests.scala
index 5b7b93b2..02c2567f 100644
--- a/scalalib/test/src/mill/scalalib/HelloJavaTests.scala
+++ b/scalalib/test/src/HelloJavaTests.scala
@@ -88,8 +88,8 @@ object HelloJavaTests extends TestSuite {
     'failures - {
       val eval = init()
 
-      val mainJava = HelloJava.millSourcePath / 'app / 'src / 'hello / "Main.java"
-      val coreJava = HelloJava.millSourcePath / 'core / 'src / 'hello / "Core.java"
+      val mainJava = HelloJava.millSourcePath / 'app / 'src / "Main.java"
+      val coreJava = HelloJava.millSourcePath / 'core / 'src / "Core.java"
 
       val Right(_) = eval.apply(HelloJava.core.compile)
       val Right(_) = eval.apply(HelloJava.app.compile)
diff --git a/scalalib/test/src/mill/scalalib/HelloWorldTests.scala b/scalalib/test/src/HelloWorldTests.scala
index da08f056..da08f056 100644
--- a/scalalib/test/src/mill/scalalib/HelloWorldTests.scala
+++ b/scalalib/test/src/HelloWorldTests.scala
diff --git a/scalalib/test/src/mill/scalalib/ResolveDepsTests.scala b/scalalib/test/src/ResolveDepsTests.scala
index 78361625..ce905907 100644
--- a/scalalib/test/src/mill/scalalib/ResolveDepsTests.scala
+++ b/scalalib/test/src/ResolveDepsTests.scala
@@ -4,7 +4,7 @@ import coursier.Cache
 import coursier.maven.MavenRepository
 import mill.api.Result.{Failure, Success}
 import mill.eval.{PathRef, Result}
-import mill.util.Loose.Agg
+import mill.api.Loose.Agg
 import utest._
 
 object ResolveDepsTests extends TestSuite {
diff --git a/scalalib/test/src/mill/scalalib/VersionControlTests.scala b/scalalib/test/src/VersionControlTests.scala
index fafdca2d..fafdca2d 100644
--- a/scalalib/test/src/mill/scalalib/VersionControlTests.scala
+++ b/scalalib/test/src/VersionControlTests.scala
diff --git a/scalalib/test/src/mill/scalalib/dependency/metadata/MetadataLoaderFactoryTests.scala b/scalalib/test/src/dependency/metadata/MetadataLoaderFactoryTests.scala
index 4c2206b8..4c2206b8 100644
--- a/scalalib/test/src/mill/scalalib/dependency/metadata/MetadataLoaderFactoryTests.scala
+++ b/scalalib/test/src/dependency/metadata/MetadataLoaderFactoryTests.scala
diff --git a/scalalib/test/src/mill/scalalib/dependency/updates/UpdatesFinderTests.scala b/scalalib/test/src/dependency/updates/UpdatesFinderTests.scala
index 7b6e6e36..7b6e6e36 100644
--- a/scalalib/test/src/mill/scalalib/dependency/updates/UpdatesFinderTests.scala
+++ b/scalalib/test/src/dependency/updates/UpdatesFinderTests.scala
diff --git a/scalalib/test/src/mill/scalalib/dependency/versions/VersionTests.scala b/scalalib/test/src/dependency/versions/VersionTests.scala
index b916c86f..b916c86f 100644
--- a/scalalib/test/src/mill/scalalib/dependency/versions/VersionTests.scala
+++ b/scalalib/test/src/dependency/versions/VersionTests.scala
diff --git a/scalalib/test/src/mill/scalalib/publish/IvyTests.scala b/scalalib/test/src/publish/IvyTests.scala
index d187f969..d187f969 100644
--- a/scalalib/test/src/mill/scalalib/publish/IvyTests.scala
+++ b/scalalib/test/src/publish/IvyTests.scala
diff --git a/scalalib/test/src/mill/scalalib/publish/PomTests.scala b/scalalib/test/src/publish/PomTests.scala
index 307ae379..307ae379 100644
--- a/scalalib/test/src/mill/scalalib/publish/PomTests.scala
+++ b/scalalib/test/src/publish/PomTests.scala
diff --git a/scalalib/test/src/mill/scalalib/scalafmt/ScalafmtTests.scala b/scalalib/test/src/scalafmt/ScalafmtTests.scala
index dcbdb769..dcbdb769 100644
--- a/scalalib/test/src/mill/scalalib/scalafmt/ScalafmtTests.scala
+++ b/scalalib/test/src/scalafmt/ScalafmtTests.scala