Skip to content

Commit

Permalink
temporarily disable scaladoc on 2.13 (#2354)
Browse files Browse the repository at this point in the history
* fixing the scalac option in unidoc

add publishLocal back to build

* temporarily disable scaladoc on 2.13

* remove alleycats from combined doc
  • Loading branch information
kailuowang authored Aug 1, 2018
1 parent 22dd38e commit 2c53c61
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
12 changes: 10 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,15 @@ lazy val commonSettings = Seq(
doctestGenTests := {
val unchanged = doctestGenTests.value
if(priorTo2_13(scalaVersion.value)) unchanged else Nil
},
//todo: re-enable disable scaladoc on 2.13 due to https:/scala/bug/issues/11045
sources in (Compile, doc) := {
val docSource = (sources in (Compile, doc)).value
if (priorTo2_13(scalaVersion.value)) docSource else Nil
}
) ++ warnUnusedImport ++ update2_12 ++ xlint



def macroDependencies(scalaVersion: String) =
CrossVersion.partialVersion(scalaVersion) match {
case Some((2, minor)) if minor < 13 => Seq(
Expand Down Expand Up @@ -203,7 +207,11 @@ lazy val docSettings = Seq(
"-doc-source-url", scmInfo.value.get.browseUrl + "/tree/master€{FILE_PATH}.scala",
"-sourcepath", baseDirectory.in(LocalRootProject).value.getAbsolutePath,
"-diagrams"
),
) ++ (if(priorTo2_13(scalaVersion.value)) Seq(
"-Yno-adapted-args",
) else Seq(
"-Ymacro-annotations"
)),
scalacOptions in Tut ~= (_.filterNot(Set("-Ywarn-unused-import", "-Ywarn-dead-code"))),
git.remoteRepo := "[email protected]:typelevel/cats.git",
includeFilter in makeSite := "*.html" | "*.css" | "*.png" | "*.jpg" | "*.gif" | "*.js" | "*.swf" | "*.yml" | "*.md" | "*.svg",
Expand Down
6 changes: 3 additions & 3 deletions scripts/travis-publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@

sbt_cmd="sbt ++$TRAVIS_SCALA_VERSION"

export publish_cmd=""
export publish_cmd="publishLocal"

if [[ $TRAVIS_PULL_REQUEST == "false" && $TRAVIS_BRANCH == "master" && $(cat version.sbt) =~ "-SNAPSHOT" ]]; then
export publish_cmd="&& $sbt_cmd publish gitSnapshots publish"
export publish_cmd="publish gitSnapshots publish"
# temporarily disable to stabilize travis
#if [[ $TRAVIS_SCALA_VERSION =~ ^2\.11\. ]]; then
# export publish_cmd="publishMicrosite"
Expand Down Expand Up @@ -57,7 +57,7 @@ fi
if [[ $JS_BUILD == "true" ]]; then
run_cmd="$js"
else
run_cmd="$scalafix $jvm $publish_cmd"
run_cmd="$scalafix $jvm && $sbt_cmd $publish_cmd"
fi

eval $run_cmd

0 comments on commit 2c53c61

Please sign in to comment.