From 5377ce71df95001d7b215826a4a8f480e4b19427 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Sat, 28 Oct 2017 13:33:10 +0200 Subject: [PATCH] Updates for 1.0.0-RC12-1 --- README.md | 18 +++++++++--------- coursier | Bin 14996 -> 23576 bytes csbt | Bin 15887 -> 24458 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 373d4ae3b..f6c61f57e 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-RC12") +addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC12-1") ``` 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-RC12", - "io.get-coursier" %% "coursier-cache" % "1.0.0-RC12" + "io.get-coursier" %% "coursier" % "1.0.0-RC12-1", + "io.get-coursier" %% "coursier-cache" % "1.0.0-RC12-1" ) ``` @@ -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-RC12") +addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC12-1") ``` 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-RC12 \ + io.get-coursier:coursier-cli_2.11:1.0.0-RC12-1 \ -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-RC12", - "io.get-coursier" %% "coursier-cache" % "1.0.0-RC12" + "io.get-coursier" %% "coursier" % "1.0.0-RC12-1", + "io.get-coursier" %% "coursier-cache" % "1.0.0-RC12-1" ) ``` -The first module, `"io.get-coursier" %% "coursier" % "1.0.0-RC12"`, mainly depends on +The first module, `"io.get-coursier" %% "coursier" % "1.0.0-RC12-1"`, 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-RC12"`, is precisely in charge of fetching +The second module, `"io.get-coursier" %% "coursier-cache" % "1.0.0-RC12-1"`, 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 badc7dcfc14e8873cab206a81711b3a5e663beaf..3a440ea66e062e4dc3a36253929836e7274c8d39 100755 GIT binary patch delta 12119 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 P7zhR$q2Ccf=X>to@|48f diff --git a/csbt b/csbt index e12cf65669c6cbf240fae5e86b2e178279ad0ecd..191cf4709cd63185664eb2524aa8ca4396b93ab4 100755 GIT binary patch delta 12391 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 delta 3771 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 diff --git a/doc/README.md b/doc/README.md index bf01a4aee..739c6dd77 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-RC12") +addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC12-1") ``` 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-RC12", - "io.get-coursier" %% "coursier-cache" % "1.0.0-RC12" + "io.get-coursier" %% "coursier" % "1.0.0-RC12-1", + "io.get-coursier" %% "coursier-cache" % "1.0.0-RC12-1" ) ``` @@ -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-RC12") +addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC12-1") ``` 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-RC12 \ + io.get-coursier:coursier-cli_2.11:1.0.0-RC12-1 \ -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-RC12", - "io.get-coursier" %% "coursier-cache" % "1.0.0-RC12" + "io.get-coursier" %% "coursier" % "1.0.0-RC12-1", + "io.get-coursier" %% "coursier-cache" % "1.0.0-RC12-1" ) ``` -The first module, `"io.get-coursier" %% "coursier" % "1.0.0-RC12"`, mainly depends on +The first module, `"io.get-coursier" %% "coursier" % "1.0.0-RC12-1"`, 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-RC12"`, is precisely in charge of fetching +The second module, `"io.get-coursier" %% "coursier-cache" % "1.0.0-RC12-1"`, 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 d3c11ce40..73a032669 100644 --- a/project/Mima.scala +++ b/project/Mima.scala @@ -22,6 +22,7 @@ object Mima { "1.0.0-RC10", "1.0.0-RC11", "1.0.0-RC12", + "1.0.0-RC12-1", "" // binary compatibility versions ) diff --git a/project/project/project/plugins.sbt b/project/project/project/plugins.sbt index b236eef23..d47ba715e 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-RC12" +def coursierVersion0 = "1.0.0-RC12-1" // required for just released things resolvers += Resolver.sonatypeRepo("releases") diff --git a/scripts/generate-launcher.sh b/scripts/generate-launcher.sh index 71f4ee7a7..b1c3a6d19 100755 --- a/scripts/generate-launcher.sh +++ b/scripts/generate-launcher.sh @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.0.0-RC12 +VERSION=1.0.0-RC12-1 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 7a4d1d946..0a40d8680 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-RC12 +VERSION=1.0.0-RC12-1 "$(dirname "$0")/../coursier" bootstrap \ "io.get-coursier:sbt-launcher_2.11:$VERSION" \