Permalink
Browse files

2.10 release for 0.4.4 - includes migration to 0.12.1 sbt

  • Loading branch information...
1 parent fb2558c commit 6b7ed966bf72c2344f5ef740cad62b1a53a3287a @chris-twiner committed Jan 2, 2013
Showing with 11 additions and 16 deletions.
  1. +1 −7 README.md
  2. +1 −1 core/build.sbt
  3. +2 −2 project/FullDocProject.scala
  4. +6 −5 project/ScalesXmlRoot.scala
  5. +1 −1 project/build.properties
View
8 README.md
@@ -16,7 +16,7 @@ The artifacts are now on Maven Central under the group org.scales.xml.
# How To Use
-Currently 2.8.1, 2.8.2, 2.9.1 and 2.9.2 (including 2.10.0-RC2) are built against.
+Currently 2.8.1, 2.8.2, 2.9.1, 2.9.2 and 2.10 are built against.
So for sbt its:
@@ -33,12 +33,6 @@ xsbt 0.10+ its:
intransitive() is required because the Jaxen pom cannot be fully used.
-If using the 2.10.0 RC candidates and sbt 0.12.1 please also use:
-
- cross CrossVersion.full
-
-against the dependencies (as the RCs are not guaranteed to be binary compatible).
-
Maven repos should therefore use org.scalesxml scales-xml_2.9.2 as the dependency. Also note that Jaxen 1.1.4 isn't yet present via Maven, so if you use String XPath evaluation and you'd like to use the latest version you must add the folowing to the build:
resolvers += "Scales Repo" at "http://scala-scales.googlecode.com/svn/repo"
View
2 core/build.sbt
@@ -11,7 +11,7 @@ libraryDependencies <+= scalaVersion{ v=>
if (v.startsWith("2.8")) // stick to 2.8.1
"org.scalaz" % "scalaz-core_2.8.1" % "6.0.4"
else
- "org.scalaz" % ("scalaz-core_" +v ) % "6.0.4" }
+ "org.scalaz" %% "scalaz-core" % "6.0.4" }
excludeFilter in unmanagedSources <<= scalaVersion{ v =>
if (v.startsWith("2.8"))
View
4 project/FullDocProject.scala
@@ -81,14 +81,14 @@ object FullDocs {
},
// Include SXR in the Scaladoc Build to generated HTML annotated sources.
- scalacOptions in (Compile, doc) <++= (baseDirectory, allSourceDirectories, scalaVersion) map sxrOptions,
+ scalacOptions in (Compile,doc) <++= (baseDirectory, allSourceDirectories, scalaVersion) map sxrOptions,
/*scalacOptions in (Compile, doc) <++= (baseDirectory in LocalProject(projectId)).map {
bd => Seq("-sourcepath", projectRoot.getAbsolutePath, "-doc-source-url", docPathToken + "€{FILE_PATH}.scala.html")
},
*/
- scalacOptions in (Compile, doc) ++= Seq("-doc-source-url", docPathToken + "€{FILE_PATH}.scala.html"),
+ scalacOptions in (Compile,doc) ++= Seq("-doc-source-url", docPathToken + "€{FILE_PATH}.scala.html"),
// can't be allsourcedirs but the target dir itself is needed
fullDocs in Compile <<= (streams, allSourceDirectories, target in Compile in doc in LocalProject(projectId)) map {
View
11 project/ScalesXmlRoot.scala
@@ -111,9 +111,8 @@ object ScalesXmlRoot extends Build {
// organization := "org.scalesxml",
offline := true,
version := "0.4.4",
- scalaVersion := "2.10.0-RC5",
-// scalaVersion := "2.10.0-M7",
- crossScalaVersions := Seq("2.8.1", "2.8.2", "2.9.1", "2.9.2", "2.10.0-RC2", "2.10.0-RC5"),
+ scalaVersion := "2.10.0",
+ crossScalaVersions := Seq("2.8.1", "2.8.2", "2.9.1", "2.9.2", "2.10.0"),
//publishSetting,
// parallelExecution in Test := false,
scalacOptions ++= Seq("-optimise"),
@@ -130,14 +129,16 @@ object ScalesXmlRoot extends Build {
* against - no spaces
set dot_exe=c:/PROGRA~2/GRAPHV~1.28/bin/dot.exe
*/
- (scaladocOptions in Compile in doc) <++= (scalaVersion).map{(v: String) =>
+ scalacOptions in (Compile, doc) <++= (scalaVersion).map{(v: String) =>
if (v.startsWith("2.10"))
Seq("-diagrams")
else
Seq()
},
autoCompilerPlugins := false,
- fork in run := true,
+ fork in run := true,
+ scalaBinaryVersion <<= scalaVersion(
+ sV => if (CrossVersion.isStable(sV)) CrossVersion.binaryScalaVersion(sV) else sV),
parallelExecution in runSecurely := false
//,
// parallelExecution in jacoco.Config := false
View
2 project/build.properties
@@ -1 +1 @@
-sbt.version=0.11.3
+sbt.version=0.12.1

0 comments on commit 6b7ed96

Please sign in to comment.