Skip to content

Commit bd5fcf2

Browse files
committed
travis ci: more memory?
1 parent 52a6821 commit bd5fcf2

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

.jvmopts

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
-Dfile.encoding=UTF8
2+
-XX:MaxPermSize=512m
3+
-Xms1g
4+
-Xmx5g
5+
-Xss2m
6+
-XX:+CMSClassUnloadingEnabled
7+
-XX:+UseConcMarkSweepGC

.travis.yml

-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ cache:
88
- $HOME/.ivy2
99
- $HOME/.sbt
1010

11-
before_script:
12-
- "echo $JAVA_OPTS"
13-
- "export JAVA_OPTS=-Xmx5G"
14-
1511
script:
1612
- sbt ++$TRAVIS_SCALA_VERSION 'set javaOptions += "-Djunit.parallel.threads=1"' 'set
1713
parallelExecution in Test := false' test

build.sbt

+4-4
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,16 @@ scalacOptions in console in Compile ++= Seq(
4343

4444
// ScalariformKeys.preferences := {
4545
// import scalariform.formatter.preferences._
46-
//
4746
// FormattingPreferences()
48-
// .setPreference(MultilineScaladocCommentsStartOnFirstLine, true)
49-
// .setPreference(DoubleIndentClassDeclaration, true)
47+
// .setPreference(AlignParameters, true)
5048
// .setPreference(AlignSingleLineCaseStatements, true)
49+
// .setPreference(CompactControlReadability, true)
50+
// .setPreference(DoubleIndentClassDeclaration, true)
5151
// .setPreference(IndentSpaces, 2)
5252
// .setPreference(IndentWithTabs, false)
53+
// .setPreference(MultilineScaladocCommentsStartOnFirstLine, true)
5354
// .setPreference(PreserveDanglingCloseParenthesis, true)
5455
// }
55-
//
5656
// scalariformSettings
5757

5858
homepage := Some(url("https://github.com/nativelibs4java/scalaxy-streams"))

0 commit comments

Comments
 (0)