diff --git a/.travis.yml b/.travis.yml index a1f8984..a3e2933 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: scala scala: - - 2.10.0 + - 2.11.8 notifications: email: false diff --git a/build.sbt b/build.sbt index 7691295..1245f65 100644 --- a/build.sbt +++ b/build.sbt @@ -1 +1,43 @@ -//seq(lsSettings:_*) +lazy val buildVersion = "1.2.0" + +organization := "se.radley" +description := "Scala Enumeration plugin for PlayFramework 2" +version := buildVersion +scalaVersion := "2.11.8" +resolvers += "Typesafe Releases" at "http://repo.typesafe.com/typesafe/releases/" +resolvers += "Typesafe Snapshots" at "http://repo.typesafe.com/typesafe/snapshots/" +libraryDependencies += "com.typesafe.play" %% "play" % "2.5.14" % "provided" +libraryDependencies += "com.typesafe.play" %% "play-test" % "2.5.14" % "test" +libraryDependencies += "org.specs2" %% "specs2" % "3.7" % "test" + +publishMavenStyle := true +publishArtifact in Test := false +pomIncludeRepository := { _ => false } +pomExtra := ( + http://github.com/leon/play-enumeration + + + Apache 2.0 + http://www.opensource.org/licenses/Apache-2.0 + repo + + + + git@github.com:leon/play-enumeration.git + scm:git:git@github.com:leon/play-enumeration.git + + + + leon + Leon Radley + http://leon.radley.se + + +) +publishTo := (version { version: String => + val nexus = "https://oss.sonatype.org/" + if (version.trim.endsWith("SNAPSHOT")) + Some("snapshots" at nexus + "content/repositories/snapshots") + else + Some("releases" at nexus + "service/local/staging/deploy/maven2") +}).value diff --git a/project/Build.scala b/project/Build.scala deleted file mode 100755 index 5bb215d..0000000 --- a/project/Build.scala +++ /dev/null @@ -1,50 +0,0 @@ -import sbt._ -import sbt.Keys._ - -object ProjectBuild extends Build { - - lazy val buildVersion = "1.1.0" - - lazy val root = Project(id = "play-plugins-enumeration", base = file("."), settings = Project.defaultSettings).settings( - organization := "se.radley", - description := "Scala Enumeration plugin for PlayFramework 2", - version := buildVersion, - scalaVersion := "2.10.0", - resolvers += "Typesafe Releases" at "http://repo.typesafe.com/typesafe/releases/", - resolvers += "Typesafe Snapshots" at "http://repo.typesafe.com/typesafe/snapshots/", - libraryDependencies += "play" %% "play" % "2.1.0" % "provided", - libraryDependencies += "play" %% "play-test" % "2.1.0" % "test", - - publishMavenStyle := true, - publishArtifact in Test := false, - pomIncludeRepository := { _ => false }, - pomExtra := ( - http://github.com/leon/play-enumeration - - - Apache 2.0 - http://www.opensource.org/licenses/Apache-2.0 - repo - - - - git@github.com:leon/play-enumeration.git - scm:git:git@github.com:leon/play-enumeration.git - - - - leon - Leon Radley - http://leon.radley.se - - - ), - publishTo <<= version { version: String => - val nexus = "https://oss.sonatype.org/" - if (version.trim.endsWith("SNAPSHOT")) - Some("snapshots" at nexus + "content/repositories/snapshots") - else - Some("releases" at nexus + "service/local/staging/deploy/maven2") - } - ) -} diff --git a/project/build.properties b/project/build.properties new file mode 100644 index 0000000..64317fd --- /dev/null +++ b/project/build.properties @@ -0,0 +1 @@ +sbt.version=0.13.15 diff --git a/project/plugins.sbt b/project/plugins.sbt index 27438d4..28b47b5 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,12 +1,10 @@ resolvers ++= Seq( "sbt-idea-repo" at "http://mpeltonen.github.com/maven/", - "less is" at "http://repo.lessis.me", - "coda" at "http://repo.codahale.com", Resolver.url("sbt-plugin-releases", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases/"))(Resolver.ivyStylePatterns) ) -addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.2.0") +addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0") -addSbtPlugin("com.jsuereth" % "xsbt-gpg-plugin" % "0.6") +addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0") //addSbtPlugin("me.lessis" % "ls-sbt" % "0.1.1")