Merge pull request #660 from coursier/topic/foo

Minor things
This commit is contained in:
Alexandre Archambault 2017-09-22 16:20:53 +02:00 committed by GitHub
commit b7c7d5f9e6
7 changed files with 25 additions and 36 deletions

View File

@ -20,9 +20,8 @@ matrix:
os: linux
jdk: oraclejdk8
sudo: required
group: deprecated-2017Q3
before_install:
- curl https://raw.githubusercontent.com/scala-native/scala-native/v0.3.1/bin/travis_setup.sh | bash -x
- curl https://raw.githubusercontent.com/scala-native/scala-native/e9df70ce671c58f34eab530a44875d6f818ba8fe/bin/travis_setup.sh | bash -x
services:
- docker
- env: SCALA_VERSION=2.10.6 PUBLISH=1

View File

@ -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-RC11")
addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC12")
```
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-RC11",
"io.get-coursier" %% "coursier-cache" % "1.0.0-RC11"
"io.get-coursier" %% "coursier" % "1.0.0-RC12",
"io.get-coursier" %% "coursier-cache" % "1.0.0-RC12"
)
```
@ -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-RC11")
addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC12")
```
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-RC11 \
io.get-coursier:coursier-cli_2.11:1.0.0-RC12 \
-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-RC11",
"io.get-coursier" %% "coursier-cache" % "1.0.0-RC11"
"io.get-coursier" %% "coursier" % "1.0.0-RC12",
"io.get-coursier" %% "coursier-cache" % "1.0.0-RC12"
)
```
The first module, `"io.get-coursier" %% "coursier" % "1.0.0-RC11"`, mainly depends on
The first module, `"io.get-coursier" %% "coursier" % "1.0.0-RC12"`, 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-RC11"`, is precisely in charge of fetching
The second module, `"io.get-coursier" %% "coursier-cache" % "1.0.0-RC12"`, 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.

View File

@ -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-RC11")
addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC12")
```
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-RC11",
"io.get-coursier" %% "coursier-cache" % "1.0.0-RC11"
"io.get-coursier" %% "coursier" % "1.0.0-RC12",
"io.get-coursier" %% "coursier-cache" % "1.0.0-RC12"
)
```
@ -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-RC11")
addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC12")
```
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-RC11 \
io.get-coursier:coursier-cli_2.11:1.0.0-RC12 \
-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-RC11",
"io.get-coursier" %% "coursier-cache" % "1.0.0-RC11"
"io.get-coursier" %% "coursier" % "1.0.0-RC12",
"io.get-coursier" %% "coursier-cache" % "1.0.0-RC12"
)
```
The first module, `"io.get-coursier" %% "coursier" % "1.0.0-RC11"`, mainly depends on
The first module, `"io.get-coursier" %% "coursier" % "1.0.0-RC12"`, 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-RC11"`, is precisely in charge of fetching
The second module, `"io.get-coursier" %% "coursier-cache" % "1.0.0-RC12"`, 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.

View File

@ -141,7 +141,7 @@ object Release {
val savePreviousReleaseVersion = ReleaseStep { state =>
val cmd = Seq(state.vcs.commandName, "tag", "-l")
val cmd = Seq(state.vcs.commandName, "tag", "--sort", "version:refname")
val tag = scala.sys.process.Process(cmd)
.!!
@ -193,7 +193,7 @@ object Release {
}
val coursierVersionPattern = s"(?m)^${Pattern.quote("def coursierVersion = \"")}[^${'"'}]*${Pattern.quote("\"")}$$".r
val coursierVersionPattern = s"(?m)^${Pattern.quote("def coursierVersion0 = \"")}[^${'"'}]*${Pattern.quote("\"")}$$".r
val updatePluginsSbt = ReleaseStep { state =>
@ -204,13 +204,9 @@ object Release {
}
val baseDir = Project.extract(state).get(baseDirectory.in(ThisBuild))
val pluginsSbtFile = baseDir / "project" / "plugins.sbt"
val projectPluginsSbtFile = baseDir / "project" / "project" / "plugins.sbt"
val projectProjectPluginsSbtFile = baseDir / "project" / "project" / "project" / "plugins.sbt"
val files = Seq(
pluginsSbtFile,
projectPluginsSbtFile,
projectProjectPluginsSbtFile
)
@ -223,7 +219,7 @@ object Release {
case _ => sys.error(s"Found too many matches in $f")
}
val newContent = coursierVersionPattern.replaceAllIn(content, "def coursierVersion = \"" + releaseVer + "\"")
val newContent = coursierVersionPattern.replaceAllIn(content, "def coursierVersion0 = \"" + releaseVer + "\"")
Files.write(f.toPath, newContent.getBytes(StandardCharsets.UTF_8))
vcs.add(f.getAbsolutePath).!!(state.log)
}

View File

@ -20,9 +20,6 @@ libs ++= Seq(
"com.github.alexarchambault" %% "argonaut-shapeless_6.2" % "1.2.0-M5"
)
// important: this line is matched / substituted during releases (via sbt-release)
def coursierVersion = "1.0.0-RC12"
// required for just released things
resolvers += Resolver.sonatypeRepo("releases")

View File

@ -1,8 +1,5 @@
addSbtPlugin("io.get-coursier" % "sbt-coursier" % coursierVersion)
addSbtCoursier
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-RC12"
// required for just released things
resolvers += Resolver.sonatypeRepo("releases")

View File

@ -1,7 +1,7 @@
addSbtPlugin("io.get-coursier" % "sbt-coursier" % coursierVersion)
addSbtPlugin("io.get-coursier" % "sbt-coursier" % coursierVersion0)
// important: this line is matched / substituted during releases (via sbt-release)
def coursierVersion = "1.0.0-RC12"
def coursierVersion0 = "1.0.0-RC12"
// required for just released things
resolvers += Resolver.sonatypeRepo("releases")