Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
max-l committed Mar 1, 2012
2 parents e069b58 + 445538d commit a03961f
Show file tree
Hide file tree
Showing 6 changed files with 138 additions and 63 deletions.
63 changes: 0 additions & 63 deletions build.sbt

This file was deleted.

76 changes: 76 additions & 0 deletions project/SquerylBuild.scala
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,76 @@
import sbt._
import Keys._
import ls.Plugin._

object SquerylBuild extends Build {

lazy val squeryl = Project(
id = "squeryl",
base = file("."),
settings = Project.defaultSettings ++ lsSettings ++ Seq(
description := "A Scala ORM and DSL for talking with Databases using minimum verbosity and maximum type safety",
organization := "org.squeryl",
version := "0.9.5-RC2",
version <<= version { v => //only release *if* -Drelease=true is passed to JVM
val release = Option(System.getProperty("release")) == Some("true")
if(release)
v
else {
val suffix = Option(System.getProperty("suffix"))
var i = v.indexOf('-')
if(i < 0) i = v.length
v.substring(0,i) + "-" + (suffix getOrElse "SNAPSHOT")
}
},
parallelExecution := false,
publishMavenStyle := true,
scalaVersion := "2.9.1",
crossScalaVersions := Seq("2.9.1","2.9.0-1","2.9.0","2.8.1","2.8.0"),
licenses := Seq("Apache 2" -> url("http://www.apache.org/licenses/LICENSE-2.0.txt")),
homepage := Some(url("http://www.squeryl.org")),
pomExtra := (<scm>
<url>git@github.com:max-l/squeryl.git</url>
<connection>scm:git:git@github.com:max-l/squeryl.git</connection>
</scm>
<developers>
<developer>
<id>max-l</id>
<name>Maxime Lévesque</name>
<url>https://github.com/max-l</url>
</developer>
<developer>
<id>davewhittaker</id>
<name>Dave Whittaker</name>
<url>https://github.com/davewhittaker</url>
</developer>
</developers>),
publishTo <<= version { v => //add credentials to ~/.sbt/sonatype.sbt
val nexus = "https://oss.sonatype.org/"
if (v.trim.endsWith("SNAPSHOT"))
Some("snapshots" at nexus + "content/repositories/snapshots")
else
Some("releases" at nexus + "service/local/staging/deploy/maven2")
},
publishArtifact in Test := false,
pomIncludeRepository := { _ => false },
//below is for lsync, run "ls-write-version", commit to github, then run "lsync"
(LsKeys.tags in LsKeys.lsync) := Seq("sql", "orm", "query", "database", "db", "dsl"),
(LsKeys.docsUrl in LsKeys.lsync) := Some(new URL("http://squeryl.org/api/")),
(LsKeys.ghUser in LsKeys.lsync) := Some("max-l"),
libraryDependencies ++= Seq(
"cglib" % "cglib-nodep" % "2.2",
"com.h2database" % "h2" % "1.2.127" % "provided",
"mysql" % "mysql-connector-java" % "5.1.10" % "provided",
"postgresql" % "postgresql" % "8.4-701.jdbc4" % "provided",
"net.sourceforge.jtds" % "jtds" % "1.2.4" % "provided",
"org.apache.derby" % "derby" % "10.7.1.1" % "provided",
"junit" % "junit" % "4.8.2" % "provided"),
libraryDependencies <++= scalaVersion { sv =>
Seq("org.scala-lang" % "scalap" % sv,
if(sv startsWith "2.9")
"org.scalatest" % "scalatest_2.9.1" % "1.6.1" % "test"
else
"org.scalatest" % "scalatest_2.8.2" % "1.5.1" % "test")
}))

}
12 changes: 12 additions & 0 deletions project/plugins.sbt
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,12 @@
//PGP Plugin
resolvers += Resolver.url("sbt-plugin-releases",
new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases/"))(Resolver.ivyStylePatterns)

addSbtPlugin("com.jsuereth" % "xsbt-gpg-plugin" % "0.6")

//LS Plugin
resolvers ++= Seq(
"less is" at "http://repo.lessis.me",
"coda" at "http://repo.codahale.com")

addSbtPlugin("me.lessis" % "ls-sbt" % "0.1.1")
4 changes: 4 additions & 0 deletions release
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,4 @@
if test -f .sbtconfig; then
. .sbtconfig
fi
exec java -Drelease=true ${SBT_OPTS} -jar sbt-launch.jar "$@"
Binary file modified sbt-launch.jar
Binary file not shown.
46 changes: 46 additions & 0 deletions src/main/ls/0.9.4.json
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,46 @@

{
"organization":"org.squeryl",
"name":"squeryl",
"version":"0.9.4",
"description":"A Scala ORM and DSL for talking with Databases using minimum verbosity and maximum type safety",
"site":"http://www.squeryl.org",
"tags":["sql","orm","query","database","db","dsl"],
"docs":"http://squeryl.org/api/",
"licenses": [{
"name": "Apache 2",
"url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
}],
"resolvers": ["http://scala-tools.org/repo-releases"],
"dependencies": [{
"organization":"cglib",
"name": "cglib-nodep",
"version": "2.2"
},{
"organization":"com.h2database",
"name": "h2",
"version": "1.2.127"
},{
"organization":"mysql",
"name": "mysql-connector-java",
"version": "5.1.10"
},{
"organization":"postgresql",
"name": "postgresql",
"version": "8.4-701.jdbc4"
},{
"organization":"net.sourceforge.jtds",
"name": "jtds",
"version": "1.2.4"
},{
"organization":"org.apache.derby",
"name": "derby",
"version": "10.7.1.1"
},{
"organization":"junit",
"name": "junit",
"version": "4.8.2"
}],
"scalas": ["2.9.1","2.9.0-1","2.9.0","2.8.1","2.8.0"],
"sbt": false
}

0 comments on commit a03961f

Please sign in to comment.