Skip to content
This repository has been archived by the owner on Sep 25, 2020. It is now read-only.

Commit

Permalink
bump dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
larsrh committed Apr 30, 2018
1 parent a2bbb55 commit 6b8e385
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 20 deletions.
28 changes: 14 additions & 14 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ lazy val loggingSettings = Seq(
// scalac requires this pseudo-transitive dependency of scalog to be present,
// even though we don't use its functionality here
// this seems to be an issue for Scala <= 2.11.x
"com.typesafe" % "config" % "1.3.2" % "provided"
"com.typesafe" % "config" % "1.3.3" % "provided"
)
)

Expand Down Expand Up @@ -134,7 +134,7 @@ lazy val docs = project.in(file("modules/docs"))
siteMappings += ((baseDirectory in ThisBuild).value / "README.md", "_includes/README.md"),
tutDirectory := "_tut",
// this seems to be required for scalog
libraryDependencies += "com.typesafe" % "config" % "1.3.2"
libraryDependencies += "com.typesafe" % "config" % "1.3.3"
)
.settings(
addMappingsToSiteDir(tut, tutDirectory)
Expand All @@ -151,9 +151,9 @@ lazy val pideInterface = project.in(file("modules/pide-interface"))
buildInfoKeys := apiBuildInfoKeys,
buildInfoPackage := "info.hupel.isabelle.api",
libraryDependencies ++= Seq(
"com.chuusai" %% "shapeless" % "2.3.2",
"io.monix" %% "monix-execution" % "3.0.0-M2",
"org.log4s" %% "log4s" % "1.4.0"
"com.chuusai" %% "shapeless" % "2.3.3",
"io.monix" %% "monix-execution" % "3.0.0-RC1",
"org.log4s" %% "log4s" % "1.6.1"
)
)

Expand All @@ -165,8 +165,8 @@ lazy val libisabelle = project.in(file("modules/libisabelle"))
.settings(macroSettings)
.settings(
libraryDependencies ++= Seq(
"org.typelevel" %% "cats-core" % "1.0.0-RC1",
"org.typelevel" %% "cats-free" % "1.0.0-RC1",
"org.typelevel" %% "cats-core" % "1.0.1",
"org.typelevel" %% "cats-free" % "1.0.1",
"com.lihaoyi" %% "scalatags" % "0.6.7",
"org.apache.commons" % "commons-lang3" % "3.7",
"info.hupel" % "classy" % "0.1.7",
Expand All @@ -185,10 +185,10 @@ lazy val setup = project.in(file("modules/setup"))
.settings(warningSettings)
.settings(
libraryDependencies ++= Seq(
"io.get-coursier" %% "coursier" % "1.0.0",
"io.get-coursier" %% "coursier-cache" % "1.0.0",
"org.apache.commons" % "commons-compress" % "1.15",
"org.eclipse.jgit" % "org.eclipse.jgit" % "4.9.1.201712030800-r",
"io.get-coursier" %% "coursier" % "1.0.3",
"io.get-coursier" %% "coursier-cache" % "1.0.3",
"org.apache.commons" % "commons-compress" % "1.16.1",
"org.eclipse.jgit" % "org.eclipse.jgit" % "4.11.0.201803080745-r",
"commons-io" % "commons-io" % "2.6"
)
)
Expand All @@ -210,14 +210,14 @@ def pide(version: String) = Project(s"pide$version", file(s"modules/pide/$versio
autoScalaLibrary := false,
libraryDependencies ++= Seq(
"org.scala-lang" % "scala-library" % scalaVersion.value % "provided",
("org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.6").exclude("org.scala-lang", "scala-library")
("org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.0").exclude("org.scala-lang", "scala-library")
),
assemblyJarName := s"${moduleName.value}-assembly.jar"
)

lazy val pideExtraSettings = Seq(
libraryDependencies ++= Seq(
"org.tukaani" % "xz" % "1.6",
"org.tukaani" % "xz" % "1.8",
"com.jcraft" % "jsch" % "0.1.54",
"com.jcraft" % "jzlib" % "1.1.3",
("org.scala-lang" % "scala-compiler" % scalaVersion.value).exclude("org.scala-lang", "scala-library")
Expand Down Expand Up @@ -273,7 +273,7 @@ lazy val tests = project.in(file("tests"))
.settings(noPublishSettings)
.aggregate(offlineTest, pureTest, holTest)

val specs2Version = "4.0.2"
val specs2Version = "4.1.0"

lazy val offlineTest = project.in(file("tests/offline"))
.dependsOn(setup, pidePackage)
Expand Down
4 changes: 2 additions & 2 deletions modules/libisabelle/src/main/scala/GenericEnvironment.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package info.hupel.isabelle
import scala.concurrent.duration._
import scala.sys.process._

import monix.execution.cancelables.MultiAssignmentCancelable
import monix.execution.cancelables.OrderedCancelable

import shapeless.tag._

Expand Down Expand Up @@ -69,7 +69,7 @@ final class GenericEnvironment private(context: Environment.Context, version: Ve
logger.debug(s"Executing '$tool' with arguments '${args.mkString(" ")}' ...")

val env = (variables ++ Map("USER_HOME" -> user.toString)).toList
val c = MultiAssignmentCancelable()
val c = OrderedCancelable()

try {
val proc = Process(binary.toString :: tool :: args, None, env: _*).run(console)
Expand Down
8 changes: 4 additions & 4 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ resolvers ++= Seq(
"jgit-repo" at "http://download.eclipse.org/jgit/maven"
)

addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")
addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.1")
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.6")
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.8")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.0")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0-M1")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.2" exclude("org.jruby", "jruby-complete"))
addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.6.2")
addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.6.4")
addSbtPlugin("info.hupel" % "sbt-api-mappings" % "3.0.1")
addSbtPlugin("info.hupel" % "sbt-jython" % "0.1.1")

Expand Down

0 comments on commit 6b8e385

Please sign in to comment.