From d36cf0c57bbeca9cd4fa47fbc9b28139e1693d27 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Sat, 3 Feb 2018 18:03:27 +0100 Subject: [PATCH] Updates for 1.0.1 --- README.md | 30 +++++++++--------- coursier | Bin 23352 -> 23346 bytes doc/readme/README.md | 30 +++++++++--------- project/Mima.scala | 1 + project/project/project/plugins.sbt | 2 +- scripts/generate-launcher.sh | 2 +- .../{1.0.1-SNAPSHOT => 1.0.2-SNAPSHOT} | 2 +- 7 files changed, 34 insertions(+), 33 deletions(-) rename tests/shared/src/test/resources/resolutions/io.get-coursier/coursier_2.11/{1.0.1-SNAPSHOT => 1.0.2-SNAPSHOT} (72%) diff --git a/README.md b/README.md index 04ffe4576..078586e92 100644 --- a/README.md +++ b/README.md @@ -73,10 +73,10 @@ 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.1-M1") +addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.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.1-M1-M5. +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.1-M5. ### Command-line @@ -126,8 +126,8 @@ echo 'autoload -Uz compinit ; compinit' >> ~/.zshrc Add to your `build.sbt` ```scala libraryDependencies ++= Seq( - "io.get-coursier" %% "coursier" % "1.0.1-M1", - "io.get-coursier" %% "coursier-cache" % "1.0.1-M1" + "io.get-coursier" %% "coursier" % "1.0.1", + "io.get-coursier" %% "coursier-cache" % "1.0.1" ) ``` @@ -230,7 +230,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.1-M1") +addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.1") ``` to `~/.sbt/0.13/plugins/build.sbt` @@ -405,7 +405,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.1-M1 \ + io.get-coursier:coursier-cli_2.11:1.0.1 \ -b -f -o coursier \ -M coursier.cli.Coursier ``` @@ -417,12 +417,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.1-M1", - "io.get-coursier" %% "coursier-cache" % "1.0.1-M1" + "io.get-coursier" %% "coursier" % "1.0.1", + "io.get-coursier" %% "coursier-cache" % "1.0.1" ) ``` -The first module, `"io.get-coursier" %% "coursier" % "1.0.1-M1"`, mainly depends on +The first module, `"io.get-coursier" %% "coursier" % "1.0.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), @@ -432,7 +432,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.1-M1"`, is precisely in charge of fetching +The second module, `"io.get-coursier" %% "coursier-cache" % "1.0.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. @@ -612,7 +612,7 @@ $ coursier resolve -t io.circe:circe-core_2.11:0.4.1 From SBT, with sbt-coursier enabled, the command `coursierDependencyTree` prints the dependency tree of the various sub-projects, ``` > coursierDependencyTree -io.get-coursier:coursier_2.11:1.0.1-M1-SNAPSHOT +io.get-coursier:coursier_2.11:1.0.1-SNAPSHOT ├─ com.lihaoyi:fastparse_2.11:0.3.7 | ├─ com.lihaoyi:fastparse-utils_2.11:0.3.7 | | ├─ com.lihaoyi:sourcecode_2.11:0.1.1 @@ -677,7 +677,7 @@ same time, I'd recommend an extreme caution at first, like manually inspecting the metadata files and compare with previous ones, to ensure everything's fine. coursier publishes its artifacts with its own plugin enabled since version -`1.0.1-M1-M2` though, without any apparent problem. +`1.0.1-M2` though, without any apparent problem. #### No wait on locked file @@ -775,15 +775,15 @@ $ cli/target/pack/bin/coursier The first releases were milestones like `0.1.0-M?`. As a launcher, basic Ivy repositories support, and an SBT plugin, were added in the mean time, -coursier is now aiming directly at `1.0.1-M1`. +coursier is now aiming directly at `1.0.1`. The last features I'd like to add until a feature freeze are mainly a better / nicer output, for both the command-line tools and the SBT plugin. -These are tracked via GitHub [issues](https://github.com/coursier/coursier/issues?q=is%3Aopen+is%3Aissue+milestone%3A1.0.1-M1), along with other points. +These are tracked via GitHub [issues](https://github.com/coursier/coursier/issues?q=is%3Aopen+is%3Aissue+milestone%3A1.0.1), along with other points. Milestones will keep being released until then. Then coursier should undergo `RC` releases, with no new features added, and only fixes and minor refactorings between them. -Once RCs will be considered stable enough, `1.0.1-M1` should be released. +Once RCs will be considered stable enough, `1.0.1` should be released. ## Contributors diff --git a/coursier b/coursier index 91be722ab428cb9dc8d7a8d0b861760e92f3ef41..3cc4c11b22ee5e6aebb35ab1f8567fead6856ced 100755 GIT binary patch delta 1408 zcmdn7jd9a9#tDwR68+9T-ufFS%wk|*$e!q@Sih04*?`BTT;-pl{e&fJByV%B)LHsg zu8GlGz`gV5|4WR4flJD4=ik2@dM%l~^Qmx>(EbSTxo2*cYO}s{U6%g7;gDlp>c!KiGlGqhLa$cNo|LX1;LXg!#lXP9zyNgfWHCk+ zW)N-5C1$e-o$9iEZ*0T!H?y-daBwhy?7O4N&BO;} z_!v#umEFb2z>vc<`MsOuW;fUAjO-jhMg9|=C%Xo#)So!W)u6z`a6$jpHJfk7hB-45 z{g!?G+jwE+?Z>joTlNXFM1V2C0g3@c zs+qhY#1b6lZ$hLqF9200=a&{0XQmbbql}S>ivb>KC{AGpDnx+qKxSq>UJXEFkbuPG zf>24Ytv#XAj1H4mgvu&_T!o~BK?<3}ki$6nAfucX!V{oalAUa~@f|QpnF%s5sGulc z!Z`V3xRC-#k!{!Z*k|g1lNum)Mp4A13v_|(|XlwY|1sDz3jjQg&N`d{vb`0 z)YvD-NAQ3xK;%huwYGskwK8zSVR;8RR|%nb?0?YY_9z8#4q6o@&DcHpSd^MPFhBVq UXBl8-K?0X1b4RPQMTLNb03lmtMF0Q* delta 1238 zcmdnAjd8~|#tDwRtM@wkgmkoAn!~`rP&m;~vEGoc*?`BjT;<&aZWYb!V`WZS-kH1G z6AlO+2~2tyZ>6Bsb!A=re|!7zYsu`LPlc15KDmj!nv(uh#BIib%}-UQls^&d$>^{s z-12bshn-=qYr1S!Gh4j5u$J|HkO`CL*8`U>?%`2*mt8MYRh)A3pNp)<+lc<#S34Rl zRTh`_+nmwpEi!pIb%pttg-08mQZJr9oe^x5d%E(Qh;1_q$3CyOwu zFoS4oMmaDY!>9_TTNpLL^ae&#<^_8lHw)Tdp8q$p~zfEk&F`ye6`+@4}!k;cH?jO+{?91I|9UfQTaq<879fiPaW zH?y;I0Hp&NoF+R5tK^(K$k|}P!*HN;(hR%12PIXm1ZZ#7%q*>Q{P6VsgKvgW^E+c^ z8_p}rcKz(Ko+)+l66Qs*_cmMAHbi`qnlMvBJtg8t{0Gr5ilvj2LO%-BGX!|Ea~N-K z;|TypT`>@Yf=2}C9EgSIgI$wh?Hrc3MugR4KgqQq76m{n~cl?CkKTXtKMDq zaEBXEs~1>1Ba;Y&2rzs(K;er>6_ZzmSXzNZfQsON6V3uLE&*|JerZv0W@?dsfHxx( z7Xu=qWJ9IJegYL_=3_|tg-X{;F@mMiGfOf`lh9S5*vSX73J#o5^cCkPL9DGXM)7wG*H9$=yO;i6!no=9n?a&NHEzDRx*XsYx> ~/.zshrc Add to your `build.sbt` ```scala libraryDependencies ++= Seq( - "io.get-coursier" %% "coursier" % "1.0.1-M1", - "io.get-coursier" %% "coursier-cache" % "1.0.1-M1" + "io.get-coursier" %% "coursier" % "1.0.1", + "io.get-coursier" %% "coursier-cache" % "1.0.1" ) ``` @@ -257,7 +257,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.1-M1") +addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.1") ``` to `~/.sbt/0.13/plugins/build.sbt` @@ -434,7 +434,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.1-M1 \ + io.get-coursier:coursier-cli_2.11:1.0.1 \ -b -f -o coursier \ -M coursier.cli.Coursier ``` @@ -446,12 +446,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.1-M1", - "io.get-coursier" %% "coursier-cache" % "1.0.1-M1" + "io.get-coursier" %% "coursier" % "1.0.1", + "io.get-coursier" %% "coursier-cache" % "1.0.1" ) ``` -The first module, `"io.get-coursier" %% "coursier" % "1.0.1-M1"`, mainly depends on +The first module, `"io.get-coursier" %% "coursier" % "1.0.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), @@ -461,7 +461,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.1-M1"`, is precisely in charge of fetching +The second module, `"io.get-coursier" %% "coursier-cache" % "1.0.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. @@ -646,7 +646,7 @@ $ coursier resolve -t io.circe:circe-core_2.11:0.4.1 From SBT, with sbt-coursier enabled, the command `coursierDependencyTree` prints the dependency tree of the various sub-projects, ``` > coursierDependencyTree -io.get-coursier:coursier_2.11:1.0.1-M1-SNAPSHOT +io.get-coursier:coursier_2.11:1.0.1-SNAPSHOT ├─ com.lihaoyi:fastparse_2.11:0.3.7 | ├─ com.lihaoyi:fastparse-utils_2.11:0.3.7 | | ├─ com.lihaoyi:sourcecode_2.11:0.1.1 @@ -711,7 +711,7 @@ same time, I'd recommend an extreme caution at first, like manually inspecting the metadata files and compare with previous ones, to ensure everything's fine. coursier publishes its artifacts with its own plugin enabled since version -`1.0.1-M1-M2` though, without any apparent problem. +`1.0.1-M2` though, without any apparent problem. #### No wait on locked file @@ -809,15 +809,15 @@ $ cli/target/pack/bin/coursier The first releases were milestones like `0.1.0-M?`. As a launcher, basic Ivy repositories support, and an SBT plugin, were added in the mean time, -coursier is now aiming directly at `1.0.1-M1`. +coursier is now aiming directly at `1.0.1`. The last features I'd like to add until a feature freeze are mainly a better / nicer output, for both the command-line tools and the SBT plugin. -These are tracked via GitHub [issues](https://github.com/coursier/coursier/issues?q=is%3Aopen+is%3Aissue+milestone%3A1.0.1-M1), along with other points. +These are tracked via GitHub [issues](https://github.com/coursier/coursier/issues?q=is%3Aopen+is%3Aissue+milestone%3A1.0.1), along with other points. Milestones will keep being released until then. Then coursier should undergo `RC` releases, with no new features added, and only fixes and minor refactorings between them. -Once RCs will be considered stable enough, `1.0.1-M1` should be released. +Once RCs will be considered stable enough, `1.0.1` should be released. ## Contributors diff --git a/project/Mima.scala b/project/Mima.scala index c93ec4030..0bd71b247 100644 --- a/project/Mima.scala +++ b/project/Mima.scala @@ -27,6 +27,7 @@ object Mima { "1.0.0-RC14", "1.0.0", "1.0.1-M1", + "1.0.1", "" // binary compatibility versions ) diff --git a/project/project/project/plugins.sbt b/project/project/project/plugins.sbt index fa1374ad6..5f20090bd 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.1-M1" +def coursierVersion0 = "1.0.1" // required for just released things resolvers += Resolver.sonatypeRepo("releases") diff --git a/scripts/generate-launcher.sh b/scripts/generate-launcher.sh index 8a62af02e..2cc1e9c3b 100755 --- a/scripts/generate-launcher.sh +++ b/scripts/generate-launcher.sh @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.0.1-M1 +VERSION=1.0.1 CACHE_VERSION=v1 SBTPACK_LAUNCHER="$(dirname "$0")/../cli/target/pack/bin/coursier" diff --git a/tests/shared/src/test/resources/resolutions/io.get-coursier/coursier_2.11/1.0.1-SNAPSHOT b/tests/shared/src/test/resources/resolutions/io.get-coursier/coursier_2.11/1.0.2-SNAPSHOT similarity index 72% rename from tests/shared/src/test/resources/resolutions/io.get-coursier/coursier_2.11/1.0.1-SNAPSHOT rename to tests/shared/src/test/resources/resolutions/io.get-coursier/coursier_2.11/1.0.2-SNAPSHOT index 7900afea1..39f599efa 100644 --- a/tests/shared/src/test/resources/resolutions/io.get-coursier/coursier_2.11/1.0.1-SNAPSHOT +++ b/tests/shared/src/test/resources/resolutions/io.get-coursier/coursier_2.11/1.0.2-SNAPSHOT @@ -1,4 +1,4 @@ -io.get-coursier:coursier_2.11:1.0.1-SNAPSHOT:compile +io.get-coursier:coursier_2.11:1.0.2-SNAPSHOT:compile org.scala-lang:scala-library:2.11.11:default org.scala-lang.modules:scala-xml_2.11:1.0.6:default org.scalaz:scalaz-core_2.11:7.2.16:default