Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump os-lib, upickle, requests versions #1022

Merged
merged 2 commits into from
Dec 18, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ trait AmmDependenciesResourceFileModule extends JavaModule{
object ops extends Cross[OpsModule](binCrossScalaVersions:_*)
class OpsModule(val crossScalaVersion: String) extends AmmModule{
def ivyDeps = Agg(
ivy"com.lihaoyi::os-lib:0.4.2",
ivy"com.lihaoyi::os-lib:0.5.0",
ivy"org.scala-lang.modules::scala-collection-compat:2.1.2"
)
def scalacOptions = super.scalacOptions().filter(!_.contains("acyclic"))
Expand Down Expand Up @@ -170,8 +170,8 @@ object amm extends Cross[MainModule](fullCrossScalaVersions:_*){
def moduleDeps = Seq(ops(), amm.util(), interp.api(), amm.repl.api())
def crossFullScalaVersion = true
def ivyDeps = Agg(
ivy"com.lihaoyi::upickle:0.8.0",
ivy"com.lihaoyi::requests:0.2.0"
ivy"com.lihaoyi::upickle:0.9.0",
ivy"com.lihaoyi::requests:0.3.0"
)
}

Expand Down
2 changes: 1 addition & 1 deletion ops/src/test/scala/test/ammonite/ops/OpTests.scala
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ object OpTests extends TestSuite{
test("concatenating"){
write(d/'concat1, Seq("a", "b", "c"))
assert(read(d/'concat1) == "abc")
write(d/'concat2, Array(Array[Byte](1, 2), Array[Byte](3, 4)))
write(d/'concat2, Seq(Array[Byte](1, 2), Array[Byte](3, 4)))
assert(read.bytes(d/'concat2).toSeq == Array[Byte](1, 2, 3, 4).toSeq)
}
test("writeAppend"){
Expand Down