Skip to content

Commit e6f92f3

Browse files
author
Sam Ritchie
authored
Merge pull request #277 from twitter/oscar/build-docs
2 parents 7f879f8 + 6d4348d commit e6f92f3

3 files changed

Lines changed: 12 additions & 11 deletions

File tree

.travis.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@ sudo: false
33
matrix:
44
include:
55
- scala: 2.10.6
6-
script: ./sbt ++$TRAVIS_SCALA_VERSION clean test mimaReportBinaryIssues
6+
script: ./sbt "+++$TRAVIS_SCALA_VERSION clean" "+++$TRAVIS_SCALA_VERSION test" "+++$TRAVIS_SCALA_VERSION mimaReportBinaryIssues" "+++$TRAVIS_SCALA_VERSION doc"
77

88
- scala: 2.11.8
99
jdk: oraclejdk8
10-
script: ./sbt ++$TRAVIS_SCALA_VERSION clean coverage test coverageReport mimaReportBinaryIssues
10+
script: ./sbt ++$TRAVIS_SCALA_VERSION clean coverage test coverageReport mimaReportBinaryIssues doc
1111
after_success:
1212
- bash <(curl -s https://codecov.io/bash)
1313

1414
- scala: 2.12.1
1515
jdk: oraclejdk8
16-
script: ./sbt "+++$TRAVIS_SCALA_VERSION clean" "+++$TRAVIS_SCALA_VERSION test" # "+++$TRAVIS_SCALA_VERSION mimaReportBinaryIssues"
16+
#script: ./sbt "+++$TRAVIS_SCALA_VERSION clean" "+++$TRAVIS_SCALA_VERSION test" "+++$TRAVIS_SCALA_VERSION mimaReportBinaryIssues" "+++$TRAVIS_SCALA_VERSION doc"
17+
script: ./sbt "+++$TRAVIS_SCALA_VERSION clean" "+++$TRAVIS_SCALA_VERSION test" "+++$TRAVIS_SCALA_VERSION doc"
1718

1819
cache:
1920
directories:

build.sbt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,11 @@ def youngestForwardCompatible(subProj: String) =
130130
Some(subProj)
131131
.filterNot(unreleasedModules.contains(_))
132132
.map { s =>
133-
if (javaOnly.contains(s))
134-
"com.twitter" % ("chill-" + s) % binaryCompatVersion
135-
else
136-
"com.twitter" %% ("chill-" + s) % binaryCompatVersion
137-
}
133+
if (javaOnly.contains(s))
134+
"com.twitter" % ("chill-" + s) % binaryCompatVersion
135+
else
136+
"com.twitter" %% ("chill-" + s) % binaryCompatVersion
137+
}
138138

139139
val ignoredABIProblems = {
140140
import com.typesafe.tools.mima.core._

chill-java/src/main/java/com/twitter/chill/java/ClosureSerializer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131
* <code>
3232
* kryo.register(java.lang.invoke.SerializedLambda.class);<br>
3333
* kryo.register(ClosureSerializer.Closure.class, new ClosureSerializer());</code>
34-
* @author Roman Levenstein <romixlev@gmail.com> */
34+
* @author Roman Levenstein romixlev@gmail.com */
3535
public class ClosureSerializer extends Serializer {
3636

37-
/** Marker class to bind ClosureSerializer to. See also {@link Kryo#isClosure(Class)} and
38-
* {@link Kryo#getRegistration(Class)} */
37+
/** Marker class to bind ClosureSerializer to. See also Kryo#isClosure(Class) and
38+
* Kryo#getRegistration(Class) */
3939
@SuppressWarnings("javadoc")
4040
public static class Closure {
4141
}

0 commit comments

Comments
 (0)