Skip to content

Commit

Permalink
add 2.9.2 target, enable publish to sonotype
Browse files Browse the repository at this point in the history
  • Loading branch information
nbronson committed Apr 24, 2012
1 parent 81c2139 commit ee41fa8
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 8 deletions.
31 changes: 26 additions & 5 deletions build.sbt
Expand Up @@ -5,9 +5,9 @@ organization := "org.scala-tools"

version := "0.6-SNAPSHOT"

scalaVersion := "2.9.1"
scalaVersion := "2.9.2"

crossScalaVersions := Seq("2.9.1", "2.9.0-1", "2.9.0", "2.8.2", "2.8.1")
crossScalaVersions := Seq("2.9.2", "2.9.1-1", "2.9.1", "2.9.0-1", "2.9.0", "2.8.2", "2.8.1")

// 2.8.* -> 1.5.1, 2.9.* -> 1.6.1
libraryDependencies += ("org.scalatest" %% "scalatest" % "[1.5,)" % "test")
Expand All @@ -23,14 +23,35 @@ parallelExecution in Test := false
////////////////////
// publishing

pomExtra :=
<url>http://nbronson.github.com/scala-stm/</url>
<licenses>
<license>
<name>BSD</name>
<url>https://github.com/nbronson/scala-stm/blob/master/LICENSE.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<scm>
<connection>scm:git:git@github.com:nbronson/scala-stm.git</connection>
<url>git@github.com:nbronson/scala-stm.git</url>
</scm>
<developers>
<developer>
<id>nbronson</id>
<name>Nathan Bronson</name>
<email>ngbronson@gmail.com</email>
</developer>
</developers>

publishMavenStyle := true

publishTo <<= (version) { v: String =>
val nexus = "http://nexus.scala-tools.org/content/repositories/"
val base = "https://oss.sonatype.org/"
if (v.trim.endsWith("SNAPSHOT"))
Some("snapshots" at nexus + "snapshots/")
Some("snapshots" at base + "content/repositories/snapshots/")
else
Some("releases" at nexus + "releases/")
Some("releases" at base + "service/local/staging/deploy/maven2/")
}

// exclude scalatest from the Maven POM
Expand Down
2 changes: 1 addition & 1 deletion dep_tests/maven/pom.xml
@@ -1,6 +1,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<properties>
<scala.version>2.9.1</scala.version>
<scala.version>2.9.2</scala.version>
<scala.stm.version>0.6-SNAPSHOT</scala.stm.version>
</properties>

Expand Down
4 changes: 2 additions & 2 deletions dep_tests/sbt/built.sbt → dep_tests/sbt/build.sbt
Expand Up @@ -5,9 +5,9 @@ organization := "org.scala-tools"

version := "0.1-SNAPSHOT"

scalaVersion := "2.9.1"
scalaVersion := "2.9.2"

crossScalaVersions := Seq("2.9.1", "2.9.0-1", "2.9.0", "2.8.2", "2.8.1")
crossScalaVersions := Seq("2.9.2", "2.9.1", "2.9.0-1", "2.9.0", "2.8.2", "2.8.1")

resolvers += ScalaToolsSnapshots

Expand Down

0 comments on commit ee41fa8

Please sign in to comment.