From 277f6f0e34ca973686ad2440802bda18343964a5 Mon Sep 17 00:00:00 2001 From: Juno Lee Date: Sat, 1 Dec 2018 19:21:51 -0700 Subject: [PATCH 1/2] specified scala version 2.10.4 and sbt version 0.13.5, edited java path --- bin/eventsim | 2 +- build.sbt | 2 ++ project/build.properties | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 project/build.properties diff --git a/bin/eventsim b/bin/eventsim index 6e47e850..bf922877 100755 --- a/bin/eventsim +++ b/bin/eventsim @@ -1,2 +1,2 @@ #! /bin/bash -$JAVA_HOME/bin/java -XX:+AggressiveOpts -XX:+UseG1GC -XX:+UseStringDeduplication -Xmx8G -jar target/scala-2.10/eventsim-assembly-1.0.jar $* +/usr/bin/java -XX:+AggressiveOpts -XX:+UseG1GC -XX:+UseStringDeduplication -Xmx8G -jar target/scala-2.10/eventsim-assembly-1.0.jar $* diff --git a/build.sbt b/build.sbt index 48df16af..53f58f06 100644 --- a/build.sbt +++ b/build.sbt @@ -2,6 +2,8 @@ name := "eventsim" version := "1.0" +scalaVersion := "2.10.4" + libraryDependencies += "org.apache.commons" % "commons-math3" % "3.5" libraryDependencies += "de.jollyday" % "jollyday" % "0.5.1" diff --git a/project/build.properties b/project/build.properties new file mode 100644 index 00000000..50752896 --- /dev/null +++ b/project/build.properties @@ -0,0 +1 @@ +sbt.version=0.13.5 \ No newline at end of file From 8edf28633ea0454cfd97c4170b8b6f05b3207db8 Mon Sep 17 00:00:00 2001 From: Juno Lee Date: Mon, 3 Dec 2018 17:55:44 -0700 Subject: [PATCH 2/2] add back $JAVA_HOME --- bin/eventsim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/eventsim b/bin/eventsim index bf922877..6e47e850 100755 --- a/bin/eventsim +++ b/bin/eventsim @@ -1,2 +1,2 @@ #! /bin/bash -/usr/bin/java -XX:+AggressiveOpts -XX:+UseG1GC -XX:+UseStringDeduplication -Xmx8G -jar target/scala-2.10/eventsim-assembly-1.0.jar $* +$JAVA_HOME/bin/java -XX:+AggressiveOpts -XX:+UseG1GC -XX:+UseStringDeduplication -Xmx8G -jar target/scala-2.10/eventsim-assembly-1.0.jar $*