Skip to content

Commit

Permalink
update to sbt 1.0 (#1919)
Browse files Browse the repository at this point in the history
* update to sbt1.0

* Update build.properties

* Update build.properties

* Update plugins.sbt

* updated to coursier rc12

* update to sbt 1.1

* update to sbt 1.1

* Update plugins.sbt
  • Loading branch information
kailuowang authored Jan 11, 2018
1 parent 1a04fff commit 65d5933
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ env:

cache:
directories:
- $HOME/.sbt/0.13/dependency
- $HOME/.sbt/1.1/dependency

This comment has been minimized.

Copy link
@xuwei-k

xuwei-k Jan 22, 2018

Contributor

I think sbt 1.x does not use this directory.

This comment has been minimized.

Copy link
@kailuowang

kailuowang Feb 1, 2018

Author Contributor

I forgot to thank you, @xuwei-k . it has been corrected after you pointed this out.

- $HOME/.sbt/boot/scala*
- $HOME/.sbt/launchers
- $HOME/.ivy2/cache
Expand Down
13 changes: 9 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,10 @@ lazy val tagName = Def.setting{

lazy val commonJsSettings = Seq(
scalacOptions += {
val tv = tagName.value
val tagOrHash =
if (isSnapshot.value) sys.process.Process("git rev-parse HEAD").lines_!.head
else tagName.value
if (isSnapshot.value) sys.process.Process("git rev-parse HEAD").lineStream_!.head
else tv
val a = (baseDirectory in LocalRootProject).value.toURI.toString
val g = "https://raw.githubusercontent.com/typelevel/cats/" + tagOrHash
s"-P:scalajs:mapSourceURI:$a->$g/"
Expand Down Expand Up @@ -127,9 +128,13 @@ def docsSourcesAndProjects(sv: String): (Boolean, Seq[ProjectReference]) =
}

lazy val javadocSettings = Seq(
sources in (Compile, doc) := (if (docsSourcesAndProjects(scalaVersion.value)._1) (sources in (Compile, doc)).value else Nil)
sources in (Compile, doc) := {
val docSource = (sources in (Compile, doc)).value
if (docsSourcesAndProjects(scalaVersion.value)._1) docSource else Nil
}
)


lazy val docsMappingsAPIDir = settingKey[String]("Name of subdirectory in site target directory for api docs")

lazy val docSettings = Seq(
Expand Down Expand Up @@ -606,7 +611,7 @@ lazy val sharedReleaseProcess = Seq(
publishArtifacts,
setNextVersion,
commitNextVersion,
ReleaseStep(action = Command.process("sonatypeReleaseAll", _), enableCrossBuild = true),
releaseStepCommand("sonatypeReleaseAll"),
pushChanges)
)

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.16
sbt.version=1.1.0
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.9.3")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.20")
addSbtPlugin("com.github.tkawachi" % "sbt-doctest" % "0.7.0")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.0")
addSbtPlugin("com.47deg" % "sbt-microsites" % "0.7.0")
addSbtPlugin("com.47deg" % "sbt-microsites" % "0.7.13")
addSbtPlugin("com.dwijnand" % "sbt-travisci" % "1.1.1")
addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.0")

0 comments on commit 65d5933

Please sign in to comment.