Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update to sbt 1.0 #1919

Merged
merged 9 commits into from
Jan 11, 2018
Merged

update to sbt 1.0 #1919

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a104f75
update to sbt1.0
kailuowang Sep 19, 2017
505b151
Update build.properties
kailuowang Sep 19, 2017
4f04272
Update build.properties
kailuowang Sep 19, 2017
3408c7d
Update plugins.sbt
kailuowang Sep 20, 2017
42f6daf
updated to coursier rc12
kailuowang Sep 20, 2017
6d96af9
update to sbt 1.1
kailuowang Jan 11, 2018
1d712c0
update to sbt 1.1
kailuowang Jan 11, 2018
dd236d2
Merge branch 'master' into sbt-1
kailuowang Jan 11, 2018
4fe6530
Update plugins.sbt
kailuowang Jan 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
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.0/dependency
- $HOME/.sbt/boot/scala*
- $HOME/.sbt/launchers
- $HOME/.ivy2/cache
Expand Down
13 changes: 9 additions & 4 deletions build.sbt
View file
Open in desktop
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 @@ -124,9 +125,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 @@ -543,7 +548,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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.16
sbt.version=1.0.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be 1.0.1 :)

2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC11")
//addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC11")
addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.1")
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.6")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
Expand Down