Repository: incubator-toree Updated Branches: refs/heads/master f58505617 -> 80882ad06
Updated to Coursier 1.0.0-M14 Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/18083e4b Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/18083e4b Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/18083e4b Branch: refs/heads/master Commit: 18083e4ba19925c35cb23de66a335b8a0d0826c4 Parents: 9b577f1 Author: Justin Polchlopek <jpolchlo...@azavea.com> Authored: Tue Nov 15 13:27:40 2016 -0500 Committer: Justin Polchlopek <jpolchlo...@azavea.com> Committed: Tue Nov 15 13:27:40 2016 -0500 ---------------------------------------------------------------------- kernel-api/build.sbt | 4 ++-- .../CoursierDependencyDownloader.scala | 20 ++++++++++---------- project/plugins.sbt | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/18083e4b/kernel-api/build.sbt ---------------------------------------------------------------------- diff --git a/kernel-api/build.sbt b/kernel-api/build.sbt index eff931a..26e9d6f 100644 --- a/kernel-api/build.sbt +++ b/kernel-api/build.sbt @@ -52,8 +52,8 @@ libraryDependencies += "com.typesafe" % "config" % "1.3.0" libraryDependencies ++= Seq( // Used to find and download jars from Maven-based repositories "org.apache.ivy" % "ivy" % "2.4.0-rc1", // Apache v2 - "io.get-coursier" %% "coursier" % "1.0.0-M12", // Apache v2 - "io.get-coursier" %% "coursier-cache" % "1.0.0-M12" // Apache v2 + "io.get-coursier" %% "coursier" % "1.0.0-M14", // Apache v2 + "io.get-coursier" %% "coursier-cache" % "1.0.0-M14" // Apache v2 ) // Brought in in order to simplify the reading of each project's ivy.xml file http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/18083e4b/kernel-api/src/main/scala/org/apache/toree/dependencies/CoursierDependencyDownloader.scala ---------------------------------------------------------------------- diff --git a/kernel-api/src/main/scala/org/apache/toree/dependencies/CoursierDependencyDownloader.scala b/kernel-api/src/main/scala/org/apache/toree/dependencies/CoursierDependencyDownloader.scala index 4751f67..2e9b039 100644 --- a/kernel-api/src/main/scala/org/apache/toree/dependencies/CoursierDependencyDownloader.scala +++ b/kernel-api/src/main/scala/org/apache/toree/dependencies/CoursierDependencyDownloader.scala @@ -113,7 +113,7 @@ class CoursierDependencyDownloader extends DependencyDownloader { printStream.println(s"-> ${fetchUris.mkString("\n-> ")}") // Verify locations where we will download dependencies - val resolution = start.process.run(fetch).run + val resolution = start.process.run(fetch).unsafePerformSync // Report any resolution errors val errors: Seq[(Dependency, Seq[String])] = resolution.errors @@ -131,7 +131,7 @@ class CoursierDependencyDownloader extends DependencyDownloader { artifact = a, cache = downloadLocations, logger = Some(new DownloadLogger(verbose, trace)) - ).run)).run + ).run)).unsafePerformSync // Print any errors in retrieving dependencies localArtifacts.flatMap(_.swap.toOption).map(_.message) @@ -161,7 +161,7 @@ class CoursierDependencyDownloader extends DependencyDownloader { */ override def removeMavenRepository(url: URL): Unit = { repositories = repositories.filterNot { - case MavenRepository(urlString, _, _, _) => url.toString == urlString + case MavenRepository(urlString, _, _, _, _) => url.toString == urlString case _ => false } } @@ -313,19 +313,19 @@ class CoursierDependencyDownloader extends DependencyDownloader { * @return The resulting URIs */ private def repositoriesToURIs(repositories: Seq[Repository]) = repositories.map { - case IvyRepository(pattern, _, _, _, _, _, _, _, _) => pattern - case MavenRepository(root, _, _, _) => root + case IvyRepository(pattern, _, _, _, _, _, _, _) => pattern.string + case MavenRepository(root, _, _, _, _) => root }.map(new URI(_)) /** Creates new Ivy2 local repository using base home URI. */ - private def ivy2Local(ivy2HomeUri: URI) = IvyRepository( + private def ivy2Local(ivy2HomeUri: URI) = IvyRepository.parse( ivy2HomeUri.toString + "local/" + "[organisation]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)" + "[revision]/[type]s/[artifact](-[classifier]).[ext]" - ) + ).toOption.get /** Creates new Ivy2 cache repository using base home URI. */ - private def ivy2Cache(ivy2HomeUri: URI) = IvyRepository( + private def ivy2Cache(ivy2HomeUri: URI) = IvyRepository.parse( ivy2HomeUri.toString + "cache/" + "(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[organisation]/[module]/" + "[type]s/[artifact]-[revision](-[classifier]).[ext]", @@ -337,7 +337,7 @@ class CoursierDependencyDownloader extends DependencyDownloader { withChecksums = false, withSignatures = false, dropInfoAttributes = true - ) + ).toOption.get } @@ -386,4 +386,4 @@ object Credentials { def apply(file: File): Credentials = FromFile(file) -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/18083e4b/project/plugins.sbt ---------------------------------------------------------------------- diff --git a/project/plugins.sbt b/project/plugins.sbt index d0b08ba..61c6905 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -52,7 +52,7 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "0.8.1") addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.3") // Provides alternative resolving/downloading over sbt -//addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M12") +//addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M14") // Used for signing jars published via `sbt publish-signed` addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
