From 6e86986cde48bab96b5b34d37835f2785d55d5cb Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 18 Jul 2017 17:43:40 +0200 Subject: [PATCH] Updates for 1.0.0-RC7 --- README.md | 18 +++++++++--------- coursier | Bin 15034 -> 14997 bytes csbt | Bin 15934 -> 15871 bytes doc/README.md | 18 +++++++++--------- project/Mima.scala | 1 + project/plugins.sbt | 2 +- project/project/plugins.sbt | 2 +- project/project/project/plugins.sbt | 2 +- scripts/generate-launcher.sh | 2 +- scripts/generate-sbt-launcher.sh | 2 +- 10 files changed, 24 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 88721beaa..e83428c75 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-RC6") +addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC7") ``` 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-RC6", - "io.get-coursier" %% "coursier-cache" % "1.0.0-RC6" + "io.get-coursier" %% "coursier" % "1.0.0-RC7", + "io.get-coursier" %% "coursier-cache" % "1.0.0-RC7" ) ``` @@ -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-RC6") +addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC7") ``` 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/project/generate-launcher.sh) with a command like ``` $ ./coursier bootstrap \ - io.get-coursier:coursier-cli_2.11:1.0.0-RC6 \ + io.get-coursier:coursier-cli_2.11:1.0.0-RC7 \ -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-RC6", - "io.get-coursier" %% "coursier-cache" % "1.0.0-RC6" + "io.get-coursier" %% "coursier" % "1.0.0-RC7", + "io.get-coursier" %% "coursier-cache" % "1.0.0-RC7" ) ``` -The first module, `"io.get-coursier" %% "coursier" % "1.0.0-RC6"`, mainly depends on +The first module, `"io.get-coursier" %% "coursier" % "1.0.0-RC7"`, 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-RC6"`, is precisely in charge of fetching +The second module, `"io.get-coursier" %% "coursier-cache" % "1.0.0-RC7"`, 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 cae085eb78fb2a0ef1ecdf6a04c7dec905e7bd50..19fe16c49b9ca7af651f148ec41f8552a9c9bbd1 100755 GIT binary patch delta 624 zcmdm0I<<6yBS&KIC$Dv`UdtzX8Z)i(m{>Q187MMYl2L^@q4(2fb7OWUb_Na(1`sDv zw4EI+dQV^<6PV$^xCX+QFT9@-Eb>~$Qw+>_&z#N)W;F6gL8Kyi6`9yMfMz8FEpRo} zXEIZpTxJ?6xkf;HV=@B+LoW~qcr&wz0PTY)dSU9q3{tFbrdhA)8~Q=(Y@orG00Wcl zMuyvr41x>Fc=-Yij0{Ykd!0J3uc@c$rE}r5@0l~j=R9@vw)vjZ*VQ`bqkGBw+{r7& zZACkPhO=}0b6#2K4z$P{Y#Aey2!jX%$bYb4m=6>$W@G@0vH)2KF!_&}8aQNB%}oS> zf#J3E=h>8NK!xng3=C3}v&>Z{U$f*_fd-Y=_SjmTAa(`@3qGJM!W1Bji+S=w3(?6Q zmcj}kW6sz7IM~j_z_0{poeYY?DO^B>TA(1D9Ahrc6v_+M*JmyY7CL7k&B!u&frZ#4 zOJT4;oTW6=F+rdjk;(m*LSVBepMJE!gcBI3f(#52C}s<3O#a6#HTkYN4_IN8d4irS z&@XR*SP4a8jp5`#3j?qPZ-9=tX#})DY_hxs9}hH+yg;!x`J<%;IHGi{oOpo|<^>Ps N$<T8Z*rjnOHZ287MMYl2L^@v-0NVnY?S5z>F}BbWSis z)>x5=oq>ac0VI9EFp3c@dV^~pM4gAgeu#)4b2~d&ic82-49sv~WM^XM0P4ÐtD` z&m<-`xy&?DGJa>aX)*%?LoW~qcr&wz08NJ|dSU9q3{tFbrdh9dHuwWml5#MsbFj9v zv$nD@Yx?yE0<6l+&c*AN{P{EK(WFI3nD(wYqBQ-CQuNeUmmXbF+S~Kz&XuUzy-)sJ zTJ-456{Xr8R<+Ky%(l#T71E7W_U`PQS$WQ~^XSoS2E0`#EoWAp3*Zw6x`3Ty=aSXN zIY8I6gI&bPB*GxV%K-8-EU+f;H?sqU(6lPK@x0~R8aH&_b5LU6J^P}r7#@_9p*$pw}?3P8iW&e!}n*v`bj zu!MzyK?djo1ehfN*8iJ}i$A~{>@2XWKrV;|+7>MgmhQ0-f!Js+%_J)dvC&)vY_x6H z_Ss@$3=Fcm3=9$obAhboGC+lDU`0!Ro=v&N$iTqP%)lUpqUf^`*t86D0Ul@+d4VEt e@)=7Da6GYFIq?GH%L^WUlf$em*=Cx73;_TNP0O_a diff --git a/csbt b/csbt index c540e9f7f8951ca7635d11ad7b2e960b661c6b60..2d02ec7290d692a5824ca1971145f98f2962346a 100755 GIT binary patch delta 1312 zcmdm2^S^pR5XZIdPhRU>y_QdmGGEOkhSJ;~EHKgYbSvu*e@7PcaZ<6H7WLSYQ%=6htPASCNUG187uw@2AOO zrYiLzr~M8a2<-W+FKxc|idT$f@k90t$1FN0Cc9@#Z>_O?ZNp{K*%Go?=F!~P>~Bvq zonQQ2EO74kA?xmkmsTGNR9>>#@uq^u*K@BQcxaz*3w-f&!Q6}xhL=i}YdwBwH5|-H zUHzgoe#%mf?%0jZ)0bbq#2z01vG2=;XP$|64K8WBeCv~r&Q|ArX*JQw_L^4fwOxs~ zoCE#Xc#hffXdd!5IT5?1_r;xP6Q2GHJB{xzmCHY{@X+JES52+9Y!u44BI&v9MyQ0Z zz$9jd-*OkC#0@gi|IRrz@At2o8+?tHPwwqo60q2AilD4l(H`E|{zSj#{i=M-^9mI% z2Zpzl2zDxM{O^=l@3eVCou9p4*D_oCLhI9qnc4-oOab2P9F>MPhJ}m_46y?23=9F@%q$|n z=!HZIx4929C~~6A&FXWzH}Wj(^l!X`AE!^hPlW*GcPVTpm0rS^cXx3}`hJMgG8)&d4 zz`$g?k>NHYlfZ&9UcNvBBLkD?UZ>9MYwBrw>0CJNd*)2>IZqwEZNBI9b+yj<=w8zH z(>m#?bJqJD!=~ECOMR@YF+ex4bNrvSxHAxFcMuQm}r8HA0FHlHqva*$k0!XjX zlwH|fKudFg`lS#Wfh-mQu-+-w!eE8AUE61ii7_z9>M}4$peQ^h2vjICSzeZHvZf6W z*di+{X(l0!$^0x*7>IW_bWSis z&sdR(oq>ac0VI9VFp3c@`jTrOL|vr7euzjsb2~d&N?OQM49o~*WM^XM0O~BLyg50{ zRHZ)jw%=g`p4#W}m)6WRQHiU3)++CiS1@~l$;u)}>G=N3r;qIlbJAJCU)m=-H~D&5 zD#zaXM|Y~?E3y^lROzhA-nl_-0q32>{JmV)G{2Nw;F!mgTG`#mDLps*#g6sNmj!w! zytub&kxpggn=aYvTDv>HZrlv7X{er1KUpE?c<_q$dbZ$<#ZgLk#h;cW9DXR*Ci0Lq zL*eJLr*mujXFU+KD*H9*MIs}gxvN{KYA&?^Dg2o1XTZXA^cFhuI3=lUq!8oV-~a=wF)mM>q1PC%10B z!!JguGMiJj*LVM51v#bp;Emt}1_p+&K#bxNFNR4LpdS`<_FeNDm zvpNTBJ3DJ9C$pwse;~lB%-rv_K6_Bmu8Z(`B|x=)FngaMQvU>Rw$rKKG> z4^>&3fYSZsZY$}@XDr1hpX24!3GhZ}0LpnyKK*Ec2`A9!f(#52Km!qAHS^>KYc;R| zKdq&iM0qDCFp5srw&90mzR4?r!nXXA9~i1ker3%AR_SOZ%{XiFM=P<(yxg3VYpi$_ zK$aLy*_GV|jO-jH1_mjF4M0}3Fxb>u0rts!P$Pa?N;AodLM*cq2Ae7iv}m~uP)KC5 zpS2KJXd_V7XCt7Hj3~@Y&;;ZKPFs`RZOp-O)@UQmxNY)W8#M)BqVhtHY*iGOu$oVv zXCpS*$Ch_8o2>v?tE8?0a<47KG~}27#sLzDw3xikLTvI&TLCs1 HOOQAKJq7GF diff --git a/doc/README.md b/doc/README.md index 4c4387cbd..ce72bb5d3 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-RC6") +addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC7") ``` 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-RC6", - "io.get-coursier" %% "coursier-cache" % "1.0.0-RC6" + "io.get-coursier" %% "coursier" % "1.0.0-RC7", + "io.get-coursier" %% "coursier-cache" % "1.0.0-RC7" ) ``` @@ -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-RC6") +addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC7") ``` 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/project/generate-launcher.sh) with a command like ``` $ ./coursier bootstrap \ - io.get-coursier:coursier-cli_2.11:1.0.0-RC6 \ + io.get-coursier:coursier-cli_2.11:1.0.0-RC7 \ -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-RC6", - "io.get-coursier" %% "coursier-cache" % "1.0.0-RC6" + "io.get-coursier" %% "coursier" % "1.0.0-RC7", + "io.get-coursier" %% "coursier-cache" % "1.0.0-RC7" ) ``` -The first module, `"io.get-coursier" %% "coursier" % "1.0.0-RC6"`, mainly depends on +The first module, `"io.get-coursier" %% "coursier" % "1.0.0-RC7"`, 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-RC6"`, is precisely in charge of fetching +The second module, `"io.get-coursier" %% "coursier-cache" % "1.0.0-RC7"`, 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 769a14895..92f82528b 100644 --- a/project/Mima.scala +++ b/project/Mima.scala @@ -16,6 +16,7 @@ object Mima { "1.0.0-RC4", "1.0.0-RC5", "1.0.0-RC6", + "1.0.0-RC7", "" // binary compatibility versions ) diff --git a/project/plugins.sbt b/project/plugins.sbt index 69371a7f5..62f8d1db8 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -21,7 +21,7 @@ libs ++= Seq( ) // important: this line is matched / substituted during releases (via sbt-release) -def coursierVersion = "1.0.0-RC6" +def coursierVersion = "1.0.0-RC7" // required for just released things resolvers += Resolver.sonatypeRepo("releases") diff --git a/project/project/plugins.sbt b/project/project/plugins.sbt index 07f9f3b7d..c65a4fc2e 100644 --- a/project/project/plugins.sbt +++ b/project/project/plugins.sbt @@ -2,7 +2,7 @@ addSbtPlugin("io.get-coursier" % "sbt-coursier" % coursierVersion) addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.3.0") // important: this line is matched / substituted during releases (via sbt-release) -def coursierVersion = "1.0.0-RC6" +def coursierVersion = "1.0.0-RC7" // required for just released things resolvers += Resolver.sonatypeRepo("releases") diff --git a/project/project/project/plugins.sbt b/project/project/project/plugins.sbt index 810314cf3..78f6de307 100644 --- a/project/project/project/plugins.sbt +++ b/project/project/project/plugins.sbt @@ -1,7 +1,7 @@ addSbtPlugin("io.get-coursier" % "sbt-coursier" % coursierVersion) // important: this line is matched / substituted during releases (via sbt-release) -def coursierVersion = "1.0.0-RC6" +def coursierVersion = "1.0.0-RC7" // required for just released things resolvers += Resolver.sonatypeRepo("releases") diff --git a/scripts/generate-launcher.sh b/scripts/generate-launcher.sh index f94942b07..d290f3eea 100755 --- a/scripts/generate-launcher.sh +++ b/scripts/generate-launcher.sh @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.0.0-RC6 +VERSION=1.0.0-RC7 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 3504c94b6..c051af38c 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-RC6 +VERSION=1.0.0-RC7 "$(dirname "$0")/../coursier" bootstrap \ "io.get-coursier:sbt-launcher_2.11:$VERSION" \