luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update things (#866)

This commit is contained in:
Alexandre Archambault 2018-06-20 16:30:25 +02:00 committed by GitHub
parent 6be2528df5
commit 8a02ee8f15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 41 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
3rdparty/jvm/BUILD vendored
View File

@ -6,7 +6,7 @@ jar_library(
scala_jar(
org = "org.scala-lang.modules",
name = "scala-xml",
rev = "1.0.6",
rev = "1.1.0",
),
],
)
@ -39,7 +39,7 @@ jar_library(
scala_jar(
org = "org.scalaz",
name = "scalaz-concurrent",
rev = "7.2.16",
rev = "7.2.24",
),
],
)
@ -50,7 +50,7 @@ jar_library(
scala_jar(
org = "org.scalaz",
name = "scalaz-core",
rev = "7.2.16",
rev = "7.2.24",
),
],
)
@ -82,7 +82,7 @@ jar_library(
jars = [
jar(
org = "org.scala-js",
name = "scalajs-compiler_2.11.8",
name = "scalajs-compiler_2.11.12",
rev = SCALAJS_REV,
),
],
@ -170,7 +170,7 @@ jar_library(
scala_jar(
org = "com.lihaoyi",
name = "utest",
rev = "0.5.4",
rev = "0.6.4",
),
],
)
@ -189,6 +189,6 @@ jar_library(
jar_library(
name = "scalatest",
jars = [
scala_jar("org.scalatest", "scalatest", "3.0.0"),
scala_jar("org.scalatest", "scalatest", "3.0.5"),
],
)

10
README.md
View File

@ -248,9 +248,6 @@ The SBT plugin has been tested only with SBT 0.13.8 / 0.13.9 / 0.13.11 / 0.13.12
Once enabled, the `update`, `updateClassifiers`, and `updateSbtClassifiers` commands are taken care of by coursier. These
provide more output about what's going on than their default implementations do.
### Command-line
Download and run its launcher with
@ -404,9 +401,6 @@ Fetch and generate a machine readable json report. [Json Report Documentation](/
$ ./coursier fetch org.apache.avro:avro:1.7.4 --json-output-file report.json
```
#### bootstrap
The `bootstrap` command generates tiny bootstrap launchers, able to pull their dependencies from
@ -489,7 +483,7 @@ The resolution process will go on by giving successive `Resolution`s, until the
`start` above is only the initial state - it is far from over, as the `isDone` method on it tells,
```scala
scala> start.isDone
res2: Boolean = false
res0: Boolean = false
```
@ -528,7 +522,7 @@ scala> MavenRepository(
| "https://nexus.corp.com/content/repositories/releases",
| authentication = Some(Authentication("user", "pass"))
| )
res4: coursier.maven.MavenRepository = MavenRepository(https://nexus.corp.com/content/repositories/releases,None,true,Some(Authentication(user, *******)))
res2: coursier.maven.MavenRepository = MavenRepository(https://nexus.corp.com/content/repositories/releases,None,true,Some(Authentication(user, *******)))
```
Now that we have repositories, we're going to mix these with things from the `coursier-cache` module,

10
build.sbt
View File

@ -3,7 +3,9 @@ import Aliases._
import Settings._
import Publish._
lazy val core = crossProject
import sbtcrossproject.CrossPlugin.autoImport.crossProject
lazy val core = crossProject(JSPlatform, JVMPlatform)
.disablePlugins(ScriptedPlugin)
.jvmConfigure(_.enablePlugins(ShadingPlugin))
.jvmSettings(
@ -37,7 +39,7 @@ lazy val core = crossProject
lazy val coreJvm = core.jvm
lazy val coreJs = core.js
lazy val tests = crossProject
lazy val tests = crossProject(JSPlatform, JVMPlatform)
.disablePlugins(ScriptedPlugin)
.dependsOn(core, cache % "test", scalaz)
.jsSettings(
@ -83,7 +85,7 @@ lazy val paths = project
addDirectoriesSources
)
lazy val cache = crossProject
lazy val cache = crossProject(JSPlatform, JVMPlatform)
.disablePlugins(ScriptedPlugin)
.dependsOn(core)
.jvmSettings(
@ -102,7 +104,7 @@ lazy val cache = crossProject
lazy val cacheJvm = cache.jvm
lazy val cacheJs = cache.js
lazy val scalaz = crossProject
lazy val scalaz = crossProject(JSPlatform, JVMPlatform)
.disablePlugins(ScriptedPlugin)
.dependsOn(cache)
.jvmSettings(

8
doc/readme/README.md
View File

@ -275,10 +275,6 @@ The SBT plugin has been tested only with SBT 0.13.8 / 0.13.9 / 0.13.11 / 0.13.12
Once enabled, the `update`, `updateClassifiers`, and `updateSbtClassifiers` commands are taken care of by coursier. These
provide more output about what's going on than their default implementations do.
```tut:invisible
// TODO Change cache policy, sandboxing, parallel downloads, limitations
```
### Command-line
Download and run its launcher with
@ -432,10 +428,6 @@ Fetch and generate a machine readable json report. [Json Report Documentation](/
$ ./coursier fetch org.apache.avro:avro:1.7.4 --json-output-file report.json
```
```tut:invisible
// TODO options: repositories, sources/javadoc, attributes
```
#### bootstrap
The `bootstrap` command generates tiny bootstrap launchers, able to pull their dependencies from

6
project/CrossDeps.scala
View File

@ -2,7 +2,7 @@
import sbt._
import sbt.Keys._
import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._
object CrossDeps {
@ -13,8 +13,8 @@ object CrossDeps {
def fastParse = setting("com.lihaoyi" %%% "fastparse" % SharedVersions.fastParse)
def scalazCore = setting("org.scalaz" %%% "scalaz-core" % SharedVersions.scalaz)
def scalaJsDom = setting("org.scala-js" %%% "scalajs-dom" % "0.9.5")
def scalaJsDom = setting("org.scala-js" %%% "scalajs-dom" % "0.9.6")
def utest = setting("com.lihaoyi" %%% "utest" % "0.6.4")
def scalaJsJquery = setting("be.doeraene" %%% "scalajs-jquery" % "0.9.2")
def scalaJsJquery = setting("be.doeraene" %%% "scalajs-jquery" % "0.9.3")
def scalaJsReact = setting("com.github.japgolly.scalajs-react" %%% "core" % "0.9.0")
}

9
project/Deps.scala
View File

@ -8,20 +8,19 @@ object Deps {
def quasiQuotes = "org.scalamacros" %% "quasiquotes" % "2.1.0"
def fastParse = "com.lihaoyi" %% "fastparse" % SharedVersions.fastParse
def jsoup = "org.jsoup" % "jsoup" % "1.10.3"
def scalaXml = "org.scala-lang.modules" %% "scala-xml" % "1.0.6"
def scalaXml = "org.scala-lang.modules" %% "scala-xml" % "1.1.0"
def scalazConcurrent = "org.scalaz" %% "scalaz-concurrent" % SharedVersions.scalaz
def caseApp = "com.github.alexarchambault" %% "case-app" % "2.0.0-M3"
def okhttpUrlConnection = "com.squareup.okhttp" % "okhttp-urlconnection" % "2.7.5"
def argonautShapeless = "com.github.alexarchambault" %% "argonaut-shapeless_6.2" % "1.2.0-M8"
def jackson = "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.8.4"
def scalatest = "org.scalatest" %% "scalatest" % "3.0.0"
def scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
def junit = "junit" % "junit" % "4.12"
def dockerClient = "com.spotify" % "docker-client" % "8.11.1"
def dockerClient = "com.spotify" % "docker-client" % "8.11.6"
def sbtPgp = Def.setting {
val sbtv = CrossVersion.binarySbtVersion(sbtVersion.in(pluginCrossBuild).value)
val sv = scalaBinaryVersion.value
val ver = "1.1.0"
val ver = "1.1.1"
sbtPluginExtra("com.jsuereth" % "sbt-pgp" % ver, sbtv, sv)
}

2
project/Mima.scala
View File

@ -4,7 +4,7 @@ import sbt.Keys._
import com.typesafe.tools.mima.plugin.MimaKeys._
import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._
object Mima {

2
project/SharedVersions.scala
View File

@ -5,6 +5,6 @@ object SharedVersions {
def fastParse = "1.0.0"
def proguard = "5.3.3"
def scalaNative = "0.3.7"
def scalaz = "7.2.20"
def scalaz = "7.2.24"
}

25
project/plugins.sbt
View File

@ -1,22 +1,23 @@
plugins_(
"io.get-coursier" % "sbt-coursier" % coursierVersion,
"com.typesafe" % "sbt-mima-plugin" % "0.1.18",
"org.xerial.sbt" % "sbt-pack" % "0.10.1",
"com.jsuereth" % "sbt-pgp" % "1.1.0",
"com.lightbend.sbt" % "sbt-proguard" % "0.3.0",
"com.github.gseitz" % "sbt-release" % "1.0.7",
"org.scala-js" % "sbt-scalajs" % "0.6.22",
"io.get-coursier" % "sbt-shading" % coursierVersion,
"org.xerial.sbt" % "sbt-sonatype" % "2.3",
"com.timushev.sbt" % "sbt-updates" % "0.3.4",
"org.tpolecat" % "tut-plugin" % "0.6.3"
"io.get-coursier" % "sbt-coursier" % coursierVersion,
"com.typesafe" % "sbt-mima-plugin" % "0.3.0",
"org.xerial.sbt" % "sbt-pack" % "0.11",
"com.jsuereth" % "sbt-pgp" % "1.1.1",
"com.lightbend.sbt" % "sbt-proguard" % "0.3.0",
"com.github.gseitz" % "sbt-release" % "1.0.8",
"org.scala-js" % "sbt-scalajs" % "0.6.23",
"org.portable-scala" % "sbt-scalajs-crossproject" % "0.4.0",
"io.get-coursier" % "sbt-shading" % coursierVersion,
"org.xerial.sbt" % "sbt-sonatype" % "2.3",
"com.timushev.sbt" % "sbt-updates" % "0.3.4",
"org.tpolecat" % "tut-plugin" % "0.6.4"
)
libs ++= Seq(
"org.scala-sbt" %% "scripted-plugin" % sbtVersion.value,
compilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full), // for shapeless / auto type class derivations
"com.github.alexarchambault" %% "argonaut-shapeless_6.2" % "1.2.0-M5"
"com.github.alexarchambault" %% "argonaut-shapeless_6.2" % "1.2.0-M8"
)
// required for just released things

3
sbt-pgp-coursier/src/sbt-test/sbt-pgp-coursier/publish-local-signed/build.sbt
View File

@ -4,3 +4,6 @@ scalaVersion := "2.12.3"
credentials.in(GlobalScope) := Seq(Credentials("", "pgp", "", "test password"))
pgpSecretRing := baseDirectory.value / "secring.pgp"
pgpPublicRing := baseDirectory.value / "pubring.pgp"
// seems required by sbt-pgp 1.1.1, even to publish locally
publishTo := Some("foo" at "https://f.oo")

2
tests/metadata

@ -1 +1 @@
Subproject commit 03da8397c0239f19521779d8ee2bdc253d19bb57
Subproject commit bd9dc9a927e1c86f96b355309a9d0d59a4735291

2
tests/shared/src/test/resources/resolutions/io.get-coursier/coursier_2.11/1.1.0-SNAPSHOT
View File

@ -1,3 +1,3 @@
io.get-coursier:coursier_2.11:1.1.0-SNAPSHOT:compile
org.scala-lang:scala-library:2.11.12:default
org.scala-lang.modules:scala-xml_2.11:1.0.6:default
org.scala-lang.modules:scala-xml_2.11:1.1.0:default