From cbf3ff555839adbfbc2817fe54ab4e8daf2984c6 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 12 Dec 2017 02:05:09 +0100 Subject: [PATCH] Updates for 1.0.0-RC14 --- README.md | 18 +++++++++--------- coursier | Bin 23573 -> 23375 bytes csbt | Bin 24455 -> 24256 bytes doc/README.md | 18 +++++++++--------- project/Mima.scala | 1 + project/project/project/plugins.sbt | 2 +- scripts/generate-launcher.sh | 2 +- scripts/generate-sbt-launcher.sh | 2 +- 8 files changed, 22 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index d5ea67de2..694f128f3 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ Lastly, it can be used programmatically via its [API](#api) and has a Scala JS [ Enable the SBT plugin by adding ```scala -addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC13") +addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC14") ``` to `~/.sbt/0.13/plugins/build.sbt` (enables it globally), or to the `project/plugins.sbt` file of an SBT project. Tested with SBT 0.13.8 / 0.13.9 / 0.13.11 / 0.13.12 / 0.13.13 / 0.13.15 / 0.13.16-M1 / 1.0.0-M5. @@ -111,8 +111,8 @@ $ ./coursier fetch org.apache.spark:spark-sql_2.11:1.6.1 com.twitter:algebird-sp Add to your `build.sbt` ```scala libraryDependencies ++= Seq( - "io.get-coursier" %% "coursier" % "1.0.0-RC13", - "io.get-coursier" %% "coursier-cache" % "1.0.0-RC13" + "io.get-coursier" %% "coursier" % "1.0.0-RC14", + "io.get-coursier" %% "coursier-cache" % "1.0.0-RC14" ) ``` @@ -215,7 +215,7 @@ of the cache used by a particular project, in case you have any doubt about what Enable the SBT plugin globally by adding ```scala -addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC13") +addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC14") ``` to `~/.sbt/0.13/plugins/build.sbt` @@ -368,7 +368,7 @@ The `bootstrap` generates tiny bootstrap launchers, able to pull their dependenc repositories on first launch. For example, the launcher of coursier is [generated](https://github.com/coursier/coursier/blob/master/scripts/generate-launcher.sh) with a command like ``` $ ./coursier bootstrap \ - io.get-coursier:coursier-cli_2.11:1.0.0-RC13 \ + io.get-coursier:coursier-cli_2.11:1.0.0-RC14 \ -b -f -o coursier \ -M coursier.cli.Coursier ``` @@ -380,12 +380,12 @@ See `./coursier bootstrap --help` for a list of the available options. Add to your `build.sbt` ```scala libraryDependencies ++= Seq( - "io.get-coursier" %% "coursier" % "1.0.0-RC13", - "io.get-coursier" %% "coursier-cache" % "1.0.0-RC13" + "io.get-coursier" %% "coursier" % "1.0.0-RC14", + "io.get-coursier" %% "coursier-cache" % "1.0.0-RC14" ) ``` -The first module, `"io.get-coursier" %% "coursier" % "1.0.0-RC13"`, mainly depends on +The first module, `"io.get-coursier" %% "coursier" % "1.0.0-RC14"`, mainly depends on `scalaz-core` (and only it, *not* `scalaz-concurrent` for example). It contains among others, definitions, mainly in [`Definitions.scala`](https://github.com/coursier/coursier/blob/master/core/shared/src/main/scala/coursier/core/Definitions.scala), @@ -395,7 +395,7 @@ that expects to be given metadata, wrapped in any `Monad`, then feeds these to ` you the final `Resolution`, wrapped in the same `Monad` it was given input. This final `Resolution` has all the dependencies, including the transitive ones. -The second module, `"io.get-coursier" %% "coursier-cache" % "1.0.0-RC13"`, is precisely in charge of fetching +The second module, `"io.get-coursier" %% "coursier-cache" % "1.0.0-RC14"`, is precisely in charge of fetching these input metadata. It uses `scalaz.concurrent.Task` as a `Monad` to wrap them. It also fetches artifacts (JARs, etc.). It caches all of these (metadata and artifacts) on disk, and validates checksums too. diff --git a/coursier b/coursier index 5b1aff668735ce740577fab5c2d41d82b5665290..0e5427af347839384366d1649e91a4251bf84cea 100755 GIT binary patch delta 7264 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 D!^btx delta 7486 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 diff --git a/csbt b/csbt index f52c1015d0fcd2e4894569ac5112e65f3ce55339..b717f386fcdacbeb004bb0418fef0389f928eff4 100755 GIT binary patch delta 7566 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 delta 7925 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 diff --git a/doc/README.md b/doc/README.md index 6699055dc..859d28dd1 100644 --- a/doc/README.md +++ b/doc/README.md @@ -73,7 +73,7 @@ Lastly, it can be used programmatically via its [API](#api) and has a Scala JS [ Enable the SBT plugin by adding ```scala -addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC13") +addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC14") ``` to `~/.sbt/0.13/plugins/build.sbt` (enables it globally), or to the `project/plugins.sbt` file of an SBT project. Tested with SBT 0.13.8 / 0.13.9 / 0.13.11 / 0.13.12 / 0.13.13 / 0.13.15 / 0.13.16-M1 / 1.0.0-M5. @@ -111,8 +111,8 @@ $ ./coursier fetch org.apache.spark:spark-sql_2.11:1.6.1 com.twitter:algebird-sp Add to your `build.sbt` ```scala libraryDependencies ++= Seq( - "io.get-coursier" %% "coursier" % "1.0.0-RC13", - "io.get-coursier" %% "coursier-cache" % "1.0.0-RC13" + "io.get-coursier" %% "coursier" % "1.0.0-RC14", + "io.get-coursier" %% "coursier-cache" % "1.0.0-RC14" ) ``` @@ -242,7 +242,7 @@ of the cache used by a particular project, in case you have any doubt about what Enable the SBT plugin globally by adding ```scala -addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC13") +addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC14") ``` to `~/.sbt/0.13/plugins/build.sbt` @@ -397,7 +397,7 @@ The `bootstrap` generates tiny bootstrap launchers, able to pull their dependenc repositories on first launch. For example, the launcher of coursier is [generated](https://github.com/coursier/coursier/blob/master/scripts/generate-launcher.sh) with a command like ``` $ ./coursier bootstrap \ - io.get-coursier:coursier-cli_2.11:1.0.0-RC13 \ + io.get-coursier:coursier-cli_2.11:1.0.0-RC14 \ -b -f -o coursier \ -M coursier.cli.Coursier ``` @@ -409,12 +409,12 @@ See `./coursier bootstrap --help` for a list of the available options. Add to your `build.sbt` ```scala libraryDependencies ++= Seq( - "io.get-coursier" %% "coursier" % "1.0.0-RC13", - "io.get-coursier" %% "coursier-cache" % "1.0.0-RC13" + "io.get-coursier" %% "coursier" % "1.0.0-RC14", + "io.get-coursier" %% "coursier-cache" % "1.0.0-RC14" ) ``` -The first module, `"io.get-coursier" %% "coursier" % "1.0.0-RC13"`, mainly depends on +The first module, `"io.get-coursier" %% "coursier" % "1.0.0-RC14"`, mainly depends on `scalaz-core` (and only it, *not* `scalaz-concurrent` for example). It contains among others, definitions, mainly in [`Definitions.scala`](https://github.com/coursier/coursier/blob/master/core/shared/src/main/scala/coursier/core/Definitions.scala), @@ -424,7 +424,7 @@ that expects to be given metadata, wrapped in any `Monad`, then feeds these to ` you the final `Resolution`, wrapped in the same `Monad` it was given input. This final `Resolution` has all the dependencies, including the transitive ones. -The second module, `"io.get-coursier" %% "coursier-cache" % "1.0.0-RC13"`, is precisely in charge of fetching +The second module, `"io.get-coursier" %% "coursier-cache" % "1.0.0-RC14"`, is precisely in charge of fetching these input metadata. It uses `scalaz.concurrent.Task` as a `Monad` to wrap them. It also fetches artifacts (JARs, etc.). It caches all of these (metadata and artifacts) on disk, and validates checksums too. diff --git a/project/Mima.scala b/project/Mima.scala index 26e9ee7ad..1c74e0e61 100644 --- a/project/Mima.scala +++ b/project/Mima.scala @@ -24,6 +24,7 @@ object Mima { "1.0.0-RC12", "1.0.0-RC12-1", "1.0.0-RC13", + "1.0.0-RC14", "" // binary compatibility versions ) diff --git a/project/project/project/plugins.sbt b/project/project/project/plugins.sbt index c8870251a..3b5ed8256 100644 --- a/project/project/project/plugins.sbt +++ b/project/project/project/plugins.sbt @@ -1,7 +1,7 @@ addSbtPlugin("io.get-coursier" % "sbt-coursier" % coursierVersion0) // important: this line is matched / substituted during releases (via sbt-release) -def coursierVersion0 = "1.0.0-RC13" +def coursierVersion0 = "1.0.0-RC14" // required for just released things resolvers += Resolver.sonatypeRepo("releases") diff --git a/scripts/generate-launcher.sh b/scripts/generate-launcher.sh index 974fa691a..384e9dfc4 100755 --- a/scripts/generate-launcher.sh +++ b/scripts/generate-launcher.sh @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.0.0-RC13 +VERSION=1.0.0-RC14 CACHE_VERSION=v1 SBTPACK_LAUNCHER="$(dirname "$0")/../cli/target/pack/bin/coursier" diff --git a/scripts/generate-sbt-launcher.sh b/scripts/generate-sbt-launcher.sh index 18ef02dbe..a8558551a 100755 --- a/scripts/generate-sbt-launcher.sh +++ b/scripts/generate-sbt-launcher.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -e -VERSION=1.0.0-RC13 +VERSION=1.0.0-RC14 "$(dirname "$0")/../coursier" bootstrap \ "io.get-coursier:sbt-launcher_2.11:$VERSION" \