Replace ghc-mod by stack repl

rikvdkleij · Sep 1, 2016 · b9c7792 · b9c7792 · zjhmale · Sep 1, 2016
1 parent d7febca
commit b9c7792
Show file tree

Hide file tree

Showing 519 changed files with 8,997 additions and 24,095 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,9 @@
-/idea-flex.skeleton
+idea-flex.skeleton
 target/
 .idea/
 idea/
 *~
+JFlex*.jar
+out/
+project/project/
+jflex-1.7.0-SNAPSHOT.jar
diff --git a/JFlex.jar b/JFlex.jar
diff --git a/build.sbt b/build.sbt
@@ -1,22 +1,24 @@
 lazy val commonSettings = Seq(
-  version := "0.91",
+  version := "1.0.0-beta",
   scalaVersion := "2.11.8"
 )
 
-val scalaTest = "org.scalatest" % "scalatest_2.11" % "2.2.6" % "test"
+val guava = "com.google.guava" % "guava" % "19.0"
+val scalaTest = "org.scalatest" % "scalatest_2.11" % "3.0.0" % "test"
 val sprayJson = "io.spray" %% "spray-json" % "1.3.2"
 
 lazy val intellijHaskell = (project in file(".")).
   enablePlugins(SbtIdeaPlugin).
   settings(commonSettings: _*).
   settings(
     name := "IntelliJ Haskell",
-    javacOptions in Global ++= Seq("-source", "1.6", "-target", "1.6"),
-    scalacOptions in Global += "-target:jvm-1.6",
+    javacOptions in Global ++= Seq("-source", "1.8", "-target", "1.8"),
+    scalacOptions in Global += "-target:jvm-1.8",
+    libraryDependencies += guava,
     libraryDependencies += scalaTest,
     libraryDependencies += sprayJson,
     unmanagedSourceDirectories in Compile += baseDirectory.value / "gen",
     unmanagedJars in Compile += baseDirectory.value / "idea"
   )
 
-ideaBuild in ThisBuild := "145.597.3"
+ideaBuild in ThisBuild := "162.1447.26"