Skip to content

Commit fae68f5

Browse files
committed
.
1 parent 3e3af41 commit fae68f5

File tree

2 files changed

+7
-51
lines changed

2 files changed

+7
-51
lines changed

build.sc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@ val communityBuildDottyVersion = sys.props.get("dottyVersion").toList
1313
val scala213Version = "2.13.10"
1414

1515
val scalaVersions = Seq(
16-
"3.1.3",
16+
"3.3.1",
1717
"2.12.17",
1818
scala213Version,
19-
"2.11.12"
2019
) ++ communityBuildDottyVersion
2120

2221
object Deps {
@@ -69,6 +68,8 @@ trait OsLibModule
6968
with SafeDeps
7069
with PlatformScalaModule { outer =>
7170

71+
def scalacPluginIvyDeps = super.scalacPluginIvyDeps() ++ Agg(ivy"com.lihaoyi::unroll-plugin:0.1.12")
72+
def ivyDeps = super.ivyDeps() ++ Agg(ivy"com.lihaoyi::unroll-annotation:0.1.12")
7273
def publishVersion = VcsVersion.vcsState().format()
7374
def pomSettings = PomSettings(
7475
description = artifactName(),
@@ -99,7 +100,7 @@ trait OsLibModule
99100
}
100101

101102
trait OsModule extends OsLibModule { outer =>
102-
def ivyDeps = Agg(Deps.geny)
103+
def ivyDeps = super.ivyDeps() ++ Agg(Deps.geny)
103104

104105
def artifactName = "os-lib"
105106

os/src/FileOps.scala

Lines changed: 3 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import java.nio.file.{Path => _, _}
1111
import java.nio.file.attribute.{FileAttribute, PosixFilePermission, PosixFilePermissions}
1212

1313
import scala.util.Try
14+
import scala.annotation.unroll
1415

1516
/**
1617
* Create a single directory at the specified path. Optionally takes in a
@@ -174,7 +175,7 @@ object copy {
174175
replaceExisting: Boolean = false,
175176
copyAttributes: Boolean = false,
176177
createFolders: Boolean = false,
177-
mergeFolders: Boolean = false
178+
@unroll mergeFolders: Boolean = false
178179
): Unit = {
179180
if (createFolders) makeDir.all(to / up)
180181
val opts1 =
@@ -205,29 +206,6 @@ object copy {
205206
if (stat(from, followLinks = followLinks).isDir) walk(from).map(copyOne)
206207
}
207208

208-
/** This overload is only to keep binary compatibility with older os-lib versions. */
209-
@deprecated(
210-
"Use os.copy(from, to, followLinks, replaceExisting, copyAttributes, " +
211-
"createFolders, mergeFolders) instead",
212-
"os-lib 0.7.5"
213-
)
214-
def apply(
215-
from: Path,
216-
to: Path,
217-
followLinks: Boolean,
218-
replaceExisting: Boolean,
219-
copyAttributes: Boolean,
220-
createFolders: Boolean
221-
): Unit = apply(
222-
from = from,
223-
to = to,
224-
followLinks = followLinks,
225-
replaceExisting = replaceExisting,
226-
copyAttributes = copyAttributes,
227-
createFolders = createFolders,
228-
mergeFolders = false
229-
)
230-
231209
/**
232210
* Copy a file into a particular folder, rather
233211
* than into a particular path
@@ -240,7 +218,7 @@ object copy {
240218
replaceExisting: Boolean = false,
241219
copyAttributes: Boolean = false,
242220
createFolders: Boolean = false,
243-
mergeFolders: Boolean = false
221+
@unroll mergeFolders: Boolean = false
244222
): Unit = {
245223
os.copy(
246224
from,
@@ -252,29 +230,6 @@ object copy {
252230
mergeFolders
253231
)
254232
}
255-
256-
/** This overload is only to keep binary compatibility with older os-lib versions. */
257-
@deprecated(
258-
"Use os.copy.into(from, to, followLinks, replaceExisting, copyAttributes, " +
259-
"createFolders, mergeFolders) instead",
260-
"os-lib 0.7.5"
261-
)
262-
def apply(
263-
from: Path,
264-
to: Path,
265-
followLinks: Boolean,
266-
replaceExisting: Boolean,
267-
copyAttributes: Boolean,
268-
createFolders: Boolean
269-
): Unit = apply(
270-
from = from,
271-
to = to,
272-
followLinks = followLinks,
273-
replaceExisting = replaceExisting,
274-
copyAttributes = copyAttributes,
275-
createFolders = createFolders,
276-
mergeFolders = false
277-
)
278233
}
279234

280235
/**

0 commit comments

Comments
 (0)