merge

Author: lihaoyi

build.mill

@@ -14,7 +14,7 @@ val communityBuildDottyVersion = sys.props.get("dottyVersion").toList
 val scala213Version = "2.13.14"
 
 val scalaVersions = Seq(
-  "3.3.1",
+  "3.7.0-RC1",
   "2.12.17",
   scala213Version
 ) ++ communityBuildDottyVersion
@@ -39,7 +39,8 @@ trait AcyclicModule extends ScalaModule {
   }
   def compileIvyDeps = acyclicDep
   def scalacPluginIvyDeps = acyclicDep
-  def scalacOptions = super.scalacOptions() ++ acyclicOptions()
+  def scalacOptions = super.scalacOptions() ++ acyclicOptions() ++
+    Agg.when(scalaVersion().startsWith("3"))("-experimental")
 }
 
 trait SafeDeps extends ScalaModule {
@@ -85,6 +86,8 @@ trait OsLibModule
     with SafeDeps
     with PlatformScalaModule { outer =>
 
+  def scalacPluginIvyDeps = super.scalacPluginIvyDeps() ++ Agg.when(scalaVersion().startsWith("2"))(ivy"com.lihaoyi::unroll-plugin:0.1.12")
+  def ivyDeps = super.ivyDeps() ++ Agg.when(scalaVersion().startsWith("2"))(ivy"com.lihaoyi::unroll-annotation:0.1.12")
   def publishVersion = VcsVersion.vcsState().format()
   def pomSettings = PomSettings(
     description = artifactName(),
@@ -101,18 +104,20 @@ trait OsLibModule
   )
 
   trait OsLibTestModule extends ScalaModule with TestModule.Utest with SafeDeps {
-    def ivyDeps = Agg(Deps.utest, Deps.sourcecode)
+    def ivyDeps = super.ivyDeps() ++ Agg(Deps.utest, Deps.sourcecode)
     // we check the textual output of system commands and expect it in english
     def forkEnv = super.forkEnv() ++ Map(
       "LC_ALL" -> "C",
       "TEST_SUBPROCESS_ENV" -> "value",
       "OS_TEST_RESOURCE_FOLDER" -> os.jvm(crossValue).test.resources().head.path.toString
     )
+    def scalacOptions = super.scalacOptions() ++
+      Agg.when(scalaVersion().startsWith("3"))("-experimental")
   }
 }
 
 trait OsModule extends OsLibModule { outer =>
-  def ivyDeps = Agg(Deps.geny)
+  def ivyDeps = super.ivyDeps() ++ Agg(Deps.geny)
   override def compileIvyDeps = T {
     val scalaReflectOpt = Option.when(!ZincWorkerUtil.isDottyOrScala3(scalaVersion()))(
       Deps.scalaReflect(scalaVersion())
@@ -187,6 +192,8 @@ object os extends Module {
       object testSpawnExitHook extends ScalaModule{
         def scalaVersion = OsJvmModule.this.scalaVersion()
         def moduleDeps = Seq(OsJvmModule.this)
+        def scalacOptions = super.scalacOptions() ++
+          Agg.when(scalaVersion().startsWith("3"))("-experimental")
       }
       object testSpawnExitHook2 extends JavaModule
     }

os/src/FileOps.scala

@@ -11,6 +11,7 @@ import java.nio.file.{Path => _, _}
 import java.nio.file.attribute.{FileAttribute, PosixFilePermission, PosixFilePermissions}
 
 import scala.util.Try
+import scala.annotation.unroll
 
 /**
  * Create a single directory at the specified path. Optionally takes in a
@@ -181,7 +182,7 @@ object copy {
       replaceExisting: Boolean = false,
       copyAttributes: Boolean = false,
       createFolders: Boolean = false,
-      mergeFolders: Boolean = false
+      @unroll mergeFolders: Boolean = false
   ): Unit = {
     checker.value.onRead(from)
     checker.value.onWrite(to)
@@ -213,29 +214,6 @@ object copy {
     if (stat(from, followLinks = followLinks).isDir) for (p <- walk(from)) copyOne(p)
   }
 
-  /** This overload is only to keep binary compatibility with older os-lib versions. */
-  @deprecated(
-    "Use os.copy(from, to, followLinks, replaceExisting, copyAttributes, " +
-      "createFolders, mergeFolders) instead",
-    "os-lib 0.7.5"
-  )
-  def apply(
-      from: Path,
-      to: Path,
-      followLinks: Boolean,
-      replaceExisting: Boolean,
-      copyAttributes: Boolean,
-      createFolders: Boolean
-  ): Unit = apply(
-    from = from,
-    to = to,
-    followLinks = followLinks,
-    replaceExisting = replaceExisting,
-    copyAttributes = copyAttributes,
-    createFolders = createFolders,
-    mergeFolders = false
-  )
-
   /**
    * Copy a file into a particular folder, rather
    * than into a particular path
@@ -248,7 +226,7 @@ object copy {
         replaceExisting: Boolean = false,
         copyAttributes: Boolean = false,
         createFolders: Boolean = false,
-        mergeFolders: Boolean = false
+        @unroll mergeFolders: Boolean = false
     ): Unit = {
       os.copy(
         from,
@@ -260,29 +238,6 @@ object copy {
         mergeFolders
       )
     }
-
-    /** This overload is only to keep binary compatibility with older os-lib versions. */
-    @deprecated(
-      "Use os.copy.into(from, to, followLinks, replaceExisting, copyAttributes, " +
-        "createFolders, mergeFolders) instead",
-      "os-lib 0.7.5"
-    )
-    def apply(
-        from: Path,
-        to: Path,
-        followLinks: Boolean,
-        replaceExisting: Boolean,
-        copyAttributes: Boolean,
-        createFolders: Boolean
-    ): Unit = apply(
-      from = from,
-      to = to,
-      followLinks = followLinks,
-      replaceExisting = replaceExisting,
-      copyAttributes = copyAttributes,
-      createFolders = createFolders,
-      mergeFolders = false
-    )
   }
 
   /**

os/src/Path.scala

@@ -477,8 +477,8 @@ object Path extends PathMacros {
     val f = implicitly[PathConvertible[T]].apply(f0)
     if (f.subpath(0, 1).toString != "~") if (base == null) Path(f0) else Path(f0, base)
     else {
-      Path(System.getProperty("user.home"))(PathConvertible.StringConvertible) /
-        RelPath(f.subpath(0, 1).relativize(f))(PathConvertible.NioPathConvertible)
+      Path(System.getProperty("user.home"))(using PathConvertible.StringConvertible) /
+        RelPath(f.subpath(0, 1).relativize(f))(using PathConvertible.NioPathConvertible)
     }
   }