Skip to content

Commit

Permalink
release 0.5 cut from master
Browse files Browse the repository at this point in the history
Summary:

Changes between 0.4 and 0.5:
* Added scala.concurrent.stm.japi.STM, which makes it much cleaner to
  access ScalaSTM functionality from Java.
  • Loading branch information
nbronson committed Feb 3, 2012
1 parent 17f5c5c commit 41bb752
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions README
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ScalaSTM is a lightweight software transactional memory for Scala,
inspired by the STMs in Haskell and Clojure.

The current release is 0.4. The current published snapshot
is 0.5-SNAPSHOT. For download info and documentation see
The current release is 0.5. The current published snapshot
is 0.6-SNAPSHOT. For download info and documentation see
http://nbronson.github.com/scala-stm
8 changes: 4 additions & 4 deletions RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
ScalaSTM - 0.5-SNAPSHOT RELEASE NOTES
ScalaSTM - 0.5 RELEASE NOTES

There are currently no changes between 0.4 and 0.5-SNAPSHOT.
Changes between 0.4 and 0.5:

Snapshot releases deployed to the scala-tools.org repository are tested
and functional, but may have changing APIs.
* Added scala.concurrent.stm.japi.STM, which makes it much cleaner to
access ScalaSTM functionality from Java.

----

Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name := "scala-stm"

organization := "org.scala-tools"

version := "0.5-SNAPSHOT"
version := "0.5"

scalaVersion := "2.9.1"

Expand Down
2 changes: 1 addition & 1 deletion dep_tests/maven/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<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.stm.version>0.5-SNAPSHOT</scala.stm.version>
<scala.stm.version>0.5</scala.stm.version>
</properties>

<modelVersion>4.0.0</modelVersion>
Expand Down
4 changes: 2 additions & 2 deletions dep_tests/sbt/built.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ scalaVersion := "2.9.1"

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

resolvers += ScalaToolsSnapshots
// resolvers += ScalaToolsSnapshots

libraryDependencies += ("org.scala-tools" %% "scala-stm" % "0.5-SNAPSHOT")
libraryDependencies += ("org.scala-tools" %% "scala-stm" % "0.5")

0 comments on commit 41bb752

Please sign in to comment.