@@ -4,7 +4,7 @@ <classpathentry kind="src" path="src/test/scala"/> <classpathentry kind="con" path="ch.epfl.lamp.sdt.launching.SCALA_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="lib" path="lib_managed/test/h2-1.1.118.jar"/> <classpathentry kind="lib" path="lib_managed/test/junit-4.7.jar"/> + <classpathentry kind="lib" path="lib_managed/test/h2-1.1.119.jar"/> <classpathentry kind="output" path="bin"/> </classpath> .classpath @@ -1,9 +1,9 @@ # Standard properties project.organization=com.novocode project.name=scala-query -project.version=0.1.0-SNAPSHOT +project.version=1.0.0-SNAPSHOT sbt.version=0.5.6-SNAPSHOT -scala.version=2.8.0-20091004.003722-+ +scala.version=2.8.0-20091006.003811-+ project.initialize=false # Custom properties project/build.properties @@ -7,7 +7,7 @@ class ScalaQueryProject(info: ProjectInfo) extends DefaultProject(info) override def compileOptions = Deprecation :: super.compileOptions.toList /*********** Dependencies ***********/ - val scalaToolsSnapshots = "Scala-Tools Maven2 Snapshots Repository" at "http://scala-tools.org/repo-snapshots" + //val scalaToolsSnapshots = "Scala-Tools Maven2 Snapshots Repository" at "http://scala-tools.org/repo-snapshots" //val specs = "org.scala-tools.testing" % "specs" % "1.4.4" //val scalaCheck = "org.scalacheck" % "scalacheck" % "1.5" val h2 = "com.h2database" % "h2" % "1.1.+" % "test->default" @@ -24,19 +24,17 @@ class ScalaQueryProject(info: ProjectInfo) extends DefaultProject(info) }) else super.fork /*********** Publishing ***********/ - /*override def ivyXML = - <info module="scala-query" organisation="com.novocode"> - <license name="Two-clause BSD-style" url="http://github.com/szeiger/scala-query/blob/master/LICENSE.txt" /> - <description homepage="http://github.com/szeiger/scala-query/"> - ScalaQuery is a type-safe database query API for Scala. - </description> - </info>*/ + def specificSnapshotRepo = + Resolver.url("scala-nightly"). + artifacts("http://scala-tools.org/repo-snapshots/[organization]/[module]/2.8.0-SNAPSHOT/[artifact]-[revision].[ext]"). + mavenStyle() + val nightlyScala = ModuleConfiguration("org.scala-lang", "*", "2.8.0-.*", specificSnapshotRepo) + //override def deliverScalaDependencies = Nil override def managedStyle = ManagedStyle.Maven val publishTo = Resolver.file("ScalaQuery Test Repo", new File("e:/temp/repo/")) - override def packageDocsJar = defaultJarPath("-javadoc.jar") + override def packageDocsJar = defaultJarPath("-javadocs.jar") override def packageSrcJar = defaultJarPath("-sources.jar") val sourceArtifact = Artifact(artifactID, "src", "jar", Some("sources"), Nil, None) val docsArtifact = Artifact(artifactID, "docs", "jar", Some("javadocs"), Nil, None) - //override def packageToPublishActions = super.packageToPublishActions ++ Seq(packageDocs, packageSrc) - override def packageToPublishActions = super.packageToPublishActions ++ Seq(packageSrc) + override def packageToPublishActions = super.packageToPublishActions ++ Seq(packageDocs, packageSrc) } project/build/src/ScalaQueryProject.scala 7ddfeb0fb29e948a848fe698aa1e248e53718b80 Stefan Zeiger szeiger@novocode.com http://github.com/szeiger/scala-query/commit/2c72ad03e370606c220f1e3f7ed0d6c268901aaf 2c72ad03e370606c220f1e3f7ed0d6c268901aaf 2009-10-08T12:54:12-07:00 2009-10-08T12:54:12-07:00 Updated build process: Building and publishing with sbt trunk is now working for all artifacts 10d9146a18823a2eb18e07dd67ce04a63c7f6b63 Stefan Zeiger szeiger@novocode.com