Skip to content

Commit 4e858ab

Browse files
committed
0.9.3
- Attempt to add caching to `.travis.yml` to speed up builds - Fix example-predef-bare jar-loading path
1 parent e84e1c3 commit 4e858ab

File tree

4 files changed

+25
-8
lines changed

4 files changed

+25
-8
lines changed

.travis.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,3 +63,20 @@ notifications:
6363
6464

6565
sudo: false
66+
67+
68+
# Stolen from https://github.com/typelevel/cats/blob/master/.travis.yml
69+
cache:
70+
directories:
71+
- $HOME/.sbt/0.13/dependency
72+
- $HOME/.sbt/boot/scala*
73+
- $HOME/.sbt/launchers
74+
- $HOME/.ivy2/cache
75+
- $HOME/.coursier
76+
- $HOME/.nvm
77+
78+
before_cache:
79+
- du -h -d 1 $HOME/.ivy2/cache
80+
- du -h -d 2 $HOME/.sbt/
81+
- find $HOME/.sbt -name "*.lock" -type f -delete
82+
- find $HOME/.ivy2/cache -name "ivydata-*.properties" -type f -delete

readme/Footer.scalatex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,10 @@
123123
Force pretty-printing @code{scala.xml.Elem} to use it's XML
124124
@code{.toString} rather than treating it as a case class, since the
125125
case-class representation is borked due to weirdness in that class.
126+
@li
127+
Improve pretty-printing of @code{Path}s, @code{RelPath}s and the
128+
result of sub-processes and file-listings in the default REPL (previously
129+
these improved-pretty-printers were limited to @code{ammonite-shell})
126130

127131
@sect{0.9.2}
128132
@ul
@@ -1168,7 +1172,3 @@
11681172

11691173
@sect{Unstable Changlog}
11701174
@ul
1171-
@li
1172-
Improve pretty-printing of @code{Path}s, @code{RelPath}s and the
1173-
result of sub-processes and file-listings in the default REPL (previously
1174-
these improved-pretty-printers were limited to @code{ammonite-shell})

shell/src/main/resources/ammonite/shell/example-predef-bare.sc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import ammonite.ops._
2-
val scalaVersion = scala.util.Properties.versionNumberString.split("\\.").dropRight(1).mkString(".")
2+
import ammonite.runtime.tools.IvyThing.scalaBinaryVersion
3+
val scalaVersion = scala.util.Properties.versionNumberString
34
val ammVersion = ammonite.Constants.version
4-
interp.load.cp(pwd/'shell/'target/s"scala-$scalaVersion"/s"ammonite-shell_$scalaVersion-$ammVersion.jar")
5+
interp.load.cp(pwd/'shell/'target/s"scala-$scalaBinaryVersion"/s"ammonite-shell_$scalaVersion-$ammVersion.jar")
56
@
67
val shellSession = ammonite.shell.ShellSession()
78
import shellSession._

shell/src/test/scala/ammonite/shell/SessionTests.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,10 @@ object SessionTests extends TestSuite{
5151

5252
@ interp.load.module($bareSrc)
5353

54-
5554
@ import ammonite.ops.ImplicitWd
5655

5756
@ %%ls 'ops
58-
res4: $typeString =
57+
res3: $typeString =
5958
src
6059
target
6160
""")

0 commit comments

Comments
 (0)