Skip to content

Commit 07c8488

Browse files
committed
Updated and refactor method signatures
1 parent b090983 commit 07c8488

File tree

7 files changed

+355
-337
lines changed

7 files changed

+355
-337
lines changed

build.sbt

Lines changed: 41 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,56 @@ import sbt._
22
import sbt.Keys._
33
import bintray.Plugin.bintraySettings
44
import bintray.Keys._
5-
import scala.scalajs.sbtplugin.ScalaJSPlugin.ScalaJSKeys._
5+
import ScoverageSbtPlugin._
66

7-
lazy val root = project.in(file("."))//.settings(crossScalaVersions := Seq("2.10.4", "2.11.0"))
7+
lazy val root = project.in(file("."))
88

9-
Build.sharedSettings
9+
organization := "es.weso"
1010

11-
version := Build.currentVersion
11+
name := "stateParser"
12+
13+
scalaVersion := "2.11.7"
14+
15+
version := "0.0.4"
1216

1317
libraryDependencies ++= Seq(
14-
"com.lihaoyi" %% "utest" % "0.1.3" % "test",
15-
"org.scalatest" % "scalatest_2.11" % "2.2.0",
16-
"org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.1"
18+
"org.scalatest" % "scalatest_2.11" % "2.2.4" % "test",
19+
"org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.4"
1720
)
1821

19-
testFrameworks += new TestFramework("utest.runner.JvmFramework")
22+
autoCompilerPlugins := true
23+
24+
// Publishing settings to BinTray
25+
26+
bintraySettings
27+
28+
publishMavenStyle := true
29+
30+
repository in bintray := "weso-releases"
31+
32+
bintrayOrganization in bintray := Some("weso")
33+
34+
licenses += ("MPL-2.0", url("http://opensource.org/licenses/MPL-2.0"))
35+
36+
resolvers += "Bintray" at "http://dl.bintray.com/weso/weso-releases"
37+
38+
// Publish site info
39+
site.settings
40+
41+
site.publishSite
42+
43+
site.includeScaladoc()
44+
45+
46+
lazy val scoverageSettings = Seq(
47+
ScoverageKeys.coverageMinimum := 50,
48+
ScoverageKeys.coverageFailOnMinimum := false
49+
)
50+
51+
52+
2053

21-
addCompilerPlugin("com.lihaoyi" %% "acyclic" % "0.1.2")
2254

23-
autoCompilerPlugins := true
2455

2556
bintraySettings
2657

27-
Build.publishSettings

project/Build.scala

Lines changed: 0 additions & 54 deletions
This file was deleted.

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.5
1+
sbt.version=0.13.8

project/plugins.sbt

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,36 @@
1-
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.4.0")
2-
3-
addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.7.4")
1+
addSbtPlugin("com.orrsella" % "sbt-sublime" % "1.1.0")
42

53
addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")
64

7-
//scalajs plugin
8-
addSbtPlugin("org.scala-lang.modules.scalajs" % "scalajs-sbt-plugin" % "0.4.3")
5+
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.4.0")
6+
7+
dependencyOverrides += "org.scala-sbt" % "sbt" % "0.13.8"
8+
9+
addSbtPlugin("com.lihaoyi" % "utest-js-plugin" % "0.1.2")
10+
11+
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "0.7.0-RC2")
12+
13+
addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.3.0")
14+
15+
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.4.0")
16+
17+
addSbtPlugin("me.lessis" % "bintray-sbt" % "0.2.1")
918

10-
//dependency graph generation
1119
addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.7.4")
1220

13-
resolvers += Resolver.url("scala-js-releases", url("http://dl.bintray.com/content/scala-js/scala-js-releases"))(Resolver.ivyStylePatterns)
21+
// addSbtPlugin("org.scala-lang.modules.scalajs" % "scalajs-sbt-plugin" % "0.4.3")
1422

15-
resolvers += Resolver.url("bintray-sbt-plugin-releases",url("http://dl.bintray.com/content/sbt/sbt-plugin-releases"))(Resolver.ivyStylePatterns)
23+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.1.0")
1624

17-
addSbtPlugin("me.lessis" % "bintray-sbt" % "0.1.1")
25+
addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "0.8.1")
1826

27+
resolvers += Classpaths.sbtPluginReleases
28+
29+
resolvers += Resolver.url(
30+
"scala-js-releases", url("http://dl.bintray.com/content/scala-js/scala-js-releases"))(Resolver.ivyStylePatterns)
31+
32+
resolvers += Resolver.url(
33+
"bintray-sbt-plugin-releases",
34+
url("http://dl.bintray.com/content/sbt/sbt-plugin-releases"))(
35+
Resolver.ivyStylePatterns)
1936

20-
addSbtPlugin("com.lihaoyi" % "utest-js-plugin" % "0.1.2")

0 commit comments

Comments
 (0)