Skip to content

Commit

Permalink
Support Scala 2.13.0-M5 (#32)
Browse files Browse the repository at this point in the history
  • Loading branch information
gmethvin committed Dec 9, 2018
1 parent d45a7e8 commit db80d62
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ install:
- cmd: SET PATH=C:\sbt\bin;%JAVA_HOME%\bin;%PATH%
- cmd: SET SBT_OPTS=-Xmx4G -XX:MaxPermSize=1G
build_script:
- sbt compile
- sbt +compile
test_script:
- sbt test
- sbt +test
4 changes: 4 additions & 0 deletions .jvmopts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-Xms512M
-Xmx4096M
-Xss2M
-XX:MaxMetaspaceSize=1024M
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ before_install:
brew install sbt;
fi
script:
- sbt compile test publishLocal
- sbt +compile +test +publishLocal

# Note: OSX has issues with oraclejdk8
# see https://github.com/travis-ci/travis-ci/issues/2316
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class RecursiveFileMonitorSpec extends WordSpec with Matchers {
file.clear(); sleep()
file.writeText("howdy"); sleep()
file.delete(); sleep()
sleep(1.second)
sleep()
val sibling = (file.parent / "t1.txt").createIfNotExists(); sleep()
sibling.writeText("hello world"); sleep()
sleep()
Expand Down Expand Up @@ -72,13 +72,12 @@ class RecursiveFileMonitorSpec extends WordSpec with Matchers {
watcher.start()

/***************************************************************************/
sleep(1.second)
sleep()
val f1 = (directory / "f1.txt").createIfNotExists()
f1.writeText("hello world"); sleep()
f1.clear(); sleep()
f1.writeText("howdy"); sleep()
f1.delete(); sleep()
sleep(1.second)
val f2 = (directory / "f2.txt").createIfNotExists(); sleep()
f2.writeText("hello world"); sleep()
val f3 = (directory / "f3.txt").createIfNotExists(); sleep()
Expand All @@ -89,7 +88,7 @@ class RecursiveFileMonitorSpec extends WordSpec with Matchers {
d1.delete()
sleep(5.seconds)

log.size should be >= 13
log.size should be >= 12
log.exists(_ contains f1.name) shouldBe true
log.exists(_ contains f2.name) shouldBe true
log.exists(_ contains f3.name) shouldBe true
Expand All @@ -98,5 +97,5 @@ class RecursiveFileMonitorSpec extends WordSpec with Matchers {
}
}

def sleep(t: FiniteDuration = 500.millis): Unit = Thread.sleep(t.toMillis)
def sleep(t: FiniteDuration = 1.second): Unit = Thread.sleep(t.toMillis)
}
7 changes: 4 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,11 @@ lazy val `directory-watcher-better-files` = (project in file("better-files"))
.settings(commonSettings)
.settings(
scalaVersion := "2.12.7",
crossScalaVersions := Seq(scalaVersion.value, "2.13.0-M5"),
crossPaths := true,
libraryDependencies ++= Seq(
"com.github.pathikrit" %% "better-files" % "3.6.0",
"org.scalatest" %% "scalatest" % "3.0.5" % Test
"com.github.pathikrit" %% "better-files" % "3.7.0",
"org.scalatest" %% "scalatest" % "3.0.6-SNAP4" % Test
)
)
.dependsOn(`directory-watcher`)
Expand All @@ -84,7 +85,7 @@ releaseProcess := Seq[ReleaseStep](
setReleaseVersion,
commitReleaseVersion,
tagRelease,
releaseStepCommand("publishSigned"),
releaseStepCommand("+publishSigned"),
setNextVersion,
commitNextVersion,
releaseStepCommand("sonatypeReleaseAll"),
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.0.2
sbt.version=1.2.7

0 comments on commit db80d62

Please sign in to comment.