Skip to content

Commit

Permalink
Fix for Java 8 compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
yllan committed Dec 1, 2015
1 parent c7ac403 commit 6e4b0c1
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

有裝 `brew` 的話直接 `brew install scala sbt` 就好了。否則手動安裝:

* ☕ jdk ≥ 1.6
* ☕ jdk ≥ 1.8
* [scala 2.10.0+](http://www.scala-lang.org/downloads)
* [sbt 0.12.2+](http://www.scala-sbt.org/release/docs/Getting-Started/Setup.html)
* [sbt 0.13.0+](http://www.scala-sbt.org/release/docs/Getting-Started/Setup.html)
第一次的話最好設定 `echo 'SBT_OPTS="-XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=512M -Xmx2g -Dfile.encoding=UTF8"' > ~/.sbtconfig` 以免發生 java.lang.OutOfMemoryError: PermGen space
* [Dictionary Development Kit](https://developer.apple.com/downloads/index.action) 登入後抓 Auxiliary Tools for Xcode。為了方便,我把 build 要用到的工具 copy 到 ./bin 裡面了,只是要 build 的話可以不用抓。

Expand Down
6 changes: 2 additions & 4 deletions project/MoedictionaryBuild.scala
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import sbt._
import sbt.Keys._

import scala.sys.process._

object MoedictionaryBuild extends Build {

lazy val moedictionary = Project(
Expand All @@ -18,7 +16,7 @@ object MoedictionaryBuild extends Build {
name := "MoeDictionary",
organization := "tw.3du",
version := "1.0",
scalaVersion := "2.10.2",
scalaVersion := "2.10.6",
// add other settings here
libraryDependencies ++= Seq(
"com.typesafe.slick" %% "slick" % "1.0.1",
Expand All @@ -32,7 +30,7 @@ object MoedictionaryBuild extends Build {

val getDB = TaskKey[Unit]("get-db", "Get sqlite db from kcwu")

def okay(jobDescription: String, job: scala.sys.process.ProcessBuilder, stream: TaskStreams) = {
def okay(jobDescription: String, job: sbt.ProcessBuilder, stream: TaskStreams) = {
stream.log.info(jobDescription + " ...")
if (job.! != 0) {
sys.error(jobDescription + " failed.")
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=0.12.2
sbt.version=0.13.9

0 comments on commit 6e4b0c1

Please sign in to comment.